Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/FinancingAuditEnum.java

@@ -9,8 +9,8 @@ import lombok.Getter;
 public enum FinancingAuditEnum {
 
     待融资审核("FinancingAudit","待融资审核","/hygf/drzsh"),
-    审核不通过("AuditReject","整改待推送","/hygf/zgdts"),
-    待整改("WaitAbarbeitung","待整改","/hygf/dzg"),
+    审核不通过("AuditReject","审核不通过","/hygf/zgdts"),
+    待整改("WaitAbarbeitung","重新验收","/hygf/dzg"),
     整改待推送("AbarbeitungWaitPush","审核不通过","/hygf/shym"),
     审核通过("AuditPass","审核通过","/hygf/fkym"),
     放款完成("complete","放款完成","");

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

@@ -16,12 +16,11 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="AcceptanceCheckDto", description="并网验收节点")
+@ApiModel(value = "AcceptanceCheckDto", description = "并网验收节点")
 public class AcceptanceCheckDto extends BaseDto {
 
 	private static final long serialVersionUID = 1L;
 
-
 	@ApiModelProperty(value = "施工单id")
 	private Long workOrderId;
 
@@ -54,29 +53,30 @@ public class AcceptanceCheckDto  extends BaseDto {
 
 	private String acceptanceTime;
 
- //电站编号
+	// 电站编号
 	private String peasantHouseholdNo;
- //户主姓名
+	// 户主姓名
 	private String ownersName;
- ///项目地址
+	/// 项目地址
 	private String projectAddressName;
- //并网日期
+	// 并网日期
 	private Date gridConnectionTime;
 
 	private String regionalCompaniesName;
 
 	private String serviceAgent;
 
-
- //并网登记id
+	// 并网登记id
 
 	private Long fonGridId;
 
-
 	private String isAudit;
 
 	private String rectificationStatus;
 
 // 电站安装规模
 	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

@@ -76,4 +76,8 @@ public class BasicGridRecordDto  extends BaseDto {
 
  //    电站安装规模(kW)
  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/DropDown.java

@@ -16,4 +16,10 @@ public class DropDown {
 
     @ApiModelProperty(value = "单位名称")
     private String name;
+
+    @ApiModelProperty(value = "单位名称+单位id")
+    private String text;
+
+    @ApiModelProperty(value = "单位名称+单位id")
+    private String id;
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.support.spring.annotation.FastJsonFilter;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2024-04-01
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="FinancingInfoDto", description="")
+@ApiModel(value = "FinancingInfoDto", description = "")
 public class FinancingInfoDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
@@ -37,6 +39,9 @@ public class FinancingInfoDto  extends BaseDto {
     @ApiModelProperty(value = "农户id")
     private Long peasantHouseholdId;
 
+    @ApiModelProperty(value = "区域公司Id")
+    private Long regionalCompaniesSeq;
+
     @ApiModelProperty(value = "放款时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     private Date disbursementTime;
@@ -55,7 +60,14 @@ public class FinancingInfoDto  extends BaseDto {
 
     private String instanceId;
 
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;
+
     @ApiModelProperty(value = "附件")
     private List<Object> files;
 
+    @ApiModelProperty(value = "单价")
+    private String unitPrice;
+
+    List<PeasantHousehold> peasantHouseholds;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 融资机构区域公司绑定表
+ *
+ * @author system_generator
+ * @date 2024-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FinancingRegionalDto", description="融资机构区域公司绑定表")
+public class FinancingRegionalDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "区域公司id")
+    private String regionalCompaniesName;
+
+    @ApiModelProperty(value = "区域公司名称")
+    private String regionalCompaniesSeq;
+
+    @ApiModelProperty(value = "区域公司名称")
+    private String regionalCompaniesCode;
+
+    @ApiModelProperty(value = "融资机构id")
+    private String financingId;
+
+    @ApiModelProperty(value = "融资机构名称")
+    private String financingName;
+
+    private List<String> financing;
+
+    private List<String>  regionalCompanies;
+
+    @ApiModelProperty(value = "省份")
+    private String province;
+
+}

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

@@ -48,4 +48,6 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
     private String userId;
     private String contractNumber;
     private String regionalCompaniesName;
+    //省份
+    private String province;
 }

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

@@ -164,6 +164,9 @@ public class HygfIcbcRecordDTO  {
          * */
         @ApiModelProperty(value = "电站安装规模(kW)")
         private String scale;
+
+        @ApiModelProperty(value = "实际安装规模(kW)")
+        private String realScale;
     }
 
 }
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+
+
+public class IdsDTO {
+    private List<Long> ids;
+
+    public List<Long> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<Long> ids) {
+        this.ids = ids;
+    }
+}
\ No newline at end of file

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

@@ -97,4 +97,8 @@ public class PowerStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "电站安装规模")
     private String scale;
+    @ApiModelProperty(value = "电站实际规模")
+    private String realScale;
+    @ApiModelProperty(value = "省份")
+    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

@@ -86,4 +86,8 @@ public class WorkOrderPage {
 
     @ApiModelProperty(value = "电站安装规模")
     private String  scale ;
+    @ApiModelProperty(value = "电站实际规模")
+    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/entity/DocumentStation.java

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 
  *
@@ -54,4 +56,10 @@ public class DocumentStation extends BaseEntity {
      */
     @TableField("project_address_name")
     private String projectAddressName;
+
+    @TableField(exist = false)
+    private String scale;
+
+    @TableField(exist = false)
+    private String realScale;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/FinancingInfo.java

@@ -46,6 +46,9 @@ public class FinancingInfo extends BaseEntity {
 	@TableField("peasant_household_id")
     private Long peasantHouseholdId;
 
+    @TableField("regional_companies_seq")
+    private Long regionalCompaniesSeq;
+
     /**
      * 放款时间
      */
@@ -57,6 +60,11 @@ public class FinancingInfo extends BaseEntity {
      */
 	@TableField("disbursement_money")
     private Double disbursementMoney;
+    /**
+     * 批次号
+     */
+	@TableField("bacth_no")
+    private String batchNo;
 
     /**
      * 附件
@@ -69,5 +77,9 @@ public class FinancingInfo extends BaseEntity {
      */
 	@TableField("status")
     private String status;
-
+    /**
+     * 单价
+     */
+	@TableField("unit_price")
+    private String unitPrice;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/FinancingRegional.java

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 融资机构区域公司绑定表
+ *
+ * @author system_generator
+ * @date 2024-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_financing_regional")
+public class FinancingRegional extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 区域公司id
+     */
+	@TableField("regional_companies_name")
+    private String regionalCompaniesName;
+
+    /**
+     * 区域公司名称
+     */
+	@TableField("regional_companies_seq")
+    private String regionalCompaniesSeq;
+
+    /**
+     * 区域公司code
+     */
+	@TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+
+    /**
+     * 融资机构id
+     */
+	@TableField("financing_id")
+    private String financingId;
+
+    /**
+     * 融资机构名称
+     */
+	@TableField("financing_name")
+    private String financingName;
+
+    /**
+     * 省份
+     */
+	@TableField("province")
+    private String province;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HouseholdContract.java

@@ -260,4 +260,9 @@ public class HouseholdContract extends BaseEntity {
 
     @TableField(exist = false)
     private String scale;
+
+    @TableField(exist = false)
+    private String realScale;
+    @TableField(exist = false)
+    private String province;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java

@@ -217,8 +217,22 @@ public class PeasantHousehold extends BaseEntity {
     private Integer isAllRevoke;
 
     /**
-     * 商务信息安装规模
+     * 电站规模
      */
     @TableField(exist = false)
     private String scale;
+
+    /**
+     * 电站规模
+     */
+    @TableField(exist = false)
+    private String realScale;
+    /**
+     放款金额
+     */
+    @TableField(exist = false)
+    private Double disbursementMoney;
+    
+    @TableField(exist = false)
+    private String province;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PowerStationEngineeringInfo.java

@@ -45,6 +45,12 @@ public class PowerStationEngineeringInfo extends BaseEntity {
     private Integer componentQuantity;
 
     /**
+     * 组件数量
+     */
+    @TableField("real_scale")
+    private Double realScale;
+
+    /**
      * 逆变器数量
      */
 	@TableField("inverter_quantity")

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/WorkOrder.java

@@ -162,4 +162,6 @@ public class WorkOrder extends BaseEntity {
     int current;
     @TableField(exist = false)
     int size;
+    @TableField(exist = false)
+    private String ownersName;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/FinancingInfoMapper.java

@@ -24,6 +24,12 @@ public interface FinancingInfoMapper extends BaseMapper<FinancingInfo> {
 
    List<Map<String,Object>> selectOrgList();
 
+   List<Map<String,Object>> orgListByqyid(@Param("ids") List<String> ids);
+
    Map<String,Object> selectRZOrgInfo(Long id);
 
+   List<Map<String,Object>> selectCompany(@Param("ids")List<String> ids);
+
+   List<Map<String,Object>> selectRegion();
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/FinancingRegionalMapper.java

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRegional;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 融资机构区域公司绑定表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-09-19
+ */
+public interface FinancingRegionalMapper extends BaseMapper<FinancingRegional> {
+
+    @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"regional_companies_code"}, fieldConditions ={"in","in"} ,relationship="and",specific=false)
+   List<FinancingRegional> queryDataForPage(String regionalCompaniesName, String province);
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java

@@ -39,6 +39,12 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     @UserEmpower(field ={"ORG_CODE"} ,dealerField ={"ORG_CODE"}, fieldConditions ={"in","in"} ,relationship="and",specific=false)
     List<DropDown>  getRegion(String regionName);
 
+    @UserEmpower(field ={"ORG_CODE"} ,dealerField ={"ORG_CODE"}, fieldConditions ={"in","in"} ,relationship="and",specific=false)
+    List<DropDown>  getRegionByProvince(@Param(value = "ids") List<String> ids);
+
+
+    List<String>  getRegionNode(String province);
+
     List<DropDown>  getRegionAll();
 
     @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java

@@ -30,7 +30,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
 
     );
     @UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
-    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState, String peasantHouseholdNo);
+    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState, String peasantHouseholdNo,String province);
 
 
     List<Map<String,Object>> selectUserIsHouse(String telephone);
@@ -51,5 +51,6 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
 
     void deleteHhcByNo(String peasantHouseholdNo);
 
-    String getHygfCommercialScale(Long surveyInformationId);
+    List<PeasantHousehold> getInfoByIds(@Param(value = "ids") List<String> ids);
+//    String getHygfCommercialScale(Long surveyInformationId);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationEngineeringInfoMapper.java

@@ -11,4 +11,5 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
  */
 public interface PowerStationEngineeringInfoMapper extends BaseMapper<PowerStationEngineeringInfo> {
 
+    String getRealScaleByPeasantHouseholdNo(String peasantHouseholdNumber);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java

@@ -16,10 +16,10 @@ import java.util.List;
  * @date 2023-07-15
  */
 public interface PowerStationMapper extends BaseMapper<PowerStation> {
-    @UserEmpower(field ={"regional_companies_code"} ,dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"}, relationship="and")
+	@UserEmpower(field = { "regional_companies_code" }, dealerField = { "developer_code", "regional_companies_code",
+			"developer_user_id" }, fieldConditions = { "in", "in", "in" }, relationship = "and")
 	List<PowerStationDto> queryPage(@Param("powerStationCode") String powerStationCode,
-                                    @Param("ownersName")String ownersName,
-                                    @Param("serviceAgent")String serviceAgent,
-                                    @Param("regionalCompaniesName")String regionalCompaniesName,
-                                    @Param("processStatus")String processStatus);
+			@Param("ownersName") String ownersName, @Param("serviceAgent") String serviceAgent,
+			@Param("regionalCompaniesName") String regionalCompaniesName, @Param("processStatus") String processStatus,
+			@Param("province") String province);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java

@@ -34,6 +34,7 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
                                                  @Param(value = "ownersName") String ownersName,
                                                  @Param(value = "regionalCompaniesSeq") String regionalCompaniesSeq,
                                                  @Param(value = "developerId") String developerId,
-                                                 @Param(value = "state") String state);
+                                                 @Param(value = "state") String state,
+                                                 @Param(value = "province") String province);
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IFinancingRegionalService.java

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 融资机构区域公司绑定表接口类
+ *
+ * @author system_generator
+ * @date 2024-09-19
+ */
+public interface IFinancingRegionalService {
+
+}

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/FinancingInfoMapper.xml

@@ -15,8 +15,10 @@
         (select CONCAT_WS(',',instance_id,node_routing) instanceId FROM  hygf_financing_auditing  WHERE hygf_financing_auditing.peasant_household_id = hph.sequence_nbr ORDER BY rec_date desc limit 1) instanceId,
         hygf_unit_info.head_name responsibleUserName,
         hygf_unit_info.head_phone  responsibleUserPhone,
+        CONCAT(info.disbursement_money,'') as disbursementMoney,
         hph.regional_companies_code,
-        hph.developer_code
+        hph.developer_code,
+        info.financing_companies_name financingCompaniesName
         FROM
         `hygf_peasant_household` hph
         LEFT JOIN hygf_financing_info info ON info.peasant_household_id = hph.sequence_nbr
@@ -30,17 +32,20 @@
                 and hph.regional_companies_code = #{params.regionalCompaniesCode}
             </if>
             <if test="params.type == 2 ">
-                and info.status in ('待融资审核','审核通过','放款完成' ) and info.financing_companies_seq = #{params.financingCompaniesSeq}
+                and info.status in ('待融资审核','审核通过','放款完成','已放款','审核不通过' ) and info.financing_companies_seq = #{params.financingCompaniesSeq}
             </if>
-            <if test="params.type == 3 ">
-                and info.status in ('待整改','整改未完成')
+            <if test="params.region != null and params.region !='' ">
+                and hph.project_address like concat ('%',#{params.region},'%')
             </if>
         </where>
         ORDER BY
         info.rec_date DESC ,hph.sequence_nbr DESC ) as sta
         <where>
-            <if test="params.status != null and params.status != ''">
-                and sta.status = #{params.status}
+            <if test="params.status != null and params.status.size() > 0">
+                and sta.status in
+            <foreach collection="params.status" item="item" open="(" close=")" separator=",">
+                    #{item}
+            </foreach>
             </if>
         </where>
     </select>
@@ -63,6 +68,23 @@
     </select>
 
 
+    <select id="orgListByqyid" resultType="java.util.Map">
+        select
+        *
+        from
+        privilege_company
+        where
+        PARENT_ID = (select SEQUENCE_NBR from privilege_company where COMPANY_NAME = '融资机构')
+        <if test="ids != null and ids.size()>0">
+          and  SEQUENCE_NBR in
+            <foreach collection="ids" separator="," open="(" close=")" item="item">
+                #{item}
+            </foreach>
+        </if>
+
+    </select>
+
+
     <select id="selectRZOrgInfo" resultType="java.util.Map">
         select
             *
@@ -71,4 +93,29 @@
         where
             SEQUENCE_NBR=#{id}
     </select>
+
+    <select id="selectCompany" resultType="java.util.Map">
+        select
+            *
+        from
+            privilege_company
+        <where>
+            SEQUENCE_NBR in
+            <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                 #{item}
+            </foreach>
+        </where>
+    </select>
+
+
+    <select id="selectRegion" resultType="java.util.Map">
+        select
+            REGION_NAME regionName,
+            REGION_CODE regionCode
+        from
+            systemctl_region
+        where
+            PARENT_ID = '0'
+
+    </select>
 </mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingRegionalMapper">
+
+    <select id="queryDataForPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRegional">
+        select * from  hygf_financing_regional
+        <where>
+            <if test="regionalCompaniesName != null and regionalCompaniesName != ''">
+            and hygf_financing_regional.regional_companies_name = #{regionalCompaniesName}
+            </if>
+            <if test="province != null and province != ''">
+                and hygf_financing_regional.province  = #{province}
+            </if>
+        </where>
+
+    </select>
+</mapper>

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

@@ -10,8 +10,8 @@
         END FROM hygf_household_contract AS hhc
         WHERE
         hhc.peasant_household_id = hygf_household_contract.peasant_household_id
-        ) AS isAllDisuse
-
+        ) AS isAllDisuse,
+        SUBSTRING_INDEX(php.project_address_name, '/', 1) AS province
         from hygf_household_contract
         LEFT JOIN hygf_peasant_household php ON php.sequence_nbr = hygf_household_contract.peasant_household_id
         <where>
@@ -45,6 +45,9 @@
             <if test="dto.regionalCompaniesName != null and dto.regionalCompaniesName !=''">
                 and hygf_household_contract.regional_companies_name like concat('%',#{dto.regionalCompaniesName},'%')
             </if>
+            <if test="dto.province != null and dto.province !=''">
+                and php.project_address like concat ('%',#{dto.province},'%')
+            </if>
         </where>
         <if test="dto.orderBy  == null ">
             ORDER BY hygf_household_contract.rec_date DESC

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

@@ -249,7 +249,45 @@
           <if test="regionName!=null and regionName!=''">
               and privilege_company.COMPANY_NAME like concat('%',#{regionName}, '%')
           </if>
+    </select>
+
+    <select id="getRegionNode" resultType="string">
+        WITH RECURSIVE Subtree AS (
+            SELECT
+                SEQUENCE_NBR
+            FROM
+                systemctl_region sr
+            WHERE
+                sr.REGION_NAME = #{province}
+            UNION ALL
+            SELECT
+                h.SEQUENCE_NBR
+            FROM
+                systemctl_region h
+                    JOIN
+                Subtree s ON h.PARENT_ID = s.SEQUENCE_NBR
+        )
+        SELECT
+            *
+        FROM
+            Subtree;
+    </select>
 
+
+    <select id="getRegionByProvince" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
+        SELECT privilege_company.ORG_CODE     orgCode,
+        privilege_company.COMPANY_NAME name,
+        CONCAT_WS('_',privilege_company.COMPANY_NAME,privilege_company.SEQUENCE_NBR,privilege_company.ORG_CODE) as text,
+        privilege_company.SEQUENCE_NBR  as id
+        FROM privilege_company
+        WHERE IS_DELETED = 0
+        and privilege_company.COMPANY_TYPE = 'region'
+        <if test="ids!=null and ids.size()>0">
+            and privilege_company.REGION_SEQ in
+        <foreach collection="ids" separator="," open="(" close=")" item="item">
+            #{item}
+        </foreach>
+        </if>
     </select>
     <select id="getRegionAll" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
         SELECT privilege_company.ORG_CODE     orgCode,

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

@@ -52,7 +52,8 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
 
     </select>
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold">
-        SELECT *
+        SELECT *,
+        substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province
         FROM hygf_peasant_household
         WHERE IS_CERTIFIED = #{isCertified}
         <if test="ownersName!=null and ownersName !=''">
@@ -73,6 +74,9 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
             and peasant_household_no like concat ('%',#{peasantHouseholdNo},'%')
         </if>
+        <if test="province != null and province != ''">
+            and project_address like concat(concat('%',#{province}),'%')
+        </if>
         ORDER BY creation_time DESC
     </select>
     <select id="selectUserIsHouse" resultType="java.util.Map">
@@ -133,8 +137,28 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
     <select id="deleteHhcByNo">
         DELETE FROM hygf_household_contract WHERE peasant_household_number=#{peasantHouseholdNo}
     </select>
-
-    <select id="getHygfCommercialScale" resultType="String">
-        select scale from hygf_commercial where survey_information_id=${surveyInformationId}
+    <select id="getInfoByIds" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold">
+        SELECT
+               ph.sequence_nbr,
+               ph.owners_name,
+               concat( ph.project_address_name, ph.project_address_detail ) AS project_address_name,
+               (ei.component_quantity * ei.component_specification / 1000) as realScale
+        FROM
+             hygf_peasant_household ph
+        LEFT JOIN hygf_work_order_power_station ps ON ps.peasant_household_id = ph.sequence_nbr
+        LEFT JOIN hygf_power_station_engineering_info ei ON ei.work_order_power_station_id= ps.sequence_nbr
+        <where>
+            ph.is_delete = 0
+            <if test="ids != null and ids.size()>0">
+                AND ph.sequence_nbr  IN
+                <foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
     </select>
+
+    <!--    <select id="getHygfCommercialScale" resultType="String">-->
+<!--        select scale from hygf_commercial where survey_information_id=${surveyInformationId}-->
+<!--    </select>-->
 </mapper>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper">
-
+    <select id="getRealScaleByPeasantHouseholdNo" resultType="String">
+       select
+           hpsei.real_scale realScale
+       from
+           hygf_peasant_household hph,
+           hygf_work_order_power_station hwops,
+           hygf_power_station_engineering_info hpsei
+       where
+           hph.peasant_household_no = #{peasantHouseholdNo} and
+           hph.sequence_nbr = hwops.peasant_household_id and
+           hwops.sequence_nbr = hpsei.work_order_power_station_id
+    </select>
 </mapper>

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

@@ -11,6 +11,7 @@
     hygf_peasant_household.developer_code,
     hygf_peasant_household.developer_user_id,
     hygf_peasant_household.project_address_detail,
+    substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province,
     b.stamp_status,
     b.status
     from hygf_power_station LEFT JOIN ( SELECT  bb.peasant_household_id, initiate_status, contract_lock_id, stamp_status, status FROM (SELECT peasant_household_id,MAX(sequence_nbr) AS sequence_nbr from hygf_household_contract GROUP BY peasant_household_id ) aa LEFT JOIN  hygf_household_contract bb ON aa.sequence_nbr=bb.sequence_nbr) b    on b.peasant_household_id=hygf_power_station.peasant_household_id
@@ -32,6 +33,9 @@
     <if test="processStatus != null and processStatus != ''">
         and hygf_power_station.process_status = #{processStatus}
     </if>
+    <if test="province != null and province != ''">
+        and hygf_peasant_household.project_address like concat(concat('%',#{province}),'%')
+    </if>
 <!--    GROUP BY hygf_peasant_household.sequence_nbr-->
     ORDER BY hygf_power_station.rec_date desc
 </select>

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

@@ -51,6 +51,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         hygf_peasant_household.developer_name as developerName,
         hygf_peasant_household.developer_id as developeId,
         hygf_peasant_household.sequence_nbr  as sequenceNbr,
+        substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province,
         concat_ws('/',hygf_peasant_household.project_address_name,hygf_peasant_household.project_address_detail) as address,
         hygf_peasant_household.preparation_money_state preparationMoneyState,
         hygf_document_station.preparation_money_id as preparationMoneyId,
@@ -80,6 +81,9 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
         <if test=" preparationMoneyState == 1 ">
             and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not null and preparation_money_state != ''
         </if>
+        <if test="province != null and province != ''">
+            and hygf_peasant_household.project_address like concat(concat('%',#{province}),'%')
+        </if>
         </where>
 <!--        GROUP BY  hygf_peasant_household.sequence_nbr-->
         <if test=" preparationMoneyState == 1 ">

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

@@ -12,8 +12,17 @@
 
        and hygf_work_order_power_station.power_station_construction_status in ('待登记','未通过','已完工','待审核')
 
-       ) peasantHouseholdSgNum
-
+       ) peasantHouseholdSgNum,
+       (
+       SELECT
+       GROUP_CONCAT( owners_name ORDER BY owners_name ASC SEPARATOR ', ' ) AS ownersName
+       FROM
+       hygf_work_order_power_station ps
+       LEFT JOIN hygf_peasant_household ph ON ps.peasant_household_id = ph.sequence_nbr
+       WHERE
+       ps.work_order_id = hygf_work_order.sequence_nbr
+
+       )  as ownersName
        FROM  hygf_work_order
        WHERE hygf_work_order.is_delete=0
        <if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
@@ -31,6 +40,17 @@
        <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
            and hygf_work_order.region_company_id =#{dto.regionCompanyId}
        </if>
+       <if test="dto.ownersName!=null and dto.ownersName!=''">
+           and (
+           SELECT
+           GROUP_CONCAT( owners_name ORDER BY owners_name ASC SEPARATOR ', ' ) AS ownersName
+           FROM
+           hygf_work_order_power_station ps
+           LEFT JOIN hygf_peasant_household ph ON ps.peasant_household_id = ph.sequence_nbr
+           WHERE
+           ps.work_order_id = hygf_work_order.sequence_nbr
+           ) like concat ('%',#{dto.ownersName},'%')
+       </if>
        ORDER BY
        hygf_work_order.rec_date DESC,
 
@@ -53,6 +73,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 +141,9 @@
         <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
             and hygf_work_order.region_company_id =#{dto.regionCompanyId}
         </if>
+        <if test="dto.province != null and dto.province != ''">
+            and hygf_peasant_household.project_address like concat(concat('%',#{dto.province}),'%')
+        </if>
         </where>
         ORDER BY
         hygf_work_order_power_station.sequence_nbr DESC

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceCheckController.java

@@ -7,10 +7,10 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheck;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
+
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.ArrayList;
@@ -205,7 +205,8 @@ public class AcceptanceCheckController extends BaseController {
 																@RequestParam(required = false,value = "ownersName") String ownersName,
 																@RequestParam(required = false,value = "acceptanceCheckStatus") String acceptanceCheckStatus,
 																@RequestParam(required = false,value = "type") String type,
-																@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime) throws Exception {
+																@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime,
+																@RequestParam(required = false, value = "province") String province) throws Exception {
 		//当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
@@ -234,7 +235,7 @@ public class AcceptanceCheckController extends BaseController {
 				basicGridNodes.add("ys-zichan");
 			}
 		}
-		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type);
+		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province);
 		//根据角色及当前节点判断是否有操作权限
 		if (basicGridNodes != null){
 			for (AcceptanceCheckDto e : page.getRecords()) {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java

@@ -87,7 +87,8 @@ public class BasicGridAcceptanceController extends BaseController {
 	@Transactional
 	public ResponseModel saveAndCommit(@RequestBody HygfOnGrid dto) {
 
-		return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto,getSelectedOrgInfo().getUserModel().getRealName()));
+		return ResponseHelper.buildResponse(
+				basicGridAcceptanceServiceImpl.saveAndCommit(dto, getSelectedOrgInfo().getUserModel().getRealName()));
 	}
 
 	/**
@@ -114,7 +115,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@DeleteMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam("sequenceNbrs") Long[] sequenceNbrs){
+	public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
 		return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.deleteForBatch(sequenceNbrs));
 	}
 
@@ -126,7 +127,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
 	public ResponseModel<BasicGridAcceptanceDto> selectOne(@PathVariable Long sequenceNbr) {
 		return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.queryBySeq(sequenceNbr));
 	}
@@ -140,17 +141,18 @@ public class BasicGridAcceptanceController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
 	@UserLimits
 	public ResponseModel<Page<BasicGridRecordDto>> queryForPage(@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size,
-																	@RequestParam(required = false,value = "projectAddress") String projectAddress,
-																	@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
-																	@RequestParam(required = false,value = "ownersName") String ownersName,
-																	@RequestParam(required = false,value = "gridStatus") String gridStatus,
-																	@RequestParam(required = false,value = "type") String type,
-																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
-        //当前登录人所属场站
+			@RequestParam(required = false, value = "projectAddress") String projectAddress,
+			@RequestParam(required = false, value = "powerStationCode") String powerStationCode,
+			@RequestParam(required = false, value = "ownersName") String ownersName,
+			@RequestParam(required = false, value = "gridStatus") String gridStatus,
+			@RequestParam(required = false, value = "type") String type,
+			@RequestParam(required = false, value = "gridConnectionTime") String gridConnectionTime,
+			@RequestParam(required = false, value = "province") String province) throws Exception {
+		// 当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
 		ReginParams reginParams = getSelectedOrgInfo();
@@ -174,16 +176,18 @@ public class BasicGridAcceptanceController extends BaseController {
 				basicGridNodes.add("bw-area");
 			}
 		}
-	    Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "",basicGridNodes,type);
-		//根据角色及当前节点判断是否有操作权限
-		if (basicGridNodes != null){
+		Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null, null, current, size,
+				projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "", basicGridNodes, type,
+				province);
+		// 根据角色及当前节点判断是否有操作权限
+		if (basicGridNodes != null) {
 			for (BasicGridRecordDto e : page.getRecords()) {
 				for (String g : basicGridNodes) {
-					if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) && (roleIds.contains(areaId) ||roleIds.contains(designId) ||  roleIds.contains(engineeringId))){
+					if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) && (roleIds.contains(areaId)
+							|| roleIds.contains(designId) || roleIds.contains(engineeringId))) {
 						e.setIsAudit("0");
 						break;
-					}
-					else {
+					} else {
 						e.setIsAudit("1");
 					}
 				}
@@ -201,112 +205,99 @@ public class BasicGridAcceptanceController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/check/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
 	@UserLimits
 	public ResponseModel<Page<BasicGridRecordDto>> queryForCheckPage(@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size,
-																	@RequestParam(required = false,value = "projectAddress") String projectAddress,
-																	@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
-																	@RequestParam(required = false,value = "ownersName") String ownersName,
-																	@RequestParam(required = false,value = "gridStatus") String gridStatus,
-																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
-        //当前登录人所属场站
-
-        Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check",null,null);
+			@RequestParam(required = false, value = "projectAddress") String projectAddress,
+			@RequestParam(required = false, value = "powerStationCode") String powerStationCode,
+			@RequestParam(required = false, value = "ownersName") String ownersName,
+			@RequestParam(required = false, value = "gridStatus") String gridStatus,
+			@RequestParam(required = false, value = "gridConnectionTime") String gridConnectionTime,
+			@RequestParam(required = false, value = "province") String province) throws Exception {
+		// 当前登录人所属场站
+
+		Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null, null, current, size,
+				projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check", null, null,province);
 		return ResponseHelper.buildResponse(page);
 	}
 
-
-
-
-
-
 	/**
 	 * 列表全部数据查询
 	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<BasicGridAcceptanceDto>> selectForList() {
 		return ResponseHelper.buildResponse(Collections.emptyList());
 	}
 
-
-	//并网审核
-
+	// 并网审核
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/execute")
 	@ApiOperation(httpMethod = "POST", value = "执行工作流", notes = "执行工作流")
 	public ResponseModel execute(@RequestBody AcceptanceCheckItem dto) {
-        basicGridAcceptanceServiceImpl.execute(dto,getUserId());
+		basicGridAcceptanceServiceImpl.execute(dto, getUserId());
 		return ResponseHelper.buildResponse(null);
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "POST",value = "完工自审-经销商管理",   notes = "完工自审经销商管理")
+	@ApiOperation(httpMethod = "POST", value = "完工自审-经销商管理", notes = "完工自审经销商管理")
 	@PostMapping(value = "/completeAdminAudit")
 	@Transactional
-	public ResponseModel completeAdminAudit( @RequestBody Map<String,String> kv) {
+	public ResponseModel completeAdminAudit(@RequestBody Map<String, String> kv) {
 		basicGridAcceptanceServiceImpl.completeAdminAudit(kv);
 		return ResponseHelper.buildResponse(null);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "POST",value = "完工自审管理审核",   notes = "完工自审管理审核")
+	@ApiOperation(httpMethod = "POST", value = "完工自审管理审核", notes = "完工自审管理审核")
 	@PostMapping(value = "/completeAudit")
 	@Transactional
-	public ResponseModel completeAudit( @RequestBody Map<String,String> kv) {
+	public ResponseModel completeAudit(@RequestBody Map<String, String> kv) {
 		return basicGridAcceptanceServiceImpl.completeAudit(kv);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "整改单下发",   notes = "整改单下发")
+	@ApiOperation(httpMethod = "GET", value = "整改单下发", notes = "整改单下发")
 	@PostMapping(value = "/addRectification")
 	@Transactional
-	public ResponseModel addRectification( @RequestBody HygfRectificationOrder hygfReplenishment) {
-
-
+	public ResponseModel addRectification(@RequestBody HygfRectificationOrder hygfReplenishment) {
 
 		return basicGridAcceptanceServiceImpl.addRectification(hygfReplenishment);
 
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "POST",value = "整改单添加信息",   notes = "整改单添加信息")
+	@ApiOperation(httpMethod = "POST", value = "整改单添加信息", notes = "整改单添加信息")
 	@PostMapping(value = "/nextTaskExcute")
 	@Transactional
-	public ResponseModel nextTaskExcute( @RequestBody HygfRectificationOrder hygfReplenishment) {
-
+	public ResponseModel nextTaskExcute(@RequestBody HygfRectificationOrder hygfReplenishment) {
 
 		return basicGridAcceptanceServiceImpl.nextTaskExcute(hygfReplenishment);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "POST",value = "整改单审核",   notes = "整改单审核")
+	@ApiOperation(httpMethod = "POST", value = "整改单审核", notes = "整改单审核")
 	@PostMapping(value = "/nextTaskAduit")
 	@Transactional
-	public ResponseModel nextTaskAduit( @RequestBody HygfRectificationOrder hygfReplenishment) {
-
+	public ResponseModel nextTaskAduit(@RequestBody HygfRectificationOrder hygfReplenishment) {
 
 		return basicGridAcceptanceServiceImpl.nextTaskAduit(hygfReplenishment);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "PUT",value = "整改单作废",   notes = "整改单作废")
+	@ApiOperation(httpMethod = "PUT", value = "整改单作废", notes = "整改单作废")
 	@PutMapping(value = "/rollback")
 	@Transactional
-	public ResponseModel rollback( @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-
+	public ResponseModel rollback(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
 
 		return basicGridAcceptanceServiceImpl.rollback(sequenceNbr);
 	}
 
-
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/test1")
 	@ApiOperation(httpMethod = "POST", value = "执行工作流", notes = "执行工作流")
@@ -318,10 +309,9 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/test2")
 	@ApiOperation(httpMethod = "POST", value = "执行工作流", notes = "执行工作流")
-	public ResponseModel test(String approvalStatus,String comment) {
-		basicGridAcceptanceServiceImpl.zhixing(approvalStatus,comment);
+	public ResponseModel test(String approvalStatus, String comment) {
+		basicGridAcceptanceServiceImpl.zhixing(approvalStatus, comment);
 		return ResponseHelper.buildResponse(null);
 	}
 
-
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommonController.java

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@Api(tags = "公共接口")
+@RequestMapping(value = "/common")
+public class CommonController {
+
+    @Autowired
+    FinancingInfoServiceImpl financingInfoService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/selectRegion")
+    @ApiOperation(httpMethod = "GET", value = "查询全国省份", notes = "查询全国省份")
+    public ResponseModel<List<Map<String,Object>>> selectRegion() {
+        return ResponseHelper.buildResponse(financingInfoService.selectRegion());
+    }
+
+
+
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingInfoController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.module.hygf.api.dto.IdsDTO;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseUtil;
 import org.springframework.beans.BeanUtils;
@@ -12,6 +13,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -55,6 +58,20 @@ public class FinancingInfoController extends BaseController {
 	}
 
     /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/updateState")
+	@ApiOperation(httpMethod = "PUT", value = "新增", notes = "新增")
+	@Transactional
+	public ResponseModel updateState(@RequestBody IdsDTO ids) {
+		financingInfoServiceImpl.updateState(ids.getIds());
+	    return ResponseHelper.buildResponse(null);
+	}
+
+	/**
      * 根据sequenceNbr更新
      *
      * @param sequenceNbr 主键
@@ -86,6 +103,27 @@ public class FinancingInfoController extends BaseController {
 	    return ResponseHelper.buildResponse(model);
 	}
 
+
+
+	/**
+	 * 根据sequenceNbr更新
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/updateMoney")
+	@ApiOperation(httpMethod = "PUT", value = "批量放款录入", notes = "批量放款录入")
+	@Transactional
+	public ResponseModel<FinancingInfoDto> updateMoney(@RequestBody FinancingInfoDto financingInfoDto) {
+
+
+		financingInfoServiceImpl.upDateMoney(financingInfoDto);
+
+		return ResponseHelper.buildResponse(null);
+	}
+
+
 	/**
      * 根据sequenceNbr删除
      *
@@ -125,11 +163,13 @@ public class FinancingInfoController extends BaseController {
 	public ResponseModel<Page<Map<String, Object>>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size,@RequestParam(value = "type") String type,
 																 @RequestParam(value = "status",required = false) String status,
 																 @RequestParam(value = "regionalCompaniesCode" ,required = false) String regionalCompaniesCode ,
+																 @RequestParam(value = "region" ,required = false) String region ,
+																 @RequestParam(value = "batchNo" ,required = false) String batchNo ,
 																 @RequestParam(value = "ownersName",required = false) String ownersName){
 	    Page<Map<String, Object>> page = new Page<Map<String, Object>>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName));
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName, region,batchNo));
 	}
 
 	/**
@@ -171,4 +211,11 @@ public class FinancingInfoController extends BaseController {
 		return CommonResponseNewUtil.success(financingInfoServiceImpl.selectOrgList());
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "融资机构列表根据区域公司Id过滤",   notes = "orgListByqyid")
+	@GetMapping(value = "/orgListByqyid")
+	public ResponseModel<List<Map<String,Object>>> orgListByqyid(@RequestParam(value = "code") String code) {
+		return CommonResponseNewUtil.success(financingInfoServiceImpl.orgListByqyid(code));
+	}
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingRegionalController.java

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
+import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRegional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.Arrays;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingRegionalServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingRegionalDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 融资机构区域公司绑定表
+ *
+ * @author system_generator
+ * @date 2024-09-19
+ */
+@RestController
+@Api(tags = "融资机构区域公司绑定表Api")
+@RequestMapping(value = "/financing-regional")
+public class FinancingRegionalController extends BaseController {
+
+    @Autowired
+    FinancingRegionalServiceImpl financingRegionalServiceImpl;
+
+    /**
+     * 新增融资机构区域公司绑定表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增融资机构区域公司绑定表", notes = "新增融资机构区域公司绑定表")
+	public ResponseModel<FinancingRegionalDto> save(@RequestBody FinancingRegionalDto model) {
+
+
+		financingRegionalServiceImpl.saveModel(model);
+	    return ResponseHelper.buildResponse(null);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新融资机构区域公司绑定表", notes = "根据sequenceNbr更新融资机构区域公司绑定表")
+	public ResponseModel<FinancingRegionalDto> updateBySequenceNbrFinancingRegional(@RequestBody FinancingRegionalDto model) {
+		financingRegionalServiceImpl.updateModel(model);
+	    return ResponseHelper.buildResponse(null);
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除融资机构区域公司绑定表", notes = "根据sequenceNbr删除融资机构区域公司绑定表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+
+		financingRegionalServiceImpl.removeModel(sequenceNbr);
+
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个融资机构区域公司绑定表",  notes = "根据sequenceNbr查询单个融资机构区域公司绑定表")
+	public ResponseModel<FinancingRegionalDto> selectOne(@PathVariable Long sequenceNbr) {
+		FinancingRegionalDto financingRegionalDto = financingRegionalServiceImpl.queryBySeq(sequenceNbr);
+		financingRegionalDto.setFinancing(Arrays.asList(financingRegionalDto.getFinancingId().split(",")));
+		financingRegionalDto.setRegionalCompanies(Arrays.asList(financingRegionalDto.getRegionalCompaniesSeq().split(",")));
+		return ResponseHelper.buildResponse(financingRegionalDto);
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "融资机构区域公司绑定表分页查询",  notes = "融资机构区域公司绑定表分页查询")
+	@UserLimits
+	public ResponseModel<Page<FinancingRegional>> queryForPage(@RequestParam(value = "current") int current,
+															   @RequestParam(value = "size") int size,
+															   @RequestParam(value = "regionalCompaniesName",required = false) String regionalCompaniesName,
+															   @RequestParam(value = "province",required = false) String province
+
+	) {
+
+	    return ResponseHelper.buildResponse(financingRegionalServiceImpl.queryForFinancingRegionalPage(current,size,regionalCompaniesName,province));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "融资机构区域公司绑定表列表全部数据查询",   notes = "融资机构区域公司绑定表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FinancingRegionalDto>> selectForList() {
+	    return ResponseHelper.buildResponse(financingRegionalServiceImpl.queryForFinancingRegionalList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -12,6 +12,8 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
+import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
+import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DayGenerateServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpStationServiceImpl;
 import io.swagger.annotations.Api;
@@ -423,7 +425,7 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限区域公司", notes = "查询当前登录人权限区域公司")
     @GetMapping(value = "/getRegion")
     @UserLimits
-    public ResponseModel<List<Map<String, String>>> getRegion(String regionName) {
+    public ResponseModel<List<Map<String, String>>> getRegion(@RequestParam(required = false) String regionName) {
 
         List<DropDown> list = jpStationMapper.getRegion(regionName);
         List<Map<String, String>> result = new ArrayList<>();
@@ -436,6 +438,31 @@ public class JpStationController extends BaseController {
 
         return ResponseHelper.buildResponse(result);
     }
+    //查询当前登录人权限区域公司
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限区域公司", notes = "查询当前登录人权限区域公司")
+    @GetMapping(value = "/getRegionByProvince")
+    @UserLimits
+    public ResponseModel<List<Map<String, String>>> getRegionByProvince(String province) {
+        if (StringUtils.isEmpty(province)){
+            return CommonResponseNewUtil.success();
+        }
+
+        List<String> ids = jpStationMapper.getRegionNode(province);
+
+        List<DropDown> list = jpStationMapper.getRegionByProvince(ids);
+        List<Map<String, String>> result = new ArrayList<>();
+        list.forEach(dropDown -> {
+            Map<String, String> item = new HashMap<>();
+            item.put("text", dropDown.getName());
+            item.put("value", dropDown.getOrgCode());
+            item.put("values", dropDown.getText());
+            item.put("id", dropDown.getId());
+            result.add(item);
+        });
+
+        return ResponseHelper.buildResponse(result);
+    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限区域公司", notes = "查询当前登录人权限区域公司")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java

@@ -210,7 +210,8 @@ public class PeasantHouseholdController extends BaseController {
 															  @RequestParam(value = "ownersName",required = false)String ownersName,
 															  @RequestParam(value = "preparationMoneyState",required = false)String preparationMoneyState,
 															  @RequestParam(value = "developerId",required = false)Long developerId,
-															  @RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo) {
+															  @RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo,
+															  @RequestParam(value = "province",required = false) String province) {
 	    Page<PeasantHousehold> page = new Page<PeasantHousehold>();
 	    page.setCurrent(current);
 	    page.setSize(size);
@@ -223,7 +224,7 @@ public class PeasantHouseholdController extends BaseController {
 //        String orgCode = userUnitInformationDto.getAmosDealerOrgCode();
 
 		Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
-		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState, peasantHouseholdNo));
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState, peasantHouseholdNo,province));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java

@@ -104,12 +104,13 @@ public class PowerStationController extends BaseController {
                                                             @RequestParam(value = "ownersName",required = false)String ownersName,
                                                             @RequestParam(value = "serviceAgent",required = false)String serviceAgent,
                                                             @RequestParam(value = "processStatus",required = false) String processStatus,
-                                                            @RequestParam(value = "regionalCompaniesName",required = false)String regionalCompaniesName) {
+                                                            @RequestParam(value = "regionalCompaniesName",required = false)String regionalCompaniesName,
+                                                            @RequestParam(value = "province",required = false)String province) {
 	    Page<PowerStationDto> page = new Page<PowerStationDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 		AgencyUserModel userInfo = getUserInfo();
-		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName,processStatus));
+		return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName,processStatus,province));
 	}
 
 	/**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -11,10 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfReplenishment;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfReplenishmentServiceImpl;
@@ -57,6 +54,8 @@ public class PreparationMoneyController extends BaseController {
 	@Autowired
 	HouseholdContractMapper householdContractMapper;
 	@Autowired
+	PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     DesignInformationServiceImpl designInformationService;
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
@@ -233,6 +232,7 @@ public class PreparationMoneyController extends BaseController {
 			list.forEach(e -> {
 				if(e.getPeasantHouseholdNo() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 
@@ -343,9 +343,10 @@ public class PreparationMoneyController extends BaseController {
 			@RequestParam(value = "regionalcompaniesSeq",required = false) String regionalcompaniesSeq,
 			@RequestParam(value = "developerId",required = false) String developerId,
 			@RequestParam(value = "state",required = false) String state,
-			@RequestParam(value = "preparationMoneyState") String preparationMoneyState){
+			@RequestParam(value = "preparationMoneyState") String preparationMoneyState,
+			@RequestParam(value = "province",required = false) String province){
 
-		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state)) ;
+		return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province)) ;
 	}
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java

@@ -46,6 +46,8 @@ public class WorkOrderController extends BaseController {
     WorkOrderMapper workOrderMapper;
     @Autowired
     HouseholdContractMapper householdContractMapper;
+    @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
 
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
@@ -173,6 +175,16 @@ public class WorkOrderController extends BaseController {
         Page<PeasantHousehold> page = new Page<>();
         PageHelper.startPage(current,size);
         List<PeasantHousehold> list=workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr,ownersName);
+
+        if(list != null && list.size() > 0) {
+            list.forEach(e -> {
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+                }
+            });
+        }
+
         PageInfo<PeasantHousehold> pageInfo = new PageInfo<>(list);
         page.setSize(pageInfo.getSize());
         page.setCurrent(pageInfo.getPageNum());
@@ -231,6 +243,7 @@ public class WorkOrderController extends BaseController {
                 }
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
 
             });
@@ -256,6 +269,7 @@ public class WorkOrderController extends BaseController {
             list.forEach(e -> {
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -18,6 +19,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceCheckService;
 import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.component.robot.BadRequest;
@@ -56,16 +58,22 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     @Autowired
     AcceptanceCheckMapper acceptanceCheckMapper;
     @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
     @Autowired
     HouseholdContractMapper householdContractMapper;
     @Autowired
     ConstructionAcceptanceRecordsServiceImpl acceptanceRecordsService;
+    @Autowired
+    FinancingInfoServiceImpl financingInfoService;
+    @Autowired
+    FinancingAuditingServiceImpl financingAuditingService;
 
 
     public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
                                                String projectAddress, String powerStationCode, String ownersName, String acceptanceCheckStatus,
-                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type) throws Exception {
+                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province) throws Exception {
         PageHelper.startPage(current, size);
         Map<String, Object> map = new HashMap<>();
         Date date = null;
@@ -82,12 +90,14 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("amosDealerId", amosDealerId);
         map.put("basicGridNodes",basicGridNodes);
         map.put("type",type);
+        map.put("province",province);
         List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
 
         if(list != null && list.size() > 0) {
             list.forEach(e -> {
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
         }
@@ -360,7 +370,20 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                     up.set(AcceptanceCheck::getAcceptanceTime,new Date());
                     up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
                     //验收完成后需对投融数据进行处理。
+                    LambdaUpdateWrapper<FinancingInfo> wrapper = new LambdaUpdateWrapper<>();
+                    wrapper.eq(FinancingInfo::getPeasantHouseholdId,basicGridRecord.getPeasantHouseholdId());
+                    wrapper.set(FinancingInfo::getStatus,"待推送");
+                    financingInfoService.update(null,wrapper);
 
+                    LambdaQueryWrapper<FinancingAuditing> finQuery = new LambdaQueryWrapper<>();
+                    finQuery.eq(FinancingAuditing::getPeasantHouseholdId,basicGridRecord.getPeasantHouseholdId());
+                    finQuery.orderByDesc(BaseEntity::getRecDate);
+                    finQuery.last("limit 1");
+                    FinancingAuditing financingAuditing = financingAuditingService.getBaseMapper().selectOne(finQuery);
+                    if (!Objects.isNull(financingAuditing)){
+                        financingInfoService.execueFlow(MapBuilder.<String,Object>create().put("instanceId",financingAuditing.getInstanceId()).put("approvalStatus","0").put("isZG","1").build());
+
+                    }
                 }
                 this.wofkflowExcute(instanceId, approvalStatus , comment  ,BusinessWorkflowKey.资产审核.getCode() );
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -57,6 +57,8 @@ public class BasicGridAcceptanceServiceImpl
 	@Autowired
 	PersonnelBusinessMapper personnelBusinessMapper;
 	@Autowired
+	PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+	@Autowired
 	WorkflowImpl workflow;
 	@Autowired
 	AcceptanceCheckItemMapper acceptanceCheckItemMapper;
@@ -66,7 +68,7 @@ public class BasicGridAcceptanceServiceImpl
 	RegionalCompaniesMapper regionalCompaniesMapper;
 	@Autowired
 	WorkOrderMapper workOrderMapper;
-	@Resource (type = RedisLockUtil.class)
+	@Resource(type = RedisLockUtil.class)
 	private RedisLockUtil redisLockUtil;
 	@Autowired
 	PeasantHouseholdMapper peasantHouseholdMapper;
@@ -92,7 +94,8 @@ public class BasicGridAcceptanceServiceImpl
 
 	public Page<BasicGridRecordDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
 			String projectAddress, String powerStationCode, String ownersName, String gridStatus,
-												   String gridConnectionTime, String formType,List<String> basicGridNodes,String type) throws Exception {
+			String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province)
+			throws Exception {
 		PageHelper.startPage(current, size);
 		Map<String, Object> map = new HashMap<>();
 		Date date = null;
@@ -107,8 +110,9 @@ public class BasicGridAcceptanceServiceImpl
 		map.put("formType", formType);
 		map.put("regionCompanyId", regionCompanyId);
 		map.put("amosDealerId", amosDealerId);
-		map.put("basicGridNodes",basicGridNodes);
-		map.put("type",type);
+		map.put("basicGridNodes", basicGridNodes);
+		map.put("type", type);
+		map.put("province", province);
 		List<BasicGridRecordDto> list = basicGridAcceptanceMapper.selectPageList(map);
 		PageInfo<BasicGridRecordDto> page = new PageInfo(list);
 		Page<BasicGridRecordDto> pageNew = new Page<>();
@@ -116,10 +120,12 @@ public class BasicGridAcceptanceServiceImpl
 		pageNew.setTotal(page.getTotal());
 		pageNew.setSize(size);
 
-		if(page.getList() != null && page.getList().size() > 0) {
+		if (page.getList() != null && page.getList().size() > 0) {
 			page.getList().forEach(e -> {
-				if(e.getPeasantHouseholdNo() != null) {
+				if (e.getPeasantHouseholdNo() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper
+							.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 		}
@@ -131,12 +137,12 @@ public class BasicGridAcceptanceServiceImpl
 	public synchronized HygfOnGrid saveEntity(HygfOnGrid grid) {
 		LambdaQueryWrapper<HygfOnGrid> hog = new LambdaQueryWrapper<>();
 		hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
-		hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
+		hygfOnGridServiceImpl.saveOrUpdate(grid, hog);
 		return grid;
 	}
 
-	public void testKAIQI(){
-		//开启工作流 并执行一步
+	public void testKAIQI() {
+		// 开启工作流 并执行一步
 		ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
 		List<ActWorkflowStartDTO> params = new ArrayList<>();
 		ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
@@ -151,7 +157,7 @@ public class BasicGridAcceptanceServiceImpl
 		List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
 		List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfos(processTaskDTOS);
 
-		workflowResultDtos.forEach(e->{
+		workflowResultDtos.forEach(e -> {
 			BasicGridAuditingDto basicGridAuditingDto = new BasicGridAuditingDto();
 			BeanUtils.copyProperties(e, basicGridAuditingDto);
 			basicGridAuditingDto.setPeasantHouseholdId(20248001107L);
@@ -161,16 +167,15 @@ public class BasicGridAcceptanceServiceImpl
 
 	}
 
-
-	public void zhixing(String approvalStatus,String comment){
+	public void zhixing(String approvalStatus, String comment) {
 		LambdaQueryWrapper<BasicGridAuditing> query = new LambdaQueryWrapper<>();
 		query.eq(BasicGridAuditing::getPeasantHouseholdId, 20248001107L);
-		query.eq(BasicGridAuditing::getNextNodeKey,"gongchengshenhe");
+		query.eq(BasicGridAuditing::getNextNodeKey, "gongchengshenhe");
 		query.orderByDesc(BaseEntity::getRecDate);
 		query.last("limit 1");
 		BasicGridAuditing basicGridAuditing = basicGridAuditingService.getBaseMapper().selectOne(query);
 
-		//组装信息
+		// 组装信息
 		TaskResultDTO task = new TaskResultDTO();
 
 		task.setTaskId(basicGridAuditing.getNextTaskId());
@@ -178,11 +183,12 @@ public class BasicGridAcceptanceServiceImpl
 		BasicGridAuditingDto basicGridAuditingDto = new BasicGridAuditingDto();
 		task.setResultCode("approvalStatus");
 		map.put("approvalStatus", approvalStatus);
-		task.setComment(comment == null?"":comment);
+		task.setComment(comment == null ? "" : comment);
 		task.setVariable(map);
-		//执行流程
+		// 执行流程
 		ProcessTaskDTO processTaskDTO = workFlowService.complete(basicGridAuditing.getNextTaskId(), task);
-		List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
+		List<WorkflowResultDto> workflowResultDtos = workFlowService
+				.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
 		WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
 		BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
 		basicGridAuditingDto.setPeasantHouseholdId(basicGridAuditing.getPeasantHouseholdId());
@@ -194,25 +200,23 @@ public class BasicGridAcceptanceServiceImpl
 		basicGridAuditingService.createWithModel(basicGridAuditingDto);
 	}
 
-
 	public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String realName) {
 
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper()
-				.selectOne(new LambdaQueryWrapper<BasicGridRecord>()
-						.eq(BasicGridRecord::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
-
+				.selectOne(new LambdaQueryWrapper<BasicGridRecord>().eq(BasicGridRecord::getWorkOrderPowerStationId,
+						grid.getWorkOrderPowerStationId()));
 
 		LambdaUpdateWrapper<BasicGridRecord> update = new LambdaUpdateWrapper<>();
-		update.set(BasicGridRecord::getGridStatus,GridStatusEnum.JXSGLYDSH.getCode());
-		update.set(BasicGridRecord::getBasicGridNode,"jxsAdmin");
+		update.set(BasicGridRecord::getGridStatus, GridStatusEnum.JXSGLYDSH.getCode());
+		update.set(BasicGridRecord::getBasicGridNode, "jxsAdmin");
 		if (grid.getType() != null && "1".equals(grid.getType())) {
 			// 执行工作流
-		    this.wofkflowExcute(basicGridRecord.getInstanceId(),"0","重新登记",BusinessWorkflowKey.并网登记.getCode());
-			update.set(BasicGridRecord::getPowerStationAreaStatus,null);
-			update.set(BasicGridRecord::getPowerStationDesignStatus,null);
-			update.set(BasicGridRecord::getPowerStationEngineeringStatus,null);
+			this.wofkflowExcute(basicGridRecord.getInstanceId(), "0", "重新登记", BusinessWorkflowKey.并网登记.getCode());
+			update.set(BasicGridRecord::getPowerStationAreaStatus, null);
+			update.set(BasicGridRecord::getPowerStationDesignStatus, null);
+			update.set(BasicGridRecord::getPowerStationEngineeringStatus, null);
 		} else {
-			//开启工作流 并执行一步
+			// 开启工作流 并执行一步
 			ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
 			List<ActWorkflowStartDTO> params = new ArrayList<>();
 			ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
@@ -233,7 +237,7 @@ public class BasicGridAcceptanceServiceImpl
 			basicGridAuditingDto.setPeasantHouseholdId(grid.getPeasantHouseholdId());
 			basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
 			basicGridAuditingService.createWithModel(basicGridAuditingDto);
-			update.set(BasicGridRecord::getInstanceId,basicGridAuditingDto.getInstanceId());
+			update.set(BasicGridRecord::getInstanceId, basicGridAuditingDto.getInstanceId());
 
 			// 线上验收
 			LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
@@ -243,7 +247,7 @@ public class BasicGridAcceptanceServiceImpl
 			peasantHouseholdMapper.update(null, up);
 		}
 
-		//防止重复提交
+		// 防止重复提交
 //		if (grid.getSequenceNbr() != null) {
 //			onGridMapper.updateById(grid);
 //		} else {
@@ -251,17 +255,16 @@ public class BasicGridAcceptanceServiceImpl
 //		}
 		LambdaQueryWrapper<HygfOnGrid> hog = new LambdaQueryWrapper<>();
 		hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
-		hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
-
-		update.eq(BaseEntity::getSequenceNbr,basicGridRecord.getSequenceNbr());
-		basicGridRecordService.update(null,update);
+		hygfOnGridServiceImpl.saveOrUpdate(grid, hog);
 
+		update.eq(BaseEntity::getSequenceNbr, basicGridRecord.getSequenceNbr());
+		basicGridRecordService.update(null, update);
 
-		ConstructionGirdRecords da = new ConstructionGirdRecords(realName, "提交并网资料",
-				new Date(), "", basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
+		ConstructionGirdRecords da = new ConstructionGirdRecords(realName, "提交并网资料", new Date(), "",
+				basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
 				basicGridRecord.getPeasantHouseholdId(), "");
 		constructionGirdRecords.save(da);
-		//发起待办
+		// 发起待办
 //		commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
 		return grid;
 	}
@@ -332,7 +335,8 @@ public class BasicGridAcceptanceServiceImpl
 		}
 		try {
 			// 查询并网审批信息
-			BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
+			BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper
+					.selectById(dto.getBasicGridAcceptanceId());
 			String beforeAcceptanceStatus = basicGridAcceptanc.getAcceptanceStatus();
 			String nextNodeKey = basicGridAcceptanc.getNextNodeKey();
 			if (OK.equals(dto.getApprovalStatus())) {
@@ -352,19 +356,21 @@ public class BasicGridAcceptanceServiceImpl
 					peasantHouseholdMapper.update(null, up);
 
 				} else {
-					AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, dto.getApprovalStatus());
+					AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey,
+							dto.getApprovalStatus());
 					if (acceptanceStatus == null) {
 						// 说明工作流节点状态执行错误
 						throw new BadRequest("其他用户正在操作，请刷新后再试！");
 					}
-					basicGridAcceptanc
-							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
+					basicGridAcceptanc.setAcceptanceStatus(
+							AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				}
 
 			} else {
 				if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
 					basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
-					basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
+					basicGridAcceptanc.setAcceptanceStatus(
+							AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				}
 				// 投融/法务/工程/线下验收审核不通过
 				else if (BasicGridAcceptancEnum.管理端投融审核.getCode().equals(nextNodeKey)
@@ -383,21 +389,23 @@ public class BasicGridAcceptanceServiceImpl
 						rectificationOrder.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
 						rectificationOrder.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
 						rectificationOrder.setProblemDescription(dto.getComment());
-						rectificationOrder.setRectificationStatus(String.valueOf(RectificationStatusEnum.待整改.getCode()));
+						rectificationOrder
+								.setRectificationStatus(String.valueOf(RectificationStatusEnum.待整改.getCode()));
 					} catch (Exception e) {
 						throw new RuntimeException(e);
 					}
 					acceptanceRectificationOrderMapper.insert(rectificationOrder);
-					basicGridAcceptanc
-							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
+					basicGridAcceptanc.setAcceptanceStatus(
+							AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				} else {
-					AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, dto.getApprovalStatus());
+					AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey,
+							dto.getApprovalStatus());
 					if (acceptanceStatus == null) {
 						// 说明工作流节点状态执行错误
 						throw new BadRequest("其他用户正在操作，请刷新后再试！");
 					}
-					basicGridAcceptanc
-							.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
+					basicGridAcceptanc.setAcceptanceStatus(
+							AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
 				}
 			}
 
@@ -437,7 +445,8 @@ public class BasicGridAcceptanceServiceImpl
 
 			// 验收完成
 			System.out.println("验收完成===============================" + workBasicGridAcceptance.getNextTaskId());
-			System.out.println("验收完成888888===============================" + workBasicGridAcceptance.getAcceptanceStatus());
+			System.out.println(
+					"验收完成888888===============================" + workBasicGridAcceptance.getAcceptanceStatus());
 
 			if ("10".equals(workBasicGridAcceptance.getAcceptanceStatus())) {
 				// 更新状态
@@ -456,17 +465,17 @@ public class BasicGridAcceptanceServiceImpl
 	}
 
 	// 工作流执行一步
-	public void wofkflowExcute(String instanceId, String approvalStatus,String comment,String taskKey) {
+	public void wofkflowExcute(String instanceId, String approvalStatus, String comment, String taskKey) {
 		LambdaQueryWrapper<BasicGridAuditing> query = new LambdaQueryWrapper<>();
 		query.eq(BasicGridAuditing::getInstanceId, instanceId);
 		query.orderByDesc(BaseEntity::getRecDate);
 		query.last("limit 1");
 		BasicGridAuditing basicGridAuditing = basicGridAuditingService.getBaseMapper().selectOne(query);
 
-		if (!taskKey.contains(basicGridAuditing.getNextNodeKey())){
+		if (!taskKey.contains(basicGridAuditing.getNextNodeKey())) {
 			throw new BadRequest("无可执行任务");
 		}
-		//组装信息
+		// 组装信息
 		TaskResultDTO task = new TaskResultDTO();
 
 		task.setTaskId(basicGridAuditing.getNextTaskId());
@@ -474,11 +483,12 @@ public class BasicGridAcceptanceServiceImpl
 		BasicGridAuditingDto basicGridAuditingDto = new BasicGridAuditingDto();
 		task.setResultCode("approvalStatus");
 		map.put("approvalStatus", approvalStatus);
-		task.setComment(comment == null?"":comment);
+		task.setComment(comment == null ? "" : comment);
 		task.setVariable(map);
-		//执行流程
+		// 执行流程
 		ProcessTaskDTO processTaskDTO = workFlowService.complete(basicGridAuditing.getNextTaskId(), task);
-		List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
+		List<WorkflowResultDto> workflowResultDtos = workFlowService
+				.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
 		WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
 		BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
 		basicGridAuditingDto.setPeasantHouseholdId(basicGridAuditing.getPeasantHouseholdId());
@@ -490,28 +500,26 @@ public class BasicGridAcceptanceServiceImpl
 		basicGridAuditingService.createWithModel(basicGridAuditingDto);
 	}
 
-
-
-
-	public void completeAdminAudit(Map<String,String> kv) {
+	public void completeAdminAudit(Map<String, String> kv) {
 		String instanceId = kv.get("instanceId");
 		String sequenceNbr = kv.get("sequenceNbr");
 		String comment = kv.get("comment");
 		String approvalStatus = kv.get("approvalStatus");
 
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectById(sequenceNbr);
-				//执行工作流
-		this.wofkflowExcute(instanceId, approvalStatus , comment,BusinessWorkflowKey.经销商管理员审核.getCode());
-		//修改并网数据状态
-		basicGridRecord.setGridStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode());
-		basicGridRecord.setBasicGridNode(approvalStatus.equals("0")?"bw-area":null);
+		// 执行工作流
+		this.wofkflowExcute(instanceId, approvalStatus, comment, BusinessWorkflowKey.经销商管理员审核.getCode());
+		// 修改并网数据状态
+		basicGridRecord.setGridStatus(
+				approvalStatus.equals("0") ? GridStatusEnum.PQYYDSH.getCode() : GridStatusEnum.WTG.getCode());
+		basicGridRecord.setBasicGridNode(approvalStatus.equals("0") ? "bw-area" : null);
 		basicGridRecordService.updateById(basicGridRecord);
 		// 增加操作日志
 		ConstructionGirdRecords da = new ConstructionGirdRecords();
 		da.setOperationTime(new Date());
-		da.setOperationContent("并网管理-经销商管理员审核-"+(approvalStatus.equals("0")?"通过":"驳回"));
+		da.setOperationContent("并网管理-经销商管理员审核-" + (approvalStatus.equals("0") ? "通过" : "驳回"));
 		da.setOperator(kv.get("operator"));
-		da.setOperationResults(approvalStatus.equals("0")?"通过":"驳回");
+		da.setOperationResults(approvalStatus.equals("0") ? "通过" : "驳回");
 		da.setGridId(basicGridRecord.getSequenceNbr());
 		da.setWorkOrderPowerStationId(basicGridRecord.getWorkOrderPowerStationId());
 		da.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
@@ -519,10 +527,7 @@ public class BasicGridAcceptanceServiceImpl
 		constructionGirdRecords.save(da);
 	}
 
-
-
-
-	public ResponseModel completeAudit(Map<String,String> kv) {
+	public ResponseModel completeAudit(Map<String, String> kv) {
 		String instanceId = kv.get("instanceId");
 		String sequenceNbr = kv.get("sequenceNbr");
 		String comment = kv.get("comment");
@@ -533,51 +538,52 @@ public class BasicGridAcceptanceServiceImpl
 		ConstructionGirdRecords da = new ConstructionGirdRecords();
 
 		LambdaUpdateWrapper<BasicGridRecord> up = new LambdaUpdateWrapper<>();
-		switch (status){
+		switch (status) {
 		case "bw-area":
-				up.set(BasicGridRecord::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
-				if (approvalStatus.equals("0")){
-					up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
+			up.set(BasicGridRecord::getPowerStationAreaStatus, approvalStatus.equals("0") ? "通过" : "驳回");
+			if (approvalStatus.equals("0")) {
+				up.set(BasicGridRecord::getBasicGridNode, "bw-design,bw-engineering");
+				up.set(BasicGridRecord::getGridStatus, GridStatusEnum.ROLESDSH.getCode());
 				int num = 0;
-					//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
+				// 如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
 				LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
-					query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
-					query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核"));
-					query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("bw-design","bw-engineering"));
-					List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper().selectList(query);
+				query.eq(HygfRectificationOrder::getPeasantHouseholeId, basicGridRecord.getPeasantHouseholdId());
+				query.in(HygfRectificationOrder::getRectificationStatus, Arrays.asList("待整改", "待审核"));
+				query.in(HygfRectificationOrder::getRectificationSource, Arrays.asList("bw-design", "bw-engineering"));
+				List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper()
+						.selectList(query);
 				for (HygfRectificationOrder hygfRectificationOrder : hygfRectificationOrders) {
-						if (hygfRectificationOrder.getRectificationStatus().equals("待审核")){
-							up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
+					if (hygfRectificationOrder.getRectificationStatus().equals("待审核")) {
+						up.set(BasicGridRecord::getGridStatus, GridStatusEnum.ZGDSH.getCode());
 						num = 1;
 						break;
 					}
 				}
-					if (CollUtil.isNotEmpty(hygfRectificationOrders) && num == 0){
-						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+				if (CollUtil.isNotEmpty(hygfRectificationOrders) && num == 0) {
+					up.set(BasicGridRecord::getGridStatus, GridStatusEnum.DZG.getCode());
 				}
 
 			}
 
-				da.setOperationContent("并网验收-片区运营审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
-
+			da.setOperationContent("并网验收-片区运营审核-" + (approvalStatus.equals("0") ? "通过" : "驳回"));
 
-				this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.片区运营审核.getCode() );
+			this.wofkflowExcute(instanceId, approvalStatus, comment, BusinessWorkflowKey.片区运营审核.getCode());
 			break;
 		case "bw-design":
-				up.set(BasicGridRecord::getPowerStationDesignStatus,approvalStatus.equals("0")?"通过":"驳回");
-				da.setOperationContent("并网验收-设计审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
-				if (basicGridRecord.getPowerStationEngineeringStatus() != null && basicGridRecord.getPowerStationEngineeringStatus().equals("通过")&&approvalStatus.equals("0") ){
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.YWC.getCode());
-					this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.设计审核.getCode() );
-					up.set(BasicGridRecord::getBasicGridNode,"all");
-					up.set(BasicGridRecord::getGridTime,new Date());
+			up.set(BasicGridRecord::getPowerStationDesignStatus, approvalStatus.equals("0") ? "通过" : "驳回");
+			da.setOperationContent("并网验收-设计审核-" + (approvalStatus.equals("0") ? "通过" : "驳回"));
+			if (basicGridRecord.getPowerStationEngineeringStatus() != null
+					&& basicGridRecord.getPowerStationEngineeringStatus().equals("通过") && approvalStatus.equals("0")) {
+				up.set(BasicGridRecord::getGridStatus, GridStatusEnum.YWC.getCode());
+				this.wofkflowExcute(instanceId, approvalStatus, comment, BusinessWorkflowKey.设计审核.getCode());
+				up.set(BasicGridRecord::getBasicGridNode, "all");
+				up.set(BasicGridRecord::getGridTime, new Date());
 				LambdaUpdateWrapper<PeasantHousehold> wrapper = new LambdaUpdateWrapper<>();
-					wrapper.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.并网完成.getCode());
-					wrapper.eq(BaseEntity::getSequenceNbr,basicGridRecord.getPeasantHouseholdId());
-					peasantHouseholdMapper.update(null,wrapper);
+				wrapper.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
+				wrapper.eq(BaseEntity::getSequenceNbr, basicGridRecord.getPeasantHouseholdId());
+				peasantHouseholdMapper.update(null, wrapper);
 				AcceptanceCheck acceptanceCheck = new AcceptanceCheck();
-					BeanUtils.copyProperties(basicGridRecord,acceptanceCheck);
+				BeanUtils.copyProperties(basicGridRecord, acceptanceCheck);
 				acceptanceCheck.setSequenceNbr(null);
 				acceptanceCheck.setRectificationStatus(null);
 				acceptanceCheck.setBasicGridNode(null);
@@ -586,45 +592,50 @@ public class BasicGridAcceptanceServiceImpl
 				acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
 				acceptanceCheckService.saveOrUpdate(acceptanceCheck);
 
-				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") &&  (  Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-engineering")) ) ) {
-					up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
-				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus().contains("bw-engineering") ) {
-					up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
+			} else if (null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0")
+					&& (Objects.isNull(basicGridRecord.getRectificationStatus())
+							|| (!basicGridRecord.getRectificationStatus().contains("bw-engineering")))) {
+				up.set(BasicGridRecord::getBasicGridNode, "bw-engineering");
+				up.set(BasicGridRecord::getGridStatus, GridStatusEnum.GCDSH.getCode());
+			} else if (null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0")
+					&& basicGridRecord.getRectificationStatus().contains("bw-engineering")) {
+				up.set(BasicGridRecord::getBasicGridNode, "bw-engineering");
 				LambdaQueryWrapper<HygfRectificationOrder> query2 = new LambdaQueryWrapper<>();
-					query2.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
-					query2.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核","待提交"));
-					query2.eq(HygfRectificationOrder::getRectificationSource,"bw-engineering");
-					HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query2);
-					if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
-						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
-					}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
-						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
-					}else {
-						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
-					}
-				}
-				else if (null != basicGridRecord.getPowerStationEngineeringStatus() && basicGridRecord.getPowerStationEngineeringStatus().equals("驳回")){
+				query2.eq(HygfRectificationOrder::getPeasantHouseholeId, basicGridRecord.getPeasantHouseholdId());
+				query2.in(HygfRectificationOrder::getRectificationStatus, Arrays.asList("待整改", "待审核", "待提交"));
+				query2.eq(HygfRectificationOrder::getRectificationSource, "bw-engineering");
+				HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper()
+						.selectOne(query2);
+				if (hygfRectificationOrder.getRectificationStatus().equals("待提交")) {
+					up.set(BasicGridRecord::getGridStatus, GridStatusEnum.SJDSH.getCode());
+				} else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")) {
+					up.set(BasicGridRecord::getGridStatus, GridStatusEnum.DZG.getCode());
+				} else {
+					up.set(BasicGridRecord::getGridStatus, GridStatusEnum.ZGDSH.getCode());
+				}
+			} else if (null != basicGridRecord.getPowerStationEngineeringStatus()
+					&& basicGridRecord.getPowerStationEngineeringStatus().equals("驳回")) {
 				return CommonResponseNewUtil.failureMessage("该流程已被工程人员审核驳回，请刷新列表");
-				}else {
-					this.wofkflowExcute(instanceId, approvalStatus , comment,BusinessWorkflowKey.设计审核.getCode()  );
+			} else {
+				this.wofkflowExcute(instanceId, approvalStatus, comment, BusinessWorkflowKey.设计审核.getCode());
 			}
 			break;
 		default:
-				up.set(BasicGridRecord::getPowerStationEngineeringStatus,approvalStatus.equals("0")?"通过":"驳回");
-				da.setOperationContent("并网验收-工程审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
-				if (basicGridRecord.getPowerStationDesignStatus() != null && basicGridRecord.getPowerStationDesignStatus().equals("通过")&&approvalStatus.equals("0") ){
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.YWC.getCode());
-					this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.工程审核.getCode() );
-					up.set(BasicGridRecord::getBasicGridNode,"all");
-					up.set(BasicGridRecord::getGridTime,new Date());
+			up.set(BasicGridRecord::getPowerStationEngineeringStatus, approvalStatus.equals("0") ? "通过" : "驳回");
+			da.setOperationContent("并网验收-工程审核-" + (approvalStatus.equals("0") ? "通过" : "驳回"));
+			if (basicGridRecord.getPowerStationDesignStatus() != null
+					&& basicGridRecord.getPowerStationDesignStatus().equals("通过") && approvalStatus.equals("0")) {
+				up.set(BasicGridRecord::getGridStatus, GridStatusEnum.YWC.getCode());
+				this.wofkflowExcute(instanceId, approvalStatus, comment, BusinessWorkflowKey.工程审核.getCode());
+				up.set(BasicGridRecord::getBasicGridNode, "all");
+				up.set(BasicGridRecord::getGridTime, new Date());
 				LambdaUpdateWrapper<PeasantHousehold> wrapper = new LambdaUpdateWrapper<>();
-					wrapper.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.并网完成.getCode());
-					wrapper.eq(BaseEntity::getSequenceNbr,basicGridRecord.getPeasantHouseholdId());
-					peasantHouseholdMapper.update(null,wrapper);
+				wrapper.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
+				wrapper.eq(BaseEntity::getSequenceNbr, basicGridRecord.getPeasantHouseholdId());
+				peasantHouseholdMapper.update(null, wrapper);
 
 				AcceptanceCheck acceptanceCheck = new AcceptanceCheck();
-					BeanUtils.copyProperties(basicGridRecord,acceptanceCheck);
+				BeanUtils.copyProperties(basicGridRecord, acceptanceCheck);
 				acceptanceCheck.setSequenceNbr(null);
 				acceptanceCheck.setRectificationStatus(null);
 				acceptanceCheck.setBasicGridNode(null);
@@ -633,46 +644,50 @@ public class BasicGridAcceptanceServiceImpl
 				acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
 				acceptanceCheckService.saveOrUpdate(acceptanceCheck);
 
-				}else if( null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0") && (  Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("bw-design")) )) {
-					up.set(BasicGridRecord::getBasicGridNode,"bw-design");
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
-				}else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("bw-design") ) {
-					up.set(BasicGridRecord::getBasicGridNode,"bw-design");
+			} else if (null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0")
+					&& (Objects.isNull(basicGridRecord.getRectificationStatus())
+							|| (!basicGridRecord.getRectificationStatus().contains("bw-design")))) {
+				up.set(BasicGridRecord::getBasicGridNode, "bw-design");
+				up.set(BasicGridRecord::getGridStatus, GridStatusEnum.SJDSH.getCode());
+			} else if (null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0")
+					&& !Objects.isNull(basicGridRecord.getRectificationStatus())
+					&& basicGridRecord.getRectificationStatus().contains("bw-design")) {
+				up.set(BasicGridRecord::getBasicGridNode, "bw-design");
 				LambdaQueryWrapper<HygfRectificationOrder> query1 = new LambdaQueryWrapper<>();
-				query1.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
-				query1.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待审核","待提交"));
-				query1.eq(HygfRectificationOrder::getRectificationSource,"bw-design");
-				HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query1);
-				if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
-				}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
-				}else {
-					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
-				}
-				} else if (null != basicGridRecord.getPowerStationDesignStatus() && basicGridRecord.getPowerStationDesignStatus().equals("驳回")){
+				query1.eq(HygfRectificationOrder::getPeasantHouseholeId, basicGridRecord.getPeasantHouseholdId());
+				query1.in(HygfRectificationOrder::getRectificationStatus, Arrays.asList("待整改", "待审核", "待提交"));
+				query1.eq(HygfRectificationOrder::getRectificationSource, "bw-design");
+				HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper()
+						.selectOne(query1);
+				if (hygfRectificationOrder.getRectificationStatus().equals("待提交")) {
+					up.set(BasicGridRecord::getGridStatus, GridStatusEnum.SJDSH.getCode());
+				} else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")) {
+					up.set(BasicGridRecord::getGridStatus, GridStatusEnum.DZG.getCode());
+				} else {
+					up.set(BasicGridRecord::getGridStatus, GridStatusEnum.ZGDSH.getCode());
+				}
+			} else if (null != basicGridRecord.getPowerStationDesignStatus()
+					&& basicGridRecord.getPowerStationDesignStatus().equals("驳回")) {
 				return CommonResponseNewUtil.failureMessage("该流程已被设计人员审核驳回，请刷新列表");
-				}else {
-					this.wofkflowExcute(instanceId, approvalStatus , comment ,BusinessWorkflowKey.工程审核.getCode()  );
+			} else {
+				this.wofkflowExcute(instanceId, approvalStatus, comment, BusinessWorkflowKey.工程审核.getCode());
 			}
 			break;
 		}
-		if (approvalStatus.equals("1") ){
-			up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
-			up.set(BasicGridRecord::getBasicGridNode,null);
-			up.set(BasicGridRecord::getGridStatus,GridStatusEnum.WTG.getCode());
+		if (approvalStatus.equals("1")) {
+			up.eq(BaseEntity::getSequenceNbr, sequenceNbr);
+			up.set(BasicGridRecord::getBasicGridNode, null);
+			up.set(BasicGridRecord::getGridStatus, GridStatusEnum.WTG.getCode());
 		}
-		//修改并网数据状态
-		if (StringUtils.isNotEmpty(sequenceNbr)){
-			up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
-			basicGridRecordService.getBaseMapper().update(null,up);
+		// 修改并网数据状态
+		if (StringUtils.isNotEmpty(sequenceNbr)) {
+			up.eq(BaseEntity::getSequenceNbr, sequenceNbr);
+			basicGridRecordService.getBaseMapper().update(null, up);
 		}
 
-
-
 		da.setOperationTime(new Date());
 		da.setOperator(kv.get("operator"));
-		da.setOperationResults(approvalStatus.equals("0")?"通过":"驳回");
+		da.setOperationResults(approvalStatus.equals("0") ? "通过" : "驳回");
 		da.setGridId(basicGridRecord.getSequenceNbr());
 		da.setWorkOrderPowerStationId(basicGridRecord.getWorkOrderPowerStationId());
 		da.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
@@ -681,33 +696,32 @@ public class BasicGridAcceptanceServiceImpl
 		return CommonResponseNewUtil.success();
 	}
 
-
-
-
 	public ResponseModel addRectification(HygfRectificationOrder hygfRectificationOrder) {
-		if (Objects.isNull( hygfRectificationOrder.getRectificationSource()) ){
+		if (Objects.isNull(hygfRectificationOrder.getRectificationSource())) {
 			return CommonResponseNewUtil.failureMessage("多角色用户发起整改单，发起人角色不可为空");
 		}
-		if (hygfRectificationOrder.getAddorSubmit().equals("0") && Objects.isNull(hygfRectificationOrder.getRectificationIdea())){
+		if (hygfRectificationOrder.getAddorSubmit().equals("0")
+				&& Objects.isNull(hygfRectificationOrder.getRectificationIdea())) {
 			return CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
 		}
-		if (hygfRectificationOrder.getAddorSubmit().equals("0") && !Objects.isNull(hygfRectificationOrder.getRectificationIdea())){
+		if (hygfRectificationOrder.getAddorSubmit().equals("0")
+				&& !Objects.isNull(hygfRectificationOrder.getRectificationIdea())) {
 			List<Object> rectificationIdea = hygfRectificationOrder.getRectificationIdea();
 			for (Object item : rectificationIdea) {
 				JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(item));
 				Collection<Object> values = jsonObject.values();
-				if (values.size() < 2){
+				if (values.size() < 2) {
 					return CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
 				}
-				if (jsonObject.containsKey("type")){
-					if (null == jsonObject.get("type")){
+				if (jsonObject.containsKey("type")) {
+					if (null == jsonObject.get("type")) {
 						return CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
 					}
 				}
-				if (jsonObject.containsKey("items")){
+				if (jsonObject.containsKey("items")) {
 					JSONArray item1 = jsonObject.getJSONArray("items");
 					for (Object o : item1) {
-						if (!JSON.parseObject(JSON.toJSONString(o)).containsKey("value")){
+						if (!JSON.parseObject(JSON.toJSONString(o)).containsKey("value")) {
 							return CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
 						}
 					}
@@ -715,82 +729,85 @@ public class BasicGridAcceptanceServiceImpl
 			}
 		}
 
-		if (hygfRectificationOrder.getSequenceNbr() != null ){
-			LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
-			wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
-			wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("已作废","已完成"));
-			wr.eq(HygfRectificationOrder::getRectificationSource,hygfRectificationOrder.getRectificationSource());
-			wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
+		if (hygfRectificationOrder.getSequenceNbr() != null) {
+			LambdaQueryWrapper<HygfRectificationOrder> wr = new LambdaQueryWrapper<>();
+			wr.eq(HygfRectificationOrder::getPeasantHouseholeId, hygfRectificationOrder.getPeasantHouseholeId());
+			wr.notIn(HygfRectificationOrder::getRectificationStatus, Arrays.asList("已作废", "已完成"));
+			wr.eq(HygfRectificationOrder::getRectificationSource, hygfRectificationOrder.getRectificationSource());
+			wr.ne(BaseEntity::getSequenceNbr, hygfRectificationOrder.getSequenceNbr());
 			List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
-			if (CollectionUtil.isNotEmpty(list)){
+			if (CollectionUtil.isNotEmpty(list)) {
 				return CommonResponseNewUtil.failureMessage("当前农户存在其他进行中的整改单,不可重新发起");
 			}
 		}
 
-		//查询当前并网数据
+		// 查询当前并网数据
 		LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+		wrapper.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
-		if (!Objects.isNull(basicGridRecord)&&!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
+		if (!Objects.isNull(basicGridRecord)
+				&& !basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())) {
 			return CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
 		}
 
 		String addorSubmit = hygfRectificationOrder.getAddorSubmit();
 		LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 		qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
-		if (!Objects.isNull(basicGridRecord) && null !=  basicGridRecord.getRectificationStatus() && !basicGridRecord.getRectificationStatus().contains(hygfRectificationOrder.getRectificationSource())){
-			qu.set(BasicGridRecord::getRectificationStatus,basicGridRecord.getRectificationStatus()+","+hygfRectificationOrder.getRectificationSource());
-			basicGridRecordService.update(null,qu);
-		}else if (!Objects.isNull(basicGridRecord) && null ==  basicGridRecord.getRectificationStatus() ) {
-			qu.set(BasicGridRecord::getRectificationStatus,hygfRectificationOrder.getRectificationSource());
-			basicGridRecordService.update(null,qu);
-		}
-		//修改状态
-		if (addorSubmit.equals("0")){
-			//如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
+		if (!Objects.isNull(basicGridRecord) && null != basicGridRecord.getRectificationStatus() && !basicGridRecord
+				.getRectificationStatus().contains(hygfRectificationOrder.getRectificationSource())) {
+			qu.set(BasicGridRecord::getRectificationStatus,
+					basicGridRecord.getRectificationStatus() + "," + hygfRectificationOrder.getRectificationSource());
+			basicGridRecordService.update(null, qu);
+		} else if (!Objects.isNull(basicGridRecord) && null == basicGridRecord.getRectificationStatus()) {
+			qu.set(BasicGridRecord::getRectificationStatus, hygfRectificationOrder.getRectificationSource());
+			basicGridRecordService.update(null, qu);
+		}
+		// 修改状态
+		if (addorSubmit.equals("0")) {
+			// 如果历史有未完成的整改单则片区审核完成的时候改变主流程状态为整改单的状态
 			int num = 0;
 			LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
-			query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
-			query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","待提交","待审核"));
-			query.in(HygfRectificationOrder::getRectificationSource,Arrays.asList("bw-design","bw-engineering"));
-			List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper().selectList(query);
+			query.eq(HygfRectificationOrder::getPeasantHouseholeId, basicGridRecord.getPeasantHouseholdId());
+			query.in(HygfRectificationOrder::getRectificationStatus, Arrays.asList("待整改", "待提交", "待审核"));
+			query.in(HygfRectificationOrder::getRectificationSource, Arrays.asList("bw-design", "bw-engineering"));
+			List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.getBaseMapper()
+					.selectList(query);
 			for (HygfRectificationOrder hygfRectificationOrderO : hygfRectificationOrders) {
-				if (hygfRectificationOrderO.getRectificationStatus().equals("待审核")){
-					qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
+				if (hygfRectificationOrderO.getRectificationStatus().equals("待审核")) {
+					qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.ZGDSH.getCode());
 					num = 1;
 					break;
 				}
 			}
-			if (num == 0){
-				qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+			if (num == 0) {
+				qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.DZG.getCode());
 			}
-			basicGridRecordService.update(null,qu);
+			basicGridRecordService.update(null, qu);
 		}
 		rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
 
 		return CommonResponseNewUtil.success();
 	}
 
-
 	public ResponseModel nextTaskExcute(HygfRectificationOrder hygfRectificationOrder) {
-		//查询当前并网数据
+		// 查询当前并网数据
 		LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+		wrapper.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
-		if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
+		if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())) {
 			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
 			rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
 			return CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
 		}
 
-		if (hygfRectificationOrder.getAddorSubmit().equals("0")  ) {
+		if (hygfRectificationOrder.getAddorSubmit().equals("0")) {
 
 			LambdaUpdateWrapper<BasicGridRecord> up = new LambdaUpdateWrapper<>();
-			up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
-			up.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
-			basicGridRecordService.update(null,up);
+			up.set(BasicGridRecord::getGridStatus, GridStatusEnum.ZGDSH.getCode());
+			up.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+			basicGridRecordService.update(null, up);
 			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.待审核.getCode());
-		}else {
+		} else {
 			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
 		}
 		rectificationOrderAuditingService.nextTaskExcute(hygfRectificationOrder);
@@ -800,132 +817,142 @@ public class BasicGridAcceptanceServiceImpl
 	public ResponseModel nextTaskAduit(HygfRectificationOrder hygfRectificationOrder) {
 		String auditResult = hygfRectificationOrder.getAuditResult();
 
-		//查询当前并网数据
+		// 查询当前并网数据
 		LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+		wrapper.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
 
-		if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
+		if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())) {
 			return CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
 		}
 
-		//修改整改单状态
-		hygfRectificationOrder.setRectificationStatus(auditResult.equals("通过")?WorkOrderEnum.已完成.getCode():WorkOrderEnum.待整改.getCode());
+		// 修改整改单状态
+		hygfRectificationOrder.setRectificationStatus(
+				auditResult.equals("通过") ? WorkOrderEnum.已完成.getCode() : WorkOrderEnum.待整改.getCode());
 		rectificationOrderAuditingService.nextTaskAduit(hygfRectificationOrder);
-		//查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
-		LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
-		wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
-		wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待提交","已作废","已完成"));
-		wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
+		// 查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
+		LambdaQueryWrapper<HygfRectificationOrder> wr = new LambdaQueryWrapper<>();
+		wr.eq(HygfRectificationOrder::getPeasantHouseholeId, hygfRectificationOrder.getPeasantHouseholeId());
+		wr.notIn(HygfRectificationOrder::getRectificationStatus, Arrays.asList("待提交", "已作废", "已完成"));
+		wr.ne(BaseEntity::getSequenceNbr, hygfRectificationOrder.getSequenceNbr());
 		List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
 
-		//修改并网状态
-		//片区不存在并行 无需复杂判断  工程与设计并行 需要做额外逻辑判断
-		if (auditResult.equals("通过")){
-			if (hygfRectificationOrder.getRectificationSource().equals("bw-area")){
+		// 修改并网状态
+		// 片区不存在并行 无需复杂判断 工程与设计并行 需要做额外逻辑判断
+		if (auditResult.equals("通过")) {
+			if (hygfRectificationOrder.getRectificationSource().equals("bw-area")) {
 				LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 				qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
-				qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.PQYYDSH.getCode());
-				qu.set(BasicGridRecord::getRectificationStatus,null);
-				basicGridRecordService.update(null,qu);
-			}else {
+				qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.PQYYDSH.getCode());
+				qu.set(BasicGridRecord::getRectificationStatus, null);
+				basicGridRecordService.update(null, qu);
+			} else {
 				LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 				qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
-				List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
+				List<String> status = new ArrayList<>(
+						Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
 				status.remove(hygfRectificationOrder.getRectificationSource());
-				if(status.size()<1){
-					qu.set(BasicGridRecord::getRectificationStatus,null);
-				}else {
-					qu.set(BasicGridRecord::getRectificationStatus,String.join(",",status));
+				if (status.size() < 1) {
+					qu.set(BasicGridRecord::getRectificationStatus, null);
+				} else {
+					qu.set(BasicGridRecord::getRectificationStatus, String.join(",", status));
 				}
 				if (CollectionUtil.isEmpty(list)) {
-					//若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
-						if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() )
-								&& Objects.isNull(basicGridRecord.getPowerStationEngineeringStatus())){
-							qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
+					// 若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
+					if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus())
+							&& Objects.isNull(basicGridRecord.getPowerStationEngineeringStatus())) {
+						qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.ROLESDSH.getCode());
 
-						}else if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() ) ){
-							qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
-						}else {
-							qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
+					} else if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus())) {
+						qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.SJDSH.getCode());
+					} else {
+						qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.GCDSH.getCode());
 					}
-				}else {
-					List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
-					qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
+				} else {
+					List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus)
+							.collect(Collectors.toList());
+					qu.set(BasicGridRecord::getGridStatus,
+							collect.contains(WorkOrderEnum.待审核.getCode()) ? GridStatusEnum.ZGDSH.getCode()
+									: GridStatusEnum.DZG.getCode());
 				}
-				basicGridRecordService.update(null,qu);
+				basicGridRecordService.update(null, qu);
 			}
-		}else {
-			//驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
+		} else {
+			// 驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
 			LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 			qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 			if (!CollectionUtil.isEmpty(list)) {
-				List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
-				qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
-			}else {
-				qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+				List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus)
+						.collect(Collectors.toList());
+				qu.set(BasicGridRecord::getGridStatus,
+						collect.contains(WorkOrderEnum.待审核.getCode()) ? GridStatusEnum.ZGDSH.getCode()
+								: GridStatusEnum.DZG.getCode());
+			} else {
+				qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.DZG.getCode());
 			}
-			basicGridRecordService.update(null,qu);
+			basicGridRecordService.update(null, qu);
 		}
 		return CommonResponseNewUtil.success();
 	}
 
 	public ResponseModel rollback(Long sequenceNbr) {
-		HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectById(sequenceNbr);
-		//查询当前并网数据
+		HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper()
+				.selectById(sequenceNbr);
+		// 查询当前并网数据
 		LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+		wrapper.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
-		if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
+		if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())) {
 			return CommonResponseNewUtil.failureMessage("当前流程发生变化，暂时无法操作，请刷新再试");
 		}
 		LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 		qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
-		if (hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待提交.getCode()) ||
-				hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待整改.getCode())){
+		if (hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待提交.getCode())
+				|| hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待整改.getCode())) {
 			rectificationOrderAuditingService.rollback(sequenceNbr);
 			List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
 			status.remove(hygfRectificationOrder.getRectificationSource());
-			if(status.size()<1){
-				qu.set(BasicGridRecord::getRectificationStatus,null);
-			}else {
+			if (status.size() < 1) {
+				qu.set(BasicGridRecord::getRectificationStatus, null);
+			} else {
 				qu.set(BasicGridRecord::getRectificationStatus, String.join(",", status));
 				basicGridRecordService.getBaseMapper().update(null, qu);
 			}
-		}else {
+		} else {
 			return CommonResponseNewUtil.failureMessage("仅单据状态为待提交或待整改时方可作废");
 		}
 
+		if (hygfRectificationOrder.getRectificationSource().equals("bw-area")) {
+			qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.PQYYDSH.getCode());
+		} else {
 
-
-		if (hygfRectificationOrder.getRectificationSource().equals("bw-area")){
-			qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.PQYYDSH.getCode());
-		}else {
-
-			//查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
-			LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
-			wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
-			wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待提交","已作废","已完成"));
-			wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
+			// 查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
+			LambdaQueryWrapper<HygfRectificationOrder> wr = new LambdaQueryWrapper<>();
+			wr.eq(HygfRectificationOrder::getPeasantHouseholeId, hygfRectificationOrder.getPeasantHouseholeId());
+			wr.notIn(HygfRectificationOrder::getRectificationStatus, Arrays.asList("待提交", "已作废", "已完成"));
+			wr.ne(BaseEntity::getSequenceNbr, hygfRectificationOrder.getSequenceNbr());
 			List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
 
 			if (CollectionUtil.isEmpty(list)) {
-				//若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
-				if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() )
-						&& Objects.isNull(basicGridRecord.getPowerStationEngineeringStatus())){
-					qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
-				}else if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() ) ){
-					qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
-				}else {
-					qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
+				// 若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
+				if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus())
+						&& Objects.isNull(basicGridRecord.getPowerStationEngineeringStatus())) {
+					qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.ROLESDSH.getCode());
+				} else if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus())) {
+					qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.SJDSH.getCode());
+				} else {
+					qu.set(BasicGridRecord::getGridStatus, GridStatusEnum.GCDSH.getCode());
 				}
-			}else {
-				List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
-				qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
+			} else {
+				List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus)
+						.collect(Collectors.toList());
+				qu.set(BasicGridRecord::getGridStatus,
+						collect.contains(WorkOrderEnum.待审核.getCode()) ? GridStatusEnum.ZGDSH.getCode()
+								: GridStatusEnum.DZG.getCode());
 
 			}
 		}
-		basicGridRecordService.update(null,qu);
+		basicGridRecordService.update(null, qu);
 		return CommonResponseNewUtil.success();
 	}
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,21 +16,16 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.FinancingAuditEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskStatusEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingAuditingDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
-import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingAuditing;
-import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingInfo;
-import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRectificationOrder;
-import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingInfoService;
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
@@ -43,9 +39,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 服务实现类
@@ -66,6 +64,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     @Autowired
     private WorkFlowService workFlowService;
     @Autowired
+    private PeasantHouseholdServiceImpl peasantHouseholdService;
+    @Autowired
     private WorkflowImpl workflow;
     @Autowired
     private FinancingAuditingServiceImpl financingAuditingService;
@@ -74,21 +74,32 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     @Autowired
     private HouseholdContractMapper householdContractMapper;
     @Autowired
+    private PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     private CommonServiceImpl commonService;
+    @Autowired
+    private AcceptanceCheckServiceImpl acceptanceCheckService;
+    @Autowired
+    private AcceptanceCheckAuditingServiceImpl acceptanceCheckAuditingService;
+    @Autowired
+    private FinancingRegionalServiceImpl financingRegionalService;
 
     @Resource(type = RedisLockUtil.class)
     private RedisLockUtil redisLockUtil;
 
     @UserLimits
-    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName) {
+    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName, String region,String batchNo) {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
         params.put("ownersName", ownersName);
-        params.put("status", status);
+        if (null != status ){
+                params.put("status", Arrays.asList(status.split(",")));
+        }
         params.put("regionalCompaniesCode", regionalCompaniesCode);
         params.put("type", type);
+        params.put("region", region);
         // 1 投融人员  2.融资  3经销商管理员
         switch (type) {
             case "1":
@@ -104,7 +115,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         List<Map<String, Object>> list = financingInfoMapper.getStationFinancingInfoList(params, amosOrgCodes);
         list.forEach(e -> {
             e.put("scale", householdContractMapper.getHygfCommercialScale((String) e.get("peasantHouseholdNo")));
+            e.put("realScale", powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo((String) e.get("peasantHouseholdNo")));
 
+            e.put("regionName",e.get("projectAddress").toString().split("/")[0]);
             if (null != e.get("instanceId") && e.get("instanceId").toString().contains(",")) {
                 String[] instanceIds = e.get("instanceId").toString().split(",");
                 e.put("instanceId", instanceIds[0]);
@@ -117,6 +130,12 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         return page;
     }
 
+   public List<Map<String,Object>>  selectRegion(){
+
+       return financingInfoMapper.selectRegion();
+    }
+
+
     /**
      * 列表查询 示例
      */
@@ -133,6 +152,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             }
 
             List<String> ids;
+            long time = new Date().getTime();
+            String batcvNo = String.valueOf(time);
             if (model.getPeasantHouseholdIds().contains(",")) {
                 ids = Arrays.asList(model.getPeasantHouseholdIds().split(","));
             } else {
@@ -146,11 +167,18 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                 queryWrapper.eq(FinancingInfo::getPeasantHouseholdId, Long.valueOf(e));
                 FinancingInfo financingInfos = this.getBaseMapper().selectOne(queryWrapper);
                 if (ObjectUtils.isEmpty(financingInfos)) {
+                    LambdaQueryWrapper<PeasantHousehold> query= new LambdaQueryWrapper<>();
+                    query.eq(BaseEntity::getSequenceNbr,e);
+                    PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectOne(query);
+
+
                     model.setStatus(FinancingAuditEnum.待融资审核.getName());
                     model.setPeasantHouseholdId(Long.valueOf(e));
                     FinancingInfoDto financingInfoDto = new FinancingInfoDto();
                     BeanUtils.copyProperties(model, financingInfoDto);
                     financingInfoDto.setSequenceNbr(null);
+                    financingInfoDto.setBatchNo(batcvNo);
+                    financingInfoDto.setRegionalCompaniesSeq(peasantHousehold.getRegionalCompaniesSeq());
                     this.createWithModel(financingInfoDto);
                     //开启工作流 并执行一步
                     ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -176,7 +204,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                     financingAuditingService.createWithModel(financingAuditingDto);
                 }
                 //批量 兼容审核不通过及整改待推送
-                else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals(FinancingAuditEnum.整改待推送.getName()) ){
+                else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送")   ){
                     financingInfos.setStatus(FinancingAuditEnum.待融资审核.getName());
 
                     Map<String, Object> orgInfo1 = this.getBaseMapper().selectRZOrgInfo(model.getFinancingCompaniesSeq());
@@ -285,7 +313,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             task.setResultCode("isFlag");
             map.put("isFlag", params.get("isFlag"));
             if (params.get("isFlag").equals("1")) {
-                params.put("comments", "退回整改");
+                params.put("comments", "退回经销商重新验收");
                 params.put("approvalStatus",params.getOrDefault("problemDescription",""));
             }else {
                 params.put("approvalStatus","");
@@ -322,7 +350,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         }
         //标识对于整改待推送状态
         if (params.containsKey("isZG")) {
-            financingInfo.setStatus("整改待推送");
+            financingInfo.setStatus("待推送");
         } else {
             financingInfo.setStatus(statusName);
         }
@@ -332,30 +360,31 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
         //节点为待整改时生成整改单
         if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) {
-
-            LambdaQueryWrapper<FinancingRectificationOrder> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(FinancingRectificationOrder::getPeasantHouseholdId, financingInfo.getPeasantHouseholdId());
-            queryWrapper.orderByDesc(BaseEntity::getRecDate);
-            queryWrapper.last("limit 1");
-            FinancingRectificationOrder oldData = financingRectificationOrderService.getBaseMapper().selectOne(queryWrapper);
-
-            FinancingRectificationOrder financingRectificationOrder = new FinancingRectificationOrder();
-            //若存在历史整改单 将历史整改单数据同步至新整改单 便于修改
-            if (ObjectUtils.isNotEmpty(oldData)) {
-                BeanUtils.copyProperties(oldData, financingRectificationOrder);
-                financingRectificationOrder.setSequenceNbr(null);
-                financingRectificationOrder.setCompleteDate(null);
-                financingRectificationOrder.setRectificationPhoto(null);
-            }
-            financingRectificationOrder.setRectificationOrderCode(String.valueOf(new Date().getTime()));
-            financingRectificationOrder.setRectificationStatus("待整改");
-            financingRectificationOrder.setProblemDescription(params.getOrDefault("problemDescription", "").toString());
-            financingRectificationOrder.setPeasantHouseholdName(params.getOrDefault("peasantHouseholdName", "").toString());
-            financingRectificationOrder.setRectificationDescription(params.getOrDefault("rectificationDescription", "").toString());
-            financingRectificationOrder.setPeasantHouseholdId(financingInfo.getPeasantHouseholdId());
-            financingRectificationOrder.setResponsibleUserName(params.getOrDefault("responsibleUserName", "").toString());
-            financingRectificationOrder.setResponsibleUserPhone(params.getOrDefault("responsibleUserPhone", "").toString());
-            financingRectificationOrderService.save(financingRectificationOrder);
+              this.sendBack(financingInfo.getPeasantHouseholdId());
+
+//            LambdaQueryWrapper<FinancingRectificationOrder> queryWrapper = new LambdaQueryWrapper<>();
+//            queryWrapper.eq(FinancingRectificationOrder::getPeasantHouseholdId, financingInfo.getPeasantHouseholdId());
+//            queryWrapper.orderByDesc(BaseEntity::getRecDate);
+//            queryWrapper.last("limit 1");
+//            FinancingRectificationOrder oldData = financingRectificationOrderService.getBaseMapper().selectOne(queryWrapper);
+//
+//            FinancingRectificationOrder financingRectificationOrder = new FinancingRectificationOrder();
+//            //若存在历史整改单 将历史整改单数据同步至新整改单 便于修改
+//            if (ObjectUtils.isNotEmpty(oldData)) {
+//                BeanUtils.copyProperties(oldData, financingRectificationOrder);
+//                financingRectificationOrder.setSequenceNbr(null);
+//                financingRectificationOrder.setCompleteDate(null);
+//                financingRectificationOrder.setRectificationPhoto(null);
+//            }
+//            financingRectificationOrder.setRectificationOrderCode(String.valueOf(new Date().getTime()));
+//            financingRectificationOrder.setRectificationStatus("待整改");
+//            financingRectificationOrder.setProblemDescription(params.getOrDefault("problemDescription", "").toString());
+//            financingRectificationOrder.setPeasantHouseholdName(params.getOrDefault("peasantHouseholdName", "").toString());
+//            financingRectificationOrder.setRectificationDescription(params.getOrDefault("rectificationDescription", "").toString());
+//            financingRectificationOrder.setPeasantHouseholdId(financingInfo.getPeasantHouseholdId());
+//            financingRectificationOrder.setResponsibleUserName(params.getOrDefault("responsibleUserName", "").toString());
+//            financingRectificationOrder.setResponsibleUserPhone(params.getOrDefault("responsibleUserPhone", "").toString());
+//            financingRectificationOrderService.save(financingRectificationOrder);
         }
 
 
@@ -365,4 +394,96 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         return this.getBaseMapper().selectOrgList();
 
     }
+
+
+    public void sendBack(Long peasantHouseholdId ){
+        //投融资表数据
+        LambdaUpdateWrapper<FinancingInfo> financingUp = new LambdaUpdateWrapper<>();
+        financingUp.eq(FinancingInfo::getPeasantHouseholdId,peasantHouseholdId);
+        financingUp.set(FinancingInfo::getStatus,"重新验收");
+        this.update(null,financingUp);
+
+        //删除验收审核数据
+        LambdaQueryWrapper<AcceptanceCheckAuditing> checkAuditUp = new LambdaQueryWrapper<>();
+        checkAuditUp.eq(AcceptanceCheckAuditing::getPeasantHouseholdId,peasantHouseholdId);
+        acceptanceCheckAuditingService.getBaseMapper().delete(checkAuditUp);
+
+        //重置验收数据
+        LambdaUpdateWrapper<AcceptanceCheck>  checkUp = new LambdaUpdateWrapper<>();
+        checkUp.eq(AcceptanceCheck::getPeasantHouseholdId,peasantHouseholdId);
+        checkUp.set(AcceptanceCheck::getAcceptanceCheckStatus, GridStatusEnum.WTG.getCode());
+        checkUp.set(AcceptanceCheck::getBasicGridNode,null);
+        checkUp.set(AcceptanceCheck::getPowerStationFinancingStatus,null);
+        checkUp.set(AcceptanceCheck::getPowerStationLegalStatus,null);
+        checkUp.set(AcceptanceCheck::getPowerStationAssetsStatus,null);
+        checkUp.set(AcceptanceCheck::getPowerStationAreaStatus,null);
+        checkUp.set(AcceptanceCheck::getInstanceId,null);
+        checkUp.set(AcceptanceCheck::getAcceptanceTime,null);
+        acceptanceCheckService.getBaseMapper().update(null,checkUp);
+
+    }
+
+
+     public  void updateState(List<Long> ids){
+        LambdaUpdateWrapper<FinancingInfo> up = new LambdaUpdateWrapper<>();
+        up.in(FinancingInfo::getPeasantHouseholdId,ids);
+        up.set(FinancingInfo::getStatus,"已放款");
+        this.getBaseMapper().update(null,up);
+
+    }
+
+    public void upDateMoney(FinancingInfoDto financingInfoDto) {
+
+        Map<Long, Double> maps = financingInfoDto.getPeasantHouseholds().stream()
+                .collect(Collectors.toMap(
+                        PeasantHousehold::getSequenceNbr, // key extractor
+                        PeasantHousehold::getDisbursementMoney, // value mapper
+                        (existingValue, newValue) -> existingValue // merge function
+                ));
+
+        LambdaQueryWrapper<FinancingInfo> up = new LambdaQueryWrapper<>();
+        up.in(FinancingInfo::getPeasantHouseholdId,maps.keySet());
+        List<FinancingInfo> financingInfos = this.getBaseMapper().selectList(up);
+
+        financingInfos.forEach(e->{
+            e.setDisbursementMoney(maps.get(e.getPeasantHouseholdId()));
+            e.setDisbursementTime(financingInfoDto.getDisbursementTime());
+            e.setUnitPrice(financingInfoDto.getUnitPrice());
+            if (financingInfoDto.getFiles() != null){
+                e.setFile(JSON.toJSONString(financingInfoDto.getFiles()));
+            }
+            this.getBaseMapper().updateById(e);
+
+            LambdaQueryWrapper<FinancingAuditing> query = new LambdaQueryWrapper<>();
+            query.eq(FinancingAuditing::getPeasantHouseholdId, e.getPeasantHouseholdId());
+            query.orderByDesc(BaseEntity::getRecDate);
+            query.last("limit 1");
+            FinancingAuditing financingAuditing = financingAuditingService.getBaseMapper().selectOne(query);
+
+            Map<String, Object> map = BeanUtil.beanToMap(e);
+            map.put("approvalStatus","0");
+            map.put("instanceId",financingAuditing.getInstanceId());
+            this.execueFlow(map);
+
+
+        });
+
+    }
+
+    public Object orgListByqyid(String peasantHouseholdId) {
+
+        LambdaQueryWrapper<PeasantHousehold> query= new LambdaQueryWrapper<>();
+        query.eq(BaseEntity::getSequenceNbr,peasantHouseholdId);
+        PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectOne(query);
+
+        LambdaQueryWrapper<FinancingRegional> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FinancingRegional::getRegionalCompaniesSeq,peasantHousehold.getRegionalCompaniesSeq());
+        FinancingRegional financingRegional = financingRegionalService.getBaseMapper().selectOne(wrapper);
+        if (ObjectUtils.isEmpty(financingRegional)){
+            throw new BadRequest("该区域公司尚未绑定融资机构，请绑定后操作");
+        }
+        List<String> ids = Arrays.asList(financingRegional.getFinancingId().split(","));
+        return this.getBaseMapper().orgListByqyid(ids);
+
+    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingRegionalServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingInfo;
+import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingRegional;
+import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingRegionalMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IFinancingRegionalService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingRegionalDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 融资机构区域公司绑定表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-09-19
+ */
+@Service
+public class FinancingRegionalServiceImpl extends BaseService<FinancingRegionalDto,FinancingRegional,FinancingRegionalMapper> implements IFinancingRegionalService {
+    @Autowired
+    private  FinancingInfoServiceImpl financingInfoService;
+    /**
+     * 分页查询
+     */
+    public Page<FinancingRegional> queryForFinancingRegionalPage(int current,int size,String regionalCompaniesName, String province)   {
+        Page<FinancingRegional> page = new Page<>();
+        PageHelper.startPage(current,size);
+        List<FinancingRegional> list = this.getBaseMapper().queryDataForPage(regionalCompaniesName,province);
+
+        PageInfo<FinancingRegional> pageInfo = new PageInfo<>(list);
+        page.setSize(pageInfo.getSize());
+        page.setCurrent(pageInfo.getPageNum());
+        page.setTotal(pageInfo.getTotal());
+        page.setRecords(list);
+
+        return page;
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<FinancingRegionalDto> queryForFinancingRegionalList()   {
+        return this.queryForList("" , false);
+    }
+
+    public void saveModel(FinancingRegionalDto model) {
+
+
+        List<String> ids = new ArrayList<>();
+        List<String> names = new ArrayList<>();
+        List<String> exitNames = new ArrayList<>();
+        ids.addAll(model.getFinancing());
+        ids.addAll(model.getRegionalCompanies());
+
+        List<FinancingRegional> models = new ArrayList<>();
+
+        List<Map<String, Object>> orgInfo = financingInfoService.getBaseMapper().selectCompany(ids);
+        model.getFinancing().forEach(f->{
+            List<Map<String, Object>> map = orgInfo.stream().filter(b ->String.valueOf(b.get("SEQUENCE_NBR")) .equals(f)).collect(Collectors.toList());
+            map.forEach(a->{
+              names.add(a.get("COMPANY_NAME").toString());
+            });
+        });
+
+        model.getRegionalCompanies().forEach(e->{
+            FinancingRegional financingRegional = new FinancingRegional();
+            financingRegional.setFinancingId(String.join(",",String.join(",",model.getFinancing())));
+            financingRegional.setFinancingName(String.join(",",names));
+
+            orgInfo.stream().filter(b->String.valueOf(b.get("SEQUENCE_NBR")).equals(e)).forEach(a->{
+                financingRegional.setRegionalCompaniesSeq(String.valueOf(a.get("SEQUENCE_NBR")));
+                financingRegional.setRegionalCompaniesName(a.get("COMPANY_NAME").toString());
+                financingRegional.setRegionalCompaniesCode(a.get("ORG_CODE").toString());
+            });
+
+            LambdaQueryWrapper<FinancingRegional> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(FinancingRegional::getRegionalCompaniesSeq,e);
+            wrapper.eq(BaseEntity::getIsDelete,0);
+            List<FinancingRegional> financingRegionals = this.getBaseMapper().selectList(wrapper);
+            if (CollectionUtil.isNotEmpty(financingRegionals)){
+                exitNames.add(financingRegional.getRegionalCompaniesName());
+            }
+            financingRegional.setProvince(model.getProvince());
+
+            models.add(financingRegional);
+        });
+        if (CollectionUtil.isNotEmpty(exitNames)) {
+            throw new BadRequest(String.join(",",exitNames)+"与融资机构已存在质押关系，请去编辑添加。");
+        }
+        this.saveBatch(models);
+    }
+
+    public void removeModel(Long sequenceNbr) {
+        FinancingRegionalDto financingRegionalDto = this.queryBySeq(sequenceNbr);
+
+        LambdaQueryWrapper<FinancingInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FinancingInfo::getRegionalCompaniesSeq,financingRegionalDto.getRegionalCompaniesSeq());
+        wrapper.ne(FinancingInfo::getStatus,"放款完成");
+        List<FinancingInfo> financingInfos = financingInfoService.getBaseMapper().selectList(wrapper);
+
+        if (CollectionUtil.isNotEmpty(financingInfos)){
+            throw new BadRequest("该区域公司存在正在进行中的投融业务，不可删除");
+        }
+        this.removeById(sequenceNbr);
+    }
+
+    public void updateModel(FinancingRegionalDto model) {
+        FinancingRegionalDto financingRegionalDto = this.queryBySeq(model.getSequenceNbr());
+        List<String> ids = new ArrayList<>();
+        List<String> names = new ArrayList<>();
+        ids.addAll(model.getFinancing());
+
+        List<Map<String, Object>> orgInfo = financingInfoService.getBaseMapper().selectCompany(ids);
+        model.getFinancing().forEach(f->{
+            orgInfo.stream().filter(b->String.valueOf(b.get("SEQUENCE_NBR")).equals(f)).forEach(a->{
+                names.add(a.get("COMPANY_NAME").toString());
+            });
+        });
+
+        List<String> oldIds = new ArrayList<>(Arrays.asList(financingRegionalDto.getFinancingId().split(",")));
+        oldIds.removeAll(ids);
+        if (CollectionUtil.isNotEmpty(oldIds)){
+            oldIds.forEach(e->{
+                LambdaQueryWrapper<FinancingInfo> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(FinancingInfo::getRegionalCompaniesSeq,financingRegionalDto.getRegionalCompaniesSeq());
+                wrapper.eq(FinancingInfo::getFinancingCompaniesSeq,e);
+                wrapper.ne(FinancingInfo::getStatus,"放款完成");
+                List<FinancingInfo> financingInfos = financingInfoService.getBaseMapper().selectList(wrapper);
+
+                if (CollectionUtil.isNotEmpty(financingInfos)){
+                    throw new BadRequest("无法解绑投融业务进行中的融资机构");
+                }
+            });
+        }
+        model.setFinancingId(String.join(",",model.getFinancing()));
+        model.setFinancingName(String.join(",",names));
+        this.updateWithModel(model);
+
+    }
+}
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java

@@ -49,6 +49,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     ContractTemplateMapper contractTemplateMapper;
 
     @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+
+    @Autowired
     ToDoTasksServiceImpl toDoTasksServiceImpl;
 
     @Autowired
@@ -97,6 +100,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
             warningQuestionInfoIPage.getRecords().forEach(e -> {
                 if(e.getPeasantHouseholdNumber() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNumber()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNumber()));
                 }
             });
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfIcbcServiceImpl.java

@@ -22,7 +22,9 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationEngineeringInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -134,6 +136,9 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 	@Resource(type = HouseholdContractMapper.class)
 	private HouseholdContractMapper householdContractMapper;
 
+	@Resource(type = PowerStationEngineeringInfoMapper.class)
+	private PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+
 	@Resource(type = HygfIcbcRequestMapper.class)
 	private HygfIcbcRequestMapper hygfIcbcRequestMapper;
 
@@ -424,6 +429,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 			peasantHouseholdList.forEach(e -> {
 				if(e.getSurveyInformationId() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 		}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -22,9 +22,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
@@ -77,6 +75,10 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
     @Autowired
+    HouseholdContractMapper householdContractMapper;
+    @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     SurveyInformationServiceImpl surveyInformationServiceImpl;
     @Autowired
     HouseholdContractServiceImpl householdContractServiceImpl;
@@ -229,12 +231,12 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
      * 分页查询
      */
 
-    public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified,String preparationMoneyState, String peasantHouseholdNo)   {
+    public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified,String preparationMoneyState, String peasantHouseholdNo,String province)   {
         int current = (int)page.getCurrent();
         int size = (int)page.getSize();
 
         PageHelper.startPage(current,size);
-        List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified,preparationMoneyState, peasantHouseholdNo);
+        List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified,preparationMoneyState, peasantHouseholdNo,province);
         PageInfo<PeasantHousehold> objectPageInfo = new PageInfo<PeasantHousehold>(records);
 
 
@@ -274,8 +276,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
         if(newRecords != null && newRecords.size() > 0) {
             newRecords.forEach(e -> {
-                if(e.getSurveyInformationId() != null) {
-                    e.setScale(peasantHouseholdMapper.getHygfCommercialScale(e.getSurveyInformationId()));
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
 
@@ -796,12 +799,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
     @Override
     public List<PeasantHousehold> getInfoByIds(String ids) {
-        QueryWrapper<PeasantHousehold> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("sequence_nbr ","owners_name" ,"concat(project_address_name,project_address_detail) as project_address_name");
-        queryWrapper.in("sequence_nbr",Arrays.asList(ids.split(",")));
-        queryWrapper.eq("is_delete",0);
-        List<PeasantHousehold> peasantHouseholds = this.getBaseMapper().selectList(queryWrapper);
-        return peasantHouseholds;
+        List<String> strings = Arrays.asList(ids.split(","));
+        return this.getBaseMapper().getInfoByIds(strings);
 
     }
 
@@ -929,8 +928,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
         if(peasantHouseholdIPage.getRecords() != null && peasantHouseholdIPage.getRecords().size() > 0) {
             peasantHouseholdIPage.getRecords().forEach(e -> {
-                if(e.getSurveyInformationId() != null) {
-                    e.setScale(peasantHouseholdMapper.getHygfCommercialScale(e.getSurveyInformationId()));
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java

@@ -62,6 +62,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     @Autowired
     DesignInformationServiceImpl designInformationService;
 	@Autowired
+	PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     PeasantHouseholdServiceImpl peasantHouseholdService;
 
     private static final String IDX_REQUEST_STATE="200";
@@ -94,7 +96,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 	private RedisLockUtil redisLockUtil;
 
 	public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
-															   String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus) {
+															   String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus,String province) {
 //        Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
 //        Collection<List<RoleModel>> roleModels = orgRoles.values();
 //        if(roleModels !=null){
@@ -120,12 +122,13 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 		// this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
 
 		Page<PowerStationDto> powerStationDtoPage = this.queryPage((int) page.getCurrent(), (int) page.getSize(), powerStationCode, ownersName,
-				serviceAgent, regionalCompaniesName, processStatus);
+				serviceAgent, regionalCompaniesName, processStatus,province);
 
 		if(powerStationDtoPage.getRecords() != null && powerStationDtoPage.getRecords().size() > 0) {
 			powerStationDtoPage.getRecords().forEach(e -> {
 				if(e.getPowerStationCode() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPowerStationCode()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPowerStationCode()));
 				}
 			});
 
@@ -137,10 +140,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
 	// 查询电站审核记录
 	public Page<PowerStationDto> queryPage(int current, int size, String powerStationCode, String ownersName,
-										   String serviceAgent,String regionalCompaniesName,String processStatus) {
+										   String serviceAgent,String regionalCompaniesName,String processStatus,String province) {
 
 		PageHelper.startPage(current, size);
-		List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName,processStatus);
+		List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName,processStatus,province);
 
         PageInfo<PowerStationDto> pages = new PageInfo(list);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -75,7 +75,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     private UnitInfoServiceImpl unitInfoService;
     @Autowired
     private PreparationMoneyLogServiceImpl preparationMoneyLogService;
-
     @Autowired
     RegionalCompaniesMapper regionalCompaniesMapper;
     @Autowired
@@ -85,6 +84,10 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     @Autowired
     DesignInformationMapper designInformationMapper;
     @Autowired
+    HouseholdContractMapper householdContractMapper;
+    @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     PreparationMoneyLogMapper preparationMoneyLogMapper;
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
@@ -187,6 +190,17 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         LambdaUpdateWrapper<DocumentStation> q = new LambdaUpdateWrapper<>();
         q.eq(DocumentStation::getPreparationMoneyId, sequenceNbr);
         List<DocumentStation> li = documentStationMapper.selectList(q);
+
+        if(li != null && li.size() > 0) {
+            li.forEach(e -> {
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+                }
+            });
+
+        }
+
         preparationMoney.setPeasantHouseholdId(li);
 
 
@@ -267,6 +281,20 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         LambdaQueryWrapper<DocumentStation> q = new LambdaQueryWrapper<>();
         q.eq(DocumentStation::getPreparationMoneyId, sequenceNbr);
         List<DocumentStation> lih = documentStationMapper.selectList(q);
+
+        if(lih != null && lih.size() > 0) {
+            lih.forEach(e -> {
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+                }
+            });
+
+        }
+
+
+
+
         preparationMoney.setPeasantHouseholdId(lih);
 
         LambdaUpdateWrapper<PreparationMoneyLog> q1 = new LambdaUpdateWrapper<>();
@@ -314,7 +342,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         designInformation.setCable(cable);
         Map<String, Object> map2 = Bean.BeantoMap(preparationMoney);
 
-
         LambdaQueryWrapper<HygfReplenishment> files = new LambdaQueryWrapper<>();
         files.eq(HygfReplenishment::getPreparationMoneyId,sequenceNbr);
         files.orderByDesc(BaseEntity::getRecDate);
@@ -1171,11 +1198,23 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
     }
 
-    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state){
+    public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state,String province){
 
 
          PageHelper.startPage(current,  size);
-         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state);
+         List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province);
+
+        if(resultPage != null && resultPage.size() > 0) {
+            resultPage.forEach(e -> {
+                System.out.println("+++++++++++++++" + e.get("peasantHouseholdNo"));
+                if(e.get("peasantHouseholdNo") != null) {
+                    e.put("scale", householdContractMapper.getHygfCommercialScale((String) e.get("peasantHouseholdNo")));
+                    e.put("realScale", powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo((String) e.get("peasantHouseholdNo")));
+                }
+            });
+        }
+
+
         PageInfo<Map<String, Object>> page = new PageInfo(resultPage);
          Page<Map<String, Object>> pagenew = new Page<>();
          pagenew.setTotal(page.getTotal());
@@ -1218,6 +1257,13 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             documentStation.setOwnersName(e.getOwnersName());
             documentStation.setDeveloperName(e.getDeveloperName());
             documentStation.setPeasantHouseholdNo(e.getPeasantHouseholdNo());
+
+            if(e.getPeasantHouseholdNo() != null) {
+                documentStation.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                documentStation.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+            }
+
+
             documentStation.setProjectAddressName(e.getProjectAddressName()+"/"+e.getProjectAddressDetail());
             stations.add(documentStation);
         });

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -78,6 +78,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
     @Autowired
+    PowerStationEngineeringInfoMapper powerStationEngineeringInfoMapper;
+    @Autowired
     HouseholdContractMapper householdContractMapper;
     @Autowired
     CommerceInfoMapper commerceInfoMapper;
@@ -1045,6 +1047,17 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         UnitInfo unitInfo = unitInfoMapper.selectById(unitInfoId);
         PageHelper.startPage(pageNum, pageSize);
         List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,peasantHouseholdNo,ownersName,ids, "hygf_peasant_household.rec_date DESC");
+
+        if(list != null && list.size() > 0) {
+            list.forEach(e -> {
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+                }
+            });
+        }
+
+
         PageInfo<PeasantHousehold> page = new PageInfo(list);
         Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
         pagenew.setCurrent(pageNum);
@@ -1064,6 +1077,16 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
        UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
         PageHelper.startPage(pageNum, pageSize);
         List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,peasantHouseholdNo,ownersName,ids, null);
+
+       if(list != null && list.size() > 0) {
+           list.forEach(e -> {
+               if(e.getPeasantHouseholdNo() != null) {
+                   e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                   e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+               }
+           });
+       }
+
         PageInfo<PeasantHousehold> page = new PageInfo(list);
         Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
         pagenew.setCurrent(pageNum);
@@ -1086,6 +1109,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             list.forEach(e -> {
                 if(e.getPeasantHouseholdNo() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
                 }
             });
         }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -314,6 +314,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			list.forEach(e -> {
 				if(e.getPeasantHouseholdNo() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 		}
@@ -515,6 +516,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) {
 		PageHelper.startPage(pageNum, pageSize);
 		List<WorkOrder> list = workOrderMapper.selectWorkOrderList(workOrder);
+
+		list.stream().forEach(e->{
+			if (!e.getOwnersName().isEmpty()) {
+				if (e.getOwnersName().split(",").length > 3){
+					e.setOwnersName(String.join(",", Arrays.copyOfRange(e.getOwnersName().split(","), 0, 3)));
+				}
+			}
+		});
+
 		PageInfo<WorkOrder> page = new PageInfo(list);
 		Page<WorkOrder> pagenew = new Page<WorkOrder>();
 		pagenew.setCurrent(pageNum);
@@ -532,6 +542,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			list.forEach(e -> {
 				if(e.getPeasantHouseholdNo() != null) {
 					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+					e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
 				}
 			});
 
@@ -1547,7 +1558,12 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			AcceptanceCheck acceptanceCheck = powerStationEngineeringInfoAllDto.getAcceptanceCheck();
 			if(powerStationEngineeringInfoAllDto.getFlowType() == 1 && Objects.nonNull(acceptanceCheck)) {
 				Map<String,Object> model =new HashMap<>();
+				if(acceptanceCheck.getInstanceId() == null) {
+					model.put("type", "0");
+				}else {
 					model.put("type","1");
+				}
+
 				model.put("sequenceNbr",acceptanceCheck.getSequenceNbr());
 				model.put("realName",realName);
 				acceptanceCheckService.saveAndCommit(model);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/logback-kingbase8.xml

@@ -7,7 +7,7 @@
     <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ccs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>/ccs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>7</MaxHistory>
         </rollingPolicy>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/PrivilegeCompanyMapper.java

@@ -10,7 +10,7 @@ import java.util.Map;
 
 public interface PrivilegeCompanyMapper extends BaseMapper<PrivilegeCompany> {
 
-    @Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,`LEVEL` from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0  ")
+    @Select("select SEQUENCE_NBR as sequenceNbr,ORG_CODE as orgCode,COMPANY_NAME as companyName ,`LEVEL` ,CONCAT_WS('_',COMPANY_NAME,SEQUENCE_NBR) as text from privilege_company where COMPANY_TYPE = 'region' and IS_DELETED = 0  ")
    public List<PrivilegeCompany> getAreaCompany();
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java

@@ -257,8 +257,8 @@ public class PrivilegeController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/getAreaCompany")
 	@ApiOperation(httpMethod = "GET", value = "查询所有区域公司", notes = "查询所有区域公司")
-	public ResponseModel<List<PrivilegeCompany>> getAreaCompany(String type) {
-		return 	ResponseHelper.buildResponse(permissionService.getAreaCompany(type));
+	public ResponseModel<List<PrivilegeCompany>> getAreaCompany(String type,@RequestParam(required = false) String province) {
+		return 	ResponseHelper.buildResponse(permissionService.getAreaCompany(type,province));
 	}
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java

@@ -46,5 +46,7 @@ public class PrivilegeCompany extends BaseEntity {
     private String companyType;
     @TableField("SUPER_ORG_CODE")
     private String superOrgCode;
+    @TableField(exist = false)
+    private String text;
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IPermissionServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import com.alibaba.fastjson.JSONObject;
@@ -188,7 +189,7 @@ public class IPermissionServiceImpl implements IPermissionService {
 
 
 
-	public List<PrivilegeCompany> getAreaCompany(String type){
+	public List<PrivilegeCompany> getAreaCompany(String type,String province){
 		List<PrivilegeCompany> areaCompany = privilegeCompanyMapper.getAreaCompany();
 
 		//outer_company 外部公司 当前特殊区域公司标记为 级别为 外部公司来区分
@@ -202,7 +203,9 @@ public class IPermissionServiceImpl implements IPermissionService {
 //			all.setSequenceNbr(0L);
 //			areaCompany.add(0,all);
 		}
-
+		if (!StringUtils.isEmpty(province)){
+			areaCompany= areaCompany.stream().filter(e -> e.getAddress().contains(province)).collect(Collectors.toList());
+		}
 
 		return areaCompany;