添加筛选

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceCheckDto.java

@@ -16,68 +16,67 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="AcceptanceCheckDto", description="并网验收节点")
-public class AcceptanceCheckDto  extends BaseDto {
+@ApiModel(value = "AcceptanceCheckDto", description = "并网验收节点")
+public class AcceptanceCheckDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "施工单id")
+	private Long workOrderId;
 
-    @ApiModelProperty(value = "施工单id")
-    private Long workOrderId;
+	@ApiModelProperty(value = "施工电站id")
+	private Long workOrderPowerStationId;
 
-    @ApiModelProperty(value = "施工电站id")
-    private Long workOrderPowerStationId;
+	@ApiModelProperty(value = "农户id")
+	private Long peasantHouseholdId;
 
-    @ApiModelProperty(value = "农户id")
-    private Long peasantHouseholdId;
+	@ApiModelProperty(value = "验收状态")
+	private String acceptanceCheckStatus;
 
-    @ApiModelProperty(value = "验收状态")
-    private String acceptanceCheckStatus;
+	@ApiModelProperty(value = "节点标识")
+	private String basicGridNode;
 
-    @ApiModelProperty(value = "节点标识")
-    private String basicGridNode;
+	@ApiModelProperty(value = "片区审核")
+	private String powerStationAreaStatus;
 
-    @ApiModelProperty(value = "片区审核")
-    private String powerStationAreaStatus;
+	@ApiModelProperty(value = "法务审核")
+	private String powerStationLegalStatus;
 
-    @ApiModelProperty(value = "法务审核")
-    private String powerStationLegalStatus;
+	@ApiModelProperty(value = "投融审核")
+	private String powerStationFinancingStatus;
 
-    @ApiModelProperty(value = "投融审核")
-    private String powerStationFinancingStatus;
+	@ApiModelProperty(value = "资产审核")
+	private String powerStationAssetsStatus;
 
-    @ApiModelProperty(value = "资产审核")
-    private String powerStationAssetsStatus;
+	@ApiModelProperty(value = "实例id")
+	private String instanceId;
 
-    @ApiModelProperty(value = "实例id")
-    private String instanceId;
+	private String acceptanceTime;
 
-    private String acceptanceTime;
+	// 电站编号
+	private String peasantHouseholdNo;
+	// 户主姓名
+	private String ownersName;
+	/// 项目地址
+	private String projectAddressName;
+	// 并网日期
+	private Date gridConnectionTime;
 
- //电站编号
- private String peasantHouseholdNo;
- //户主姓名
- private String ownersName;
- ///项目地址
- private String projectAddressName;
- //并网日期
- private Date gridConnectionTime;
+	private String regionalCompaniesName;
 
- private String regionalCompaniesName;
+	private String serviceAgent;
 
- private String serviceAgent;
+	// 并网登记id
 
+	private Long fonGridId;
 
- //并网登记id
+	private String isAudit;
 
- private Long fonGridId;
-
-
- private String isAudit;
-
- private String rectificationStatus;
+	private String rectificationStatus;
 
 // 电站安装规模
- private String scale;
- private String realScale;
+	private String scale;
+	private String realScale;
+
+	private String province;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/BasicGridRecordDto.java

@@ -78,4 +78,6 @@ public class BasicGridRecordDto  extends BaseDto {
  private String scale;
 
  private String realScale;
+ 
+ private String province;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPage.java

@@ -88,4 +88,6 @@ public class WorkOrderPage {
     private String  scale ;
     @ApiModelProperty(value = "电站实际规模")
     private String  realScale ;
+    
+    private String province;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceCheckMapper.xml

@@ -23,6 +23,7 @@
         hph.owners_name AS ownersName,
         hph.peasant_household_no peasantHouseholdNo,
         hph.project_address_name projectAddressName,
+        substring_index ( hph.project_address_name, '/', 1 ) AS province,
         DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d %H:%i:%S') AS gridConnectionTime,
         CASE WHEN hbga.acceptance_check_status = '15' THEN '待提交验收'
         WHEN hbga.acceptance_check_status = '2' THEN '经销商管理员待审核'
@@ -76,6 +77,9 @@
             <if test="map.acceptanceTime != null">
                 AND DATE_FORMAT(hogaa.acceptance_time, '%Y-%m-%d') = #{map.acceptanceTime}
             </if>
+            <if test="map.province != null and map.province != ''">
+	            AND hph.project_address like concat(concat('%',#{map.province}),'%')
+	        </if>
         </where>
         ORDER BY hbga.sequence_nbr desc
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -32,6 +32,7 @@
         hph.owners_name AS ownersName,
         hph.peasant_household_no peasantHouseholdNo,
         hph.project_address_name projectAddressName,
+        substring_index ( hph.project_address_name, '/', 1 ) AS province,
         DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d %H:%i:%S') AS gridConnectionTime,
         CASE WHEN hbga.grid_status = '1' THEN '待登记'
         WHEN hbga.grid_status = '2' THEN '经销商管理员待审核'
@@ -81,6 +82,9 @@
             <if test="map.gridConnectionTime != null">
                 AND DATE_FORMAT(hogaa.grid_time, '%Y-%m-%d') = #{map.gridConnectionTime}
             </if>
+                        <if test="map.province != null and map.province != ''">
+	            AND hph.project_address like concat(concat('%',#{map.province}),'%')
+	        </if>
         </where>
         ORDER BY hbga.sequence_nbr desc
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml

@@ -53,6 +53,7 @@
         select
         hygf_peasant_household.sequence_nbr sequenceNbr,
         hygf_peasant_household.peasant_household_no peasantHouseholdNo,
+        substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province,
         hygf_work_order.work_order_num workOrderNum,
         hygf_peasant_household.owners_name ownersName,
         hygf_work_order.project_region_manager projectRegionManager,
@@ -120,6 +121,9 @@
         <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
             and hygf_work_order.region_company_id =#{dto.regionCompanyId}
         </if>
+        <if test="province != null and province != ''">
+            and hygf_peasant_household.project_address like concat(concat('%',#{province}),'%')
+        </if>
         </where>
         ORDER BY
         hygf_work_order_power_station.sequence_nbr DESC