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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -103,12 +103,12 @@ public class MyBatisPlusCodeGenerator {
         gc.setActiveRecord(false);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.92.234.253:3306/amos_project?serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://47.92.234.253:13306/amos_project?serverTimezone=GMT%2B8");
         // dsc.setSchemaName("public");
 //        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("Yeejoin@2020");
+        dsc.setPassword("Yeejoin_1234");
 
         dsc.setTypeConvert(new ITypeConvert() {
             @Override
@@ -130,7 +130,7 @@ public class MyBatisPlusCodeGenerator {
         // 包配置
         final PackageConfig pc = new PackageConfig();
         // 填写对应模块
-        pc.setModuleName(projectShortName);
+        pc.setModuleName(projectShortName1);
         // 实体路径
         pc.setParent("com.yeejoin.amos.boot.module");
         pc.setEntity("api.entity");
@@ -294,7 +294,7 @@ public class MyBatisPlusCodeGenerator {
         strategy.setTablePrefix();
         //去除表名前缀
         strategy.setTablePrefix("tz_" + projectShortName1 + "_", "t_", "tb_", "sys_", "other_", "rpm_", "s_", "tcb_",
-                "cb_", "tz_", "jc_", "jcb_", "flc_");
+                "cb_", "tz_", "jc_", "jcb_", "flc_","hygf_");
         // 设置父级Controller
         strategy.setSuperControllerClass("com.yeejoin.amos.boot.biz.common.controller.BaseController");
         autoGenerator.setStrategy(strategy);

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

@@ -28,6 +28,7 @@ public enum ArrivalStateeEnum {
     施工中("施工中", "施工中"),
     施工完成 ("施工完成", "施工完成"),
     并网中("并网中", "并网中"),
+    验收中("验收中", "验收中"),
     并网完成("并网完成", "并网完成"),
     线上验收("线上验收", "线上验收"),
     线下验收("线下验收", "线下验收"),

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum BusinessWorkflowKey {
+    经销商管理员审核("经销商管理员审核","Activity_0r2x1es,Activity_0ojajec"),
+    完工登记("完工登记","Activity_1spujef"),
+    施工完成提交("施工完成提交","Activity_0bs6t4g"),
+    并网登记("并网登记","Activity_0bs6t4g"),
+    验收提交("验收提交","Activity_0bs6t4g"),
+    完工自审("完工自审","Activity_16r1828"),
+    片区运营审核("片区运营审核","Activity_1bldcno,Activity_05nlkey,Activity_0edftmv"),
+    设计审核("设计审核","Activity_095if3p,Activity_0k4o46e"),
+    工程审核("工程审核","Activity_1yftt2k,Activity_0k4o46e"),
+    投融审核("投融审核","Activity_1rjn5s1"),
+    法务审核("法务审核","Activity_1rjn5s1"),
+    资产审核("资产审核","Activity_0rbc0gc");
+
+
+    private  String name;
+
+    private  String code;
+
+
+
+
+
+}

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

@@ -14,12 +14,21 @@ public enum GridStatusEnum {
 
 
     DDJ("待登记", "1"),
-
-    DSH("待审核", "2"),
-
+    JXSGLYDSH("经销商管理员待审核", "2"),
     YWC("已完成", "3"),
+    WTG("未通过", "4"),
+    SJDSH("设计待审核", "5"),
+    ROLESDSH("设计待审核/工程待审核", "6"),
+    PQYYDSH("片区运营待审核", "7"),
+    GCDSH("工程待审核", "8"),
+    ZGDSH("整改待审核", "9"),
+    DZG("待整改", "10"),
+    YSROLESDSH("投融待审核/法务待审核", "11"),
+    TRDSH("投融待审核", "12"),
+    ZCDSH("资产待审核", "13"),
+    FWDSH("法务待审核", "14"),
+    DTJYS("待提交验收", "15");
 
-    WTG("未通过", "4");
 
     /**
      * 名称，描述

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

@@ -8,7 +8,9 @@ import lombok.Getter;
 public enum RectificationOrderEnum {
 
 
-    施工("ProcessEngineering", "area,design,engineering");
+    施工("ProcessEngineering", "area,design,engineering"),
+    并网("GridConnected", "bw-area,bw-design,bw-engineering"),
+    验收("AcceptanceCheck", "ys-area,ys-tourong,ys-fawu,ys-zichan");
 
     /**
      * 名称，描述

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum RectificationRoleEnum {
+
+	片区运营角色("area,bw-area,ys-area"), 设计角色("design,bw-design"), 工程角色("engineering,bw-engineering"), 投融角色("ys-tourong"),
+	法务角色("ys-fawu"),资产角色("ys-zichan");
+
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+
+	public static RectificationRoleEnum getNodeByName(String name) {
+		RectificationRoleEnum dealerReviewEnum = null;
+		for (RectificationRoleEnum type : RectificationRoleEnum.values()) {
+			if (type.getName().contains(name)) {
+				dealerReviewEnum = type;
+				break;
+			}
+		}
+		return dealerReviewEnum;
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/GlobalExceptionHandler.java

@@ -56,6 +56,8 @@ public class GlobalExceptionHandler {
 			String stackTrace = sw.toString();
 			response.setDevMessage(stackTrace);
 			response.setMessage(stackTrace);
+			System.err.println(e.getMessage());
+			log.debug("Exception stack trace (debug mode): {}", stackTrace);
 		} else {
 			response.setDevMessage(e.getMessage());
 			response.setMessage(e.getMessage());

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceCheckAuditingDto.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;
+
+/**
+ * 并网审核表
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AcceptanceCheckAuditingDto", description="并网审核表")
+public class AcceptanceCheckAuditingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "工作流实例ID")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下一个节点角色权限id")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程下一节点id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "工作流发起人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "下个节点名称")
+    private String nextNodeName;
+
+    @ApiModelProperty(value = "下个节点key")
+    private String nextNodeKey;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "验收id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = " 待执行节点小程序路由")
+    private String nodeRouting;
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * 并网验收节点
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AcceptanceCheckDto", description="并网验收节点")
+public class AcceptanceCheckDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "施工单id")
+    private Long workOrderId;
+
+    @ApiModelProperty(value = "施工电站id")
+    private Long workOrderPowerStationId;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = "验收状态")
+    private String acceptanceCheckStatus;
+
+    @ApiModelProperty(value = "节点标识")
+    private String basicGridNode;
+
+    @ApiModelProperty(value = "片区审核")
+    private String powerStationAreaStatus;
+
+    @ApiModelProperty(value = "法务审核")
+    private String powerStationLegalStatus;
+
+    @ApiModelProperty(value = "投融审核")
+    private String powerStationFinancingStatus;
+
+    @ApiModelProperty(value = "资产审核")
+    private String powerStationAssetsStatus;
+
+    @ApiModelProperty(value = "实例id")
+    private String instanceId;
+
+    private String acceptanceTime;
+
+ //电站编号
+ private String peasantHouseholdNo;
+ //户主姓名
+ private String ownersName;
+ ///项目地址
+ private String projectAddressName;
+ //并网日期
+ private Date gridConnectionTime;
+
+ private String regionalCompaniesName;
+
+ private String serviceAgent;
+
+
+ //并网登记id
+
+ private Long fonGridId;
+
+
+ private String isAudit;
+
+ private String rectificationStatus;
+
+// 电站安装规模
+ private String scale;
+}

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

@@ -76,4 +76,5 @@ public class BasicGridAcceptanceDto extends BaseDto {
 
 //    电站安装规模(kW)
     private String scale;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/BasicGridAuditingDto.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;
+
+/**
+ * 并网审核表
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="BasicGridAuditingDto", description="并网审核表")
+public class BasicGridAuditingDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "工作流实例ID")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下一个节点角色权限id")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "流程下一节点id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "工作流发起人id")
+    private String createUserId;
+
+    @ApiModelProperty(value = "下个节点名称")
+    private String nextNodeName;
+
+    @ApiModelProperty(value = "下个节点key")
+    private String nextNodeKey;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "并网id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = " 待执行节点小程序路由")
+    private String nodeRouting;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/BasicGridRecordDto.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;
+
+/**
+ * 并网验收节点
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="BasicGridRecordDto", description="并网验收节点")
+public class BasicGridRecordDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "施工单id")
+    private Long workOrderId;
+
+    @ApiModelProperty(value = "施工电站id")
+    private Long workOrderPowerStationId;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = "并网状态")
+    private String gridStatus;
+
+    @ApiModelProperty(value = "节点标识")
+    private String basicGridNode;
+
+    @ApiModelProperty(value = "片区审核")
+    private String powerStationAreaStatus;
+
+    @ApiModelProperty(value = "设计审核")
+    private String powerStationDesignStatus;
+
+    @ApiModelProperty(value = "工程审核")
+    private String powerStationEngineeringStatus;
+
+    @ApiModelProperty(value = "实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "当前存在的整改单类型")
+    private String rectificationStatus;
+
+ //电站编号
+ private String peasantHouseholdNo;
+ //户主姓名
+ private String ownersName;
+ ///项目地址
+ private String projectAddressName;
+ //并网日期
+ private Date gridConnectionTime;
+
+ private String regionalCompaniesName;
+
+ private String serviceAgent;
+
+
+ //并网登记id
+
+ private Long fonGridId;
+
+
+ private String isAudit;
+
+ private Date gridTime;
+
+ //    电站安装规模(kW)
+ private String scale;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ConstructionAcceptanceRecordsDto.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;
+
+/**
+ * 并网操作日志
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="ConstructionAcceptanceRecordsDto", description="并网操作日志")
+public class ConstructionAcceptanceRecordsDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "操作人")
+    private String operator;
+
+    @ApiModelProperty(value = "操作内容")
+    private String operationContent;
+
+    @ApiModelProperty(value = "操作时间")
+    private Date operationTime;
+
+    @ApiModelProperty(value = "操作结果")
+    private String operationResults;
+
+    @ApiModelProperty(value = "施工单id")
+    private Long acceptanceId;
+
+    @ApiModelProperty(value = "施工电站")
+    private Long workOrderPowerStationId;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = "备注")
+    private String notes;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ConstructionGirdRecordsDto.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;
+
+/**
+ * 并网操作日志
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="ConstructionGirdRecordsDto", description="并网操作日志")
+public class ConstructionGirdRecordsDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "操作人")
+    private String operator;
+
+    @ApiModelProperty(value = "操作内容")
+    private String operationContent;
+
+    @ApiModelProperty(value = "操作时间")
+    private Date operationTime;
+
+    @ApiModelProperty(value = "操作结果")
+    private String operationResults;
+
+    @ApiModelProperty(value = "施工单id")
+    private Long gridId;
+
+    @ApiModelProperty(value = "施工电站")
+    private Long workOrderPowerStationId;
+
+    @ApiModelProperty(value = "农户id")
+    private Long peasantHouseholdId;
+
+    @ApiModelProperty(value = "备注")
+    private String notes;
+
+}

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

@@ -5,7 +5,11 @@ import lombok.Data;
 
 @Data
 public class PeasantHouseholdPageDto extends Page<PeasantHouseholdPageDto> {
-    private String nhUserId;
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String nhUserId;
     private String peasantHouseholdNo;
     private String regionalCompaniesName;
     private String developerName;

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

@@ -14,11 +14,17 @@ public class PowerStationEngineeringInfoAllDto {
 
     //并网验收审核记录
     LoggerDto loggerDto;
+    //验收审核记录
+    LoggerDto loggerYsDto;
 
     //自审信息
 
     ConstructionRecords constructionRecords;
 
+    ConstructionGirdRecords constructionGirdRecords;
+
+    ConstructionAcceptanceRecords acceptanceRecords;
+
     // 基本信息
     SurveyInformationDto surveyInformation;
 
@@ -58,6 +64,13 @@ public class PowerStationEngineeringInfoAllDto {
     //派工单信息
 
     WorkOrder workOrder;
+    
+    //验收信息
+
+    AcceptanceCheck acceptanceCheck;
     //保存标识 0 保存 1保存并提交
     Integer commitFlag;
+
+    //流程类型 0 并网 1是验收
+    Integer flowType;
 }

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

@@ -47,6 +47,9 @@ public class SurveyInfoAllDto {
 
 
     //自审信息
-
     ConstructionRecords constructionRecords;
+    
+    //验收信息
+
+    AcceptanceCheck acceptanceCheck;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheck.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;
+import java.util.List;
+
+/**
+ * 并网验收节点
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_acceptance_check")
+public class AcceptanceCheck extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 施工单id
+     */
+	@TableField("work_order_id")
+    private Long workOrderId;
+
+    /**
+     * 施工电站id
+     */
+	@TableField("work_order_power_station_id")
+    private Long workOrderPowerStationId;
+
+    /**
+     * 农户id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     * 验收状态
+     */
+	@TableField("acceptance_check_status")
+    private String acceptanceCheckStatus;
+
+    /**
+     * 节点标识
+     */
+	@TableField("basic_grid_node")
+    private String basicGridNode;
+
+    /**
+     * 片区审核
+     */
+	@TableField("power_station_area_status")
+    private String powerStationAreaStatus;
+
+    /**
+     * 法务审核
+     */
+	@TableField("power_station_legal_status")
+    private String powerStationLegalStatus;
+
+    /**
+     * 投融审核
+     */
+	@TableField("power_station_financing_status")
+    private String powerStationFinancingStatus;
+	/**
+     * 资产审核
+     */
+	@TableField("power_station_assets_status")
+    private String powerStationAssetsStatus;
+
+    /**
+     * 实例id
+     */
+	@TableField("instance_Id")
+    private String instanceId;
+
+    /**
+     * 整改单状态
+     */
+    @TableField("rectification_status")
+    private String rectificationStatus;
+
+
+    /**
+     * 验收时间
+     */
+    @TableField("acceptance_time")
+    private String acceptanceTime;
+
+    
+    /**
+     * 片区整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  areaOrders;
+    
+    /**
+     * 投融整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  financeOrders;
+    
+    /**
+     * 法务整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  legalOrders;
+
+    /**
+     * 资产整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  propertyOrders;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheckAuditing.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-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_acceptance_check_auditing")
+public class AcceptanceCheckAuditing extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作流实例ID
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 下一个节点角色权限id
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 流程下一节点id
+     */
+	@TableField("next_task_id")
+    private String nextTaskId;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+	@TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+
+    /**
+     * 工作流发起人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 下个节点名称
+     */
+	@TableField("next_node_name")
+    private String nextNodeName;
+
+    /**
+     * 下个节点key
+     */
+	@TableField("next_node_key")
+    private String nextNodeKey;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 验收id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     *  待执行节点小程序路由
+     */
+	@TableField("node_routing")
+    private String nodeRouting;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/BasicGridAuditing.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-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_basic_grid_auditing")
+public class BasicGridAuditing extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 工作流实例ID
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 下一个节点角色权限id
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 流程下一节点id
+     */
+	@TableField("next_task_id")
+    private String nextTaskId;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+	@TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+
+    /**
+     * 工作流发起人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 下个节点名称
+     */
+	@TableField("next_node_name")
+    private String nextNodeName;
+
+    /**
+     * 下个节点key
+     */
+	@TableField("next_node_key")
+    private String nextNodeKey;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 并网id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     *  待执行节点小程序路由
+     */
+	@TableField("node_routing")
+    private String nodeRouting;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/BasicGridRecord.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-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_basic_grid_record")
+public class BasicGridRecord extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 施工单id
+     */
+	@TableField("work_order_id")
+    private Long workOrderId;
+
+    /**
+     * 施工电站id
+     */
+	@TableField("work_order_power_station_id")
+    private Long workOrderPowerStationId;
+
+    /**
+     * 农户id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     * 并网状态
+     */
+	@TableField("grid_status")
+    private String gridStatus;
+
+    /**
+     * 节点标识
+     */
+	@TableField("basic_grid_node")
+    private String basicGridNode;
+
+    /**
+     * 片区审核
+     */
+	@TableField("power_station_area_status")
+    private String powerStationAreaStatus;
+
+    /**
+     * 设计审核
+     */
+	@TableField("power_station_design_status")
+    private String powerStationDesignStatus;
+
+    /**
+     * 工程审核
+     */
+	@TableField("power_station_engineering_status")
+    private String powerStationEngineeringStatus;
+
+    /**
+     * 实例id
+     */
+	@TableField("instance_Id")
+    private String instanceId;
+	/**
+     * 整改单状态
+     */
+	@TableField("rectification_status")
+    private String rectificationStatus;
+
+    /**
+     * 验收时间
+     */
+    @TableField("grid_time")
+    private Date gridTime;
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionAcceptanceRecords.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;
+import java.util.List;
+
+/**
+ * 并网操作日志
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_construction_acceptance_records")
+public class ConstructionAcceptanceRecords extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 操作人
+     */
+	@TableField("operator")
+    private String operator;
+
+    /**
+     * 操作内容
+     */
+	@TableField("operation_content")
+    private String operationContent;
+
+    /**
+     * 操作时间
+     */
+	@TableField("operation_time")
+    private Date operationTime;
+
+    /**
+     * 操作结果
+     */
+	@TableField("operation_results")
+    private String operationResults;
+
+    /**
+     * 施工单id
+     */
+	@TableField("acceptance_id")
+    private Long acceptanceId;
+
+    /**
+     * 施工电站
+     */
+	@TableField("work_order_power_station_id")
+    private Long workOrderPowerStationId;
+
+    /**
+     * 农户id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+    /**
+     * 备注
+     */
+	@TableField("notes")
+    private String notes;
+
+    @TableField(exist = false)
+    List<ConstructionAcceptanceRecords> constructionRecordsList;
+
+    public ConstructionAcceptanceRecords() {
+    }
+
+    public ConstructionAcceptanceRecords(String operator, String operationContent, Date operationTime, String operationResults, Long acceptanceId, Long workOrderPowerStationId, Long peasantHouseholdId, String notes) {
+        this.operator = operator;
+        this.operationContent = operationContent;
+        this.operationTime = operationTime;
+        this.operationResults = operationResults;
+        this.acceptanceId = acceptanceId;
+        this.workOrderPowerStationId = workOrderPowerStationId;
+        this.peasantHouseholdId = peasantHouseholdId;
+        this.notes = notes;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ConstructionGirdRecords.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;
+import java.util.List;
+
+/**
+ * 并网操作日志
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_construction_gird_records")
+public class ConstructionGirdRecords extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 操作人
+     */
+	@TableField("operator")
+    private String operator;
+
+    /**
+     * 操作内容
+     */
+	@TableField("operation_content")
+    private String operationContent;
+
+    /**
+     * 操作时间
+     */
+	@TableField("operation_time")
+    private Date operationTime;
+
+    /**
+     * 操作结果
+     */
+	@TableField("operation_results")
+    private String operationResults;
+
+    /**
+     * 施工单id
+     */
+	@TableField("grid_id")
+    private Long gridId;
+
+    /**
+     * 施工电站
+     */
+	@TableField("work_order_power_station_id")
+    private Long workOrderPowerStationId;
+
+    /**
+     * 农户id
+     */
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
+
+
+    /**
+     * 备注
+     */
+    @TableField("notes")
+    private String notes;
+
+    public ConstructionGirdRecords(String operator, String operationContent, Date operationTime, String operationResults, Long gridId, Long workOrderPowerStationId, Long peasantHouseholdId, String notes) {
+        this.operator = operator;
+        this.operationContent = operationContent;
+        this.operationTime = operationTime;
+        this.operationResults = operationResults;
+        this.gridId = gridId;
+        this.workOrderPowerStationId = workOrderPowerStationId;
+        this.peasantHouseholdId = peasantHouseholdId;
+        this.notes = notes;
+    }
+
+    public ConstructionGirdRecords() {
+    }
+
+    @TableField(exist = false)
+    List<ConstructionGirdRecords> constructionRecordsList;
+
+}

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

@@ -149,4 +149,21 @@ public class HygfOnGrid extends BaseEntity {
 
     @TableField(exist = false)
     private String type;
+
+
+    /**
+     * 片区整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  areaOrders;
+    /**
+     * 工程整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  engineeringOrders;
+    /**
+     * 设计整改单
+     */
+    @TableField(exist = false)
+    private List<HygfRectificationOrder>  designOrders;
 }

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

@@ -97,7 +97,12 @@ public class HygfRectificationOrder extends BaseEntity {
      */
     @TableField("rectification_source")
     private String rectificationSource;
-
+    
+    /**
+     * 整改来源
+     */
+    @TableField(exist = false)
+    private String rectificationSourceName;
 
     /**
      * 整改历史意见

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckAuditing;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 并网审核表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+public interface AcceptanceCheckAuditingMapper extends BaseMapper<AcceptanceCheckAuditing> {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/AcceptanceCheckMapper.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.dto.AcceptanceCheckDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheck;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 并网验收节点 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+public interface AcceptanceCheckMapper extends BaseMapper<AcceptanceCheck> {
+    @UserEmpower(field ={"hph.regional_companies_code"} ,dealerField={"hph.developer_code","hph.regional_companies_code","hph.developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
+    List<AcceptanceCheckDto> selectPageList(@Param("map")Map<String, Object> map);
+}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
 import org.apache.ibatis.annotations.Param;
@@ -21,5 +22,5 @@ public interface BasicGridAcceptanceMapper extends BaseMapper<BasicGridAcceptanc
 
     PeasantHousehold getStationInfoById(@Param("id") Long id);
     @UserEmpower(field ={"hph.regional_companies_code"} ,dealerField={"hph.developer_code","hph.regional_companies_code","hph.developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
-    List<BasicGridAcceptanceDto> selectPageList(@Param("map") Map<String, Object> map);
+    List<BasicGridRecordDto> selectPageList(@Param("map") Map<String, Object> map);
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAuditing;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 并网审核表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+public interface BasicGridAuditingMapper extends BaseMapper<BasicGridAuditing> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 并网验收节点 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+public interface BasicGridRecordMapper extends BaseMapper<BasicGridRecord> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.ConstructionAcceptanceRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 并网操作日志 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+public interface ConstructionAcceptanceRecordsMapper extends BaseMapper<ConstructionAcceptanceRecords> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.ConstructionGirdRecords;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 并网操作日志 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+public interface ConstructionGirdRecordsMapper extends BaseMapper<ConstructionGirdRecords> {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 并网审核表接口类
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+public interface IAcceptanceCheckAuditingService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 并网验收节点接口类
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+public interface IAcceptanceCheckService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 并网审核表接口类
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+public interface IBasicGridAuditingService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 并网验收节点接口类
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+public interface IBasicGridRecordService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 并网操作日志接口类
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+public interface IConstructionAcceptanceRecordsService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 并网操作日志接口类
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+public interface IConstructionGirdRecordsService {
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/CommonResponseNewUtil.java

@@ -47,6 +47,15 @@ public class CommonResponseNewUtil
 		return res;
 	}
 
+	public static ResponseModel failureMessage(String message)
+	{
+		ResponseModel res = new ResponseModel();
+		res.setDevMessage(message);
+		res.setMessage(message);
+		res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		return res;
+	}
+
 	public static ResponseModel failure(Object obj, String message)
 	{
 		ResponseModel res = new ResponseModel();

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceCheckAuditingMapper.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.AcceptanceCheckAuditingMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceCheckMapper.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.AcceptanceCheckMapper">
+
+    <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckDto">
+
+        SELECT
+        hogaa.sequence_nbr fonGridId,
+        hbga.sequence_nbr sequenceNbr,
+        hbga.work_order_id workOrderId,
+        hbga.work_order_power_station_id workOrderPowerStationId,
+        hbga.peasant_household_id peasantHouseholdId,
+        hbga.basic_grid_node basicGridNode,
+        hbga.acceptance_time acceptanceTime,
+        hbga.power_station_area_status powerStationAreaStatus,
+        hbga.power_station_financing_status powerStationFinancingStatus,
+        hbga.power_station_assets_status powerStationAssetsStatus,
+        hbga.rectification_status rectificationStatus,
+        hbga.power_station_legal_status powerStationLegalStatus,
+        hbga.instance_id instanceId,
+        hph.developer_name as serviceAgent,
+        hph.regional_companies_name AS regionalCompaniesName,
+        hph.owners_name AS ownersName,
+        hph.peasant_household_no peasantHouseholdNo,
+        hph.project_address_name projectAddressName,
+        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 '经销商管理员待审核'
+        WHEN hbga.acceptance_check_status = '3' THEN '已完成'
+        WHEN hbga.acceptance_check_status = '4' THEN '未通过'
+        WHEN hbga.acceptance_check_status = '7' THEN '片区运营待审核'
+        WHEN hbga.acceptance_check_status = '9' THEN '整改待审核'
+        WHEN hbga.acceptance_check_status = '11' THEN '投融待审核/法务待审核'
+        WHEN hbga.acceptance_check_status = '12' THEN '投融待审核'
+        WHEN hbga.acceptance_check_status = '13' THEN '资产待审核'
+        WHEN hbga.acceptance_check_status = '14' THEN '法务待审核'
+        ELSE '待整改' END AS acceptanceCheckStatus
+        FROM
+        hygf_acceptance_check hbga
+        LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
+        LEFT JOIN hygf_on_grid_and_acceptance hogaa ON hogaa.work_order_power_station_id = hbga.work_order_power_station_id
+        LEFT JOIN hygf_work_order  ON hygf_work_order.sequence_nbr = hbga.work_order_id
+        <where>
+            hbga.is_delete = 0
+
+            <if test="map.amosDealerId!=null and map.amosDealerId!=''">
+                and hygf_work_order.amos_dealer_id = #{map.amosDealerId}
+            </if>
+            <if test="map.regionCompanyId!=null and map.regionCompanyId!=''">
+                and hygf_work_order.region_company_id =#{map.regionCompanyId}
+            </if>
+            <if test="map.powerStationCode!=null and map.powerStationCode!=''">
+                and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%')
+            </if>
+            <if test="map.formType != null and map.formType!=''">
+                AND hbga.acceptance_check_status IN ('2', '3', '4')
+            </if>
+            <if test="map.projectAddress != null and map.projectAddress!=''">
+                AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
+            </if>
+            <if test="map.type != null">
+                and ( (hbga.basic_grid_node  is not null AND hbga.basic_grid_node != 'jxsAdmin')
+                or hbga.basic_grid_node = 'all'
+                or hbga.power_station_area_status  is not null
+                or hbga.power_station_financing_status  is not null
+                or hbga.power_station_assets_status  is not null
+                or hbga.power_station_legal_status  is not null
+                )
+            </if>
+            <if test="map.ownersName != null and map.ownersName !=''">
+                AND hph.owners_name LIKE concat(concat('%', #{map.ownersName}), '%')
+            </if>
+            <if test="map.acceptanceCheckStatus != null and map.acceptanceCheckStatus !=''">
+                AND hbga.acceptance_check_status = #{map.acceptanceCheckStatus}
+            </if>
+            <if test="map.acceptanceTime != null">
+                AND DATE_FORMAT(hogaa.acceptance_time, '%Y-%m-%d') = #{map.acceptanceTime}
+            </if>
+        </where>
+        ORDER BY hbga.sequence_nbr desc
+    </select>
+</mapper>

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

@@ -12,7 +12,7 @@
             hogaa.peasant_household_id = #{id}
     </select>
 
-    <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto">
+    <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto">
 
         SELECT
         hogaa.sequence_nbr fonGridId,
@@ -20,10 +20,13 @@
         hbga.work_order_id workOrderId,
         hbga.work_order_power_station_id workOrderPowerStationId,
         hbga.peasant_household_id peasantHouseholdId,
-        hbga.acceptance_rec_date acceptanceRecDate,
+        hbga.basic_grid_node basicGridNode,
+        hbga.grid_time gridTime,
+        hbga.power_station_area_status powerStationAreaStatus,
+        hbga.power_station_design_status powerStationDesignStatus,
+        hbga.rectification_status rectificationStatus,
+        hbga.power_station_engineering_status powerStationEngineeringStatus,
         hbga.instance_id instanceId,
-        hbga.next_executor_ids nextExecutorIds,
-        hbga.next_node_key nextNodeKey,
         hph.developer_name as serviceAgent,
         hph.regional_companies_name AS regionalCompaniesName,
         hph.owners_name AS ownersName,
@@ -31,11 +34,17 @@
         hph.project_address_name projectAddressName,
         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 '待审核'
+        WHEN hbga.grid_status = '2' THEN '经销商管理员待审核'
         WHEN hbga.grid_status = '3' THEN '已完成'
-        ELSE '未通过' END AS gridStatus
+        WHEN hbga.grid_status = '4' THEN '未通过'
+        WHEN hbga.grid_status = '5' THEN '设计待审核'
+        WHEN hbga.grid_status = '6' THEN '设计待审核/工程待审核'
+        WHEN hbga.grid_status = '7' THEN '片区运营待审核'
+        WHEN hbga.grid_status = '8' THEN '工程待审核'
+        WHEN hbga.grid_status = '9' THEN '整改待审核'
+        ELSE '待整改' END AS gridStatus
         FROM
-            hygf_basic_grid_acceptance hbga
+            hygf_basic_grid_record hbga
             LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
             LEFT JOIN hygf_on_grid_and_acceptance hogaa ON hogaa.work_order_power_station_id = hbga.work_order_power_station_id
             LEFT JOIN hygf_work_order  ON hygf_work_order.sequence_nbr = hbga.work_order_id
@@ -48,14 +57,20 @@
             <if test="map.regionCompanyId!=null and map.regionCompanyId!=''">
                 and hygf_work_order.region_company_id =#{map.regionCompanyId}
             </if>
+            <if test="map.powerStationCode!=null and map.powerStationCode!=''">
+                and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%')
+            </if>
             <if test="map.formType != null and map.formType!=''">
                 AND hbga.grid_status IN ('2', '3', '4')
             </if>
             <if test="map.projectAddress != null and map.projectAddress!=''">
                 AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
             </if>
-            <if test="map.powerStationCode != null and map.powerStationCode !=''">
-                AND hph.peasant_household_no LIKE concat(concat('%', #{map.powerStationCode}), '%')
+            <if test="map.type != null">
+	           AND ( (hbga.basic_grid_node IS NOT NULL AND hbga.basic_grid_node != 'jxsAdmin' ) 
+	           OR hbga.power_station_area_status IS NOT NULL 
+	           OR hbga.power_station_design_status IS NOT NULL 
+	           OR hbga.power_station_engineering_status IS NOT NULL ) 
             </if>
             <if test="map.ownersName != null and map.ownersName !=''">
                 AND hph.owners_name LIKE concat(concat('%', #{map.ownersName}), '%')
@@ -64,13 +79,9 @@
                 AND hbga.grid_status = #{map.gridStatus}
             </if>
             <if test="map.gridConnectionTime != null">
-                AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = #{map.gridConnectionTime}
+                AND DATE_FORMAT(hogaa.grid_time, '%Y-%m-%d') = #{map.gridConnectionTime}
             </if>
         </where>
-        ORDER BY
-        FIELD(hbga.grid_status, '1', '2', '4', '3'),
-         hogaa.grid_connection_time desc, hbga.sequence_nbr desc
-
-
+        ORDER BY hbga.sequence_nbr desc
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAuditingMapper.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.BasicGridAuditingMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridRecordMapper.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.BasicGridRecordMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/ConstructionAcceptanceRecordsMapper.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.ConstructionAcceptanceRecordsMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/ConstructionGirdRecordsMapper.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.ConstructionGirdRecordsMapper">
+
+</mapper>

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

@@ -67,13 +67,13 @@
         hygf_work_order_power_station.power_station_engineering_status powerStationEngineeringStatus,
         (select hygf_rectification_order.rectification_history  from  hygf_rectification_order
         where hygf_rectification_order.peasant_househole_id = hygf_work_order_power_station.peasant_household_id
-        and hygf_rectification_order.rectification_status  = '待整改'  and hygf_rectification_order.rectification_source = hygf_work_order_power_station.work_order_power_station_node )  as auditIdea,
+        and hygf_rectification_order.rectification_status  = '待整改'  and hygf_rectification_order.rectification_source = hygf_work_order_power_station.work_order_power_station_node and hygf_rectification_order.rectification_source in ('area','engineering','design') )  as auditIdea,
         (select hygf_rectification_order.sequence_nbr  from  hygf_rectification_order
         where hygf_rectification_order.peasant_househole_id = hygf_work_order_power_station.peasant_household_id
-        and hygf_rectification_order.rectification_status  = '已作废'  and hygf_rectification_order.rectification_source = hygf_work_order_power_station.work_order_power_station_node order by rec_date desc limit 1) as rollbackOrderId,
+        and hygf_rectification_order.rectification_status  = '已作废'  and hygf_rectification_order.rectification_source = hygf_work_order_power_station.work_order_power_station_node and hygf_rectification_order.rectification_source in ('area','engineering','design')order by rec_date desc limit 1) as rollbackOrderId,
         (select hygf_rectification_order.sequence_nbr  from  hygf_rectification_order
         where hygf_rectification_order.peasant_househole_id = hygf_work_order_power_station.peasant_household_id
-          and hygf_rectification_order.rectification_status  in ('待整改','待提交','整改中','整改待审核','待审核')) as rectificationNum
+          and hygf_rectification_order.rectification_status  in ('待整改','待提交','整改中','整改待审核','待审核') and hygf_rectification_order.rectification_source in ('area','engineering','design')) as rectificationNum
         from   hygf_work_order_power_station LEFT join hygf_work_order
         on hygf_work_order.sequence_nbr=hygf_work_order_power_station.work_order_id
         LEFT JOIN hygf_peasant_household on  hygf_peasant_household.sequence_nbr=hygf_work_order_power_station.peasant_household_id

amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml

@@ -26,11 +26,6 @@
 <!--            <version>${amos-biz-boot.version}</version>-->
 <!--        </dependency>-->
       <dependency>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-          <version>2.6</version>
-      </dependency>
-      <dependency>
           <groupId>org.typroject</groupId>
           <artifactId>tyboot-component-emq</artifactId>
           <version>1.1.20</version>

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+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.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.AcceptanceCheckAuditingServiceImpl;
+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.AcceptanceCheckAuditingDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 并网审核表
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@RestController
+@Api(tags = "并网审核表Api")
+@RequestMapping(value = "/acceptance-check-auditing")
+public class AcceptanceCheckAuditingController extends BaseController {
+
+    @Autowired
+    AcceptanceCheckAuditingServiceImpl acceptanceCheckAuditingServiceImpl;
+
+    /**
+     * 新增并网审核表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增并网审核表", notes = "新增并网审核表")
+	public ResponseModel<AcceptanceCheckAuditingDto> save(@RequestBody AcceptanceCheckAuditingDto model) {
+	    model = acceptanceCheckAuditingServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新并网审核表", notes = "根据sequenceNbr更新并网审核表")
+	public ResponseModel<AcceptanceCheckAuditingDto> updateBySequenceNbrAcceptanceCheckAuditing(@RequestBody AcceptanceCheckAuditingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(acceptanceCheckAuditingServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据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){
+        return ResponseHelper.buildResponse(acceptanceCheckAuditingServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个并网审核表",  notes = "根据sequenceNbr查询单个并网审核表")
+	public ResponseModel<AcceptanceCheckAuditingDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(acceptanceCheckAuditingServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "并网审核表分页查询",  notes = "并网审核表分页查询")
+	public ResponseModel<Page<AcceptanceCheckAuditingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<AcceptanceCheckAuditingDto> page = new Page<AcceptanceCheckAuditingDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(acceptanceCheckAuditingServiceImpl.queryForAcceptanceCheckAuditingPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "并网审核表列表全部数据查询",   notes = "并网审核表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<AcceptanceCheckAuditingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(acceptanceCheckAuditingServiceImpl.queryForAcceptanceCheckAuditingList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+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.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.BasicGridAuditingServiceImpl;
+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.BasicGridAuditingDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 并网审核表
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@RestController
+@Api(tags = "并网审核表Api")
+@RequestMapping(value = "/basic-grid-auditing")
+public class BasicGridAuditingController extends BaseController {
+
+    @Autowired
+    BasicGridAuditingServiceImpl basicGridAuditingServiceImpl;
+
+    /**
+     * 新增并网审核表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增并网审核表", notes = "新增并网审核表")
+	public ResponseModel<BasicGridAuditingDto> save(@RequestBody BasicGridAuditingDto model) {
+	    model = basicGridAuditingServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新并网审核表", notes = "根据sequenceNbr更新并网审核表")
+	public ResponseModel<BasicGridAuditingDto> updateBySequenceNbrBasicGridAuditing(@RequestBody BasicGridAuditingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(basicGridAuditingServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据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){
+        return ResponseHelper.buildResponse(basicGridAuditingServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个并网审核表",  notes = "根据sequenceNbr查询单个并网审核表")
+	public ResponseModel<BasicGridAuditingDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(basicGridAuditingServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "并网审核表分页查询",  notes = "并网审核表分页查询")
+	public ResponseModel<Page<BasicGridAuditingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<BasicGridAuditingDto> page = new Page<BasicGridAuditingDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(basicGridAuditingServiceImpl.queryForBasicGridAuditingPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "并网审核表列表全部数据查询",   notes = "并网审核表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<BasicGridAuditingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(basicGridAuditingServiceImpl.queryForBasicGridAuditingList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+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.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.BasicGridRecordServiceImpl;
+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.BasicGridRecordDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 并网验收节点
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@RestController
+@Api(tags = "并网验收节点Api")
+@RequestMapping(value = "/basic-grid-record")
+public class BasicGridRecordController extends BaseController {
+
+    @Autowired
+    BasicGridRecordServiceImpl basicGridRecordServiceImpl;
+
+    /**
+     * 新增并网验收节点
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增并网验收节点", notes = "新增并网验收节点")
+	public ResponseModel<BasicGridRecordDto> save(@RequestBody BasicGridRecordDto model) {
+	    model = basicGridRecordServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新并网验收节点", notes = "根据sequenceNbr更新并网验收节点")
+	public ResponseModel<BasicGridRecordDto> updateBySequenceNbrBasicGridRecord(@RequestBody BasicGridRecordDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(basicGridRecordServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据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){
+        return ResponseHelper.buildResponse(basicGridRecordServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个并网验收节点",  notes = "根据sequenceNbr查询单个并网验收节点")
+	public ResponseModel<BasicGridRecordDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(basicGridRecordServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "并网验收节点分页查询",  notes = "并网验收节点分页查询")
+	public ResponseModel<Page<BasicGridRecordDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<BasicGridRecordDto> page = new Page<BasicGridRecordDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(basicGridRecordServiceImpl.queryForBasicGridRecordPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "并网验收节点列表全部数据查询",   notes = "并网验收节点列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<BasicGridRecordDto>> selectForList() {
+	    return ResponseHelper.buildResponse(basicGridRecordServiceImpl.queryForBasicGridRecordList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+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.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ConstructionAcceptanceRecordsServiceImpl;
+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.ConstructionAcceptanceRecordsDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 并网操作日志
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@RestController
+@Api(tags = "并网操作日志Api")
+@RequestMapping(value = "/construction-acceptance-records")
+public class ConstructionAcceptanceRecordsController extends BaseController {
+
+    @Autowired
+    ConstructionAcceptanceRecordsServiceImpl constructionAcceptanceRecordsServiceImpl;
+
+    /**
+     * 新增并网操作日志
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增并网操作日志", notes = "新增并网操作日志")
+	public ResponseModel<ConstructionAcceptanceRecordsDto> save(@RequestBody ConstructionAcceptanceRecordsDto model) {
+	    model = constructionAcceptanceRecordsServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新并网操作日志", notes = "根据sequenceNbr更新并网操作日志")
+	public ResponseModel<ConstructionAcceptanceRecordsDto> updateBySequenceNbrConstructionAcceptanceRecords(@RequestBody ConstructionAcceptanceRecordsDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(constructionAcceptanceRecordsServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据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){
+        return ResponseHelper.buildResponse(constructionAcceptanceRecordsServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个并网操作日志",  notes = "根据sequenceNbr查询单个并网操作日志")
+	public ResponseModel<ConstructionAcceptanceRecordsDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(constructionAcceptanceRecordsServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "并网操作日志分页查询",  notes = "并网操作日志分页查询")
+	public ResponseModel<Page<ConstructionAcceptanceRecordsDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<ConstructionAcceptanceRecordsDto> page = new Page<ConstructionAcceptanceRecordsDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(constructionAcceptanceRecordsServiceImpl.queryForConstructionAcceptanceRecordsPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "并网操作日志列表全部数据查询",   notes = "并网操作日志列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<ConstructionAcceptanceRecordsDto>> selectForList() {
+	    return ResponseHelper.buildResponse(constructionAcceptanceRecordsServiceImpl.queryForConstructionAcceptanceRecordsList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+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.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ConstructionGirdRecordsServiceImpl;
+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.ConstructionGirdRecordsDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 并网操作日志
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@RestController
+@Api(tags = "并网操作日志Api")
+@RequestMapping(value = "/construction-gird-records")
+public class ConstructionGirdRecordsController extends BaseController {
+
+    @Autowired
+    ConstructionGirdRecordsServiceImpl constructionGirdRecordsServiceImpl;
+
+    /**
+     * 新增并网操作日志
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增并网操作日志", notes = "新增并网操作日志")
+	public ResponseModel<ConstructionGirdRecordsDto> save(@RequestBody ConstructionGirdRecordsDto model) {
+	    model = constructionGirdRecordsServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新并网操作日志", notes = "根据sequenceNbr更新并网操作日志")
+	public ResponseModel<ConstructionGirdRecordsDto> updateBySequenceNbrConstructionGirdRecords(@RequestBody ConstructionGirdRecordsDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(constructionGirdRecordsServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据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){
+        return ResponseHelper.buildResponse(constructionGirdRecordsServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个并网操作日志",  notes = "根据sequenceNbr查询单个并网操作日志")
+	public ResponseModel<ConstructionGirdRecordsDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(constructionGirdRecordsServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "并网操作日志分页查询",  notes = "并网操作日志分页查询")
+	public ResponseModel<Page<ConstructionGirdRecordsDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<ConstructionGirdRecordsDto> page = new Page<ConstructionGirdRecordsDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(constructionGirdRecordsServiceImpl.queryForConstructionGirdRecordsPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "并网操作日志列表全部数据查询",   notes = "并网操作日志列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<ConstructionGirdRecordsDto>> selectForList() {
+	    return ResponseHelper.buildResponse(constructionGirdRecordsServiceImpl.queryForConstructionGirdRecordsList());
+	}
+}

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

@@ -20,6 +20,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -283,21 +284,25 @@ public class HouseholdContractController extends BaseController {
         wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
         wrapper.eq(ToDoTasks::getState, "待办");
         wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
-        ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
+        List<ToDoTasks> doTasks= toDoTasksMapper.selectList(wrapper);
         if(doTasks!=null){
-            doTasks.setState("作废");
-            doTasks.setIsDelete(true);
-            toDoTasksMapper.updateById(doTasks);
-            emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(doTasks).getBytes(), 2 ,false);
-
-            UserMessage userMessage=  new UserMessage( doTasks.getType(),  doTasks.getBusinessId(),  doTasks.getAmosUserId(),  new Date(),  doTasks.getTaskName()+"已作废",  doTasks.getAmosOrgCode());
-            userMessageMapper.insert(userMessage);
-            emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
-
+            doTasks.forEach(e->{
+                try {
+                    e.setState("作废");
+                    e.setIsDelete(true);
+                    toDoTasksMapper.updateById(e);
+                    emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(e).getBytes(), 2 ,false);
+                    UserMessage userMessage=  new UserMessage( e.getType(),  e.getBusinessId(),  e.getAmosUserId(),  new Date(),  e.getTaskName()+"已作废",  e.getAmosOrgCode());
+                    userMessageMapper.insert(userMessage);
+                    emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
+                } catch (MqttException mqttException) {
+                    mqttException.printStackTrace();
+                }
+            });
         }
     }catch (Exception e){
         e.printStackTrace();
-        throw new BadRequest("系统异常");
+        throw new BadRequest(e.getMessage());
     }
         return householdContractServiceImpl.updateById(householdContrac);
 

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

@@ -57,6 +57,8 @@ public class WorkOrderController extends BaseController {
     Long areaId;
     @Value("${admin.design.roleId}")
     Long designId;
+    @Value("${admin.delerAdmin.roleId}")
+    Long delerAdminId;
     /**
      * 新增施工派工工单
      *
@@ -187,15 +189,18 @@ public class WorkOrderController extends BaseController {
     public ResponseModel<Page<WorkOrderPage>> queryForwgpage(@RequestBody WorkOrderPage  workOrder
     ) {
 
-	     //当前登录人所属场站
+        //当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 //
 //        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
 //        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
         ReginParams reginParams = getSelectedOrgInfo();
         List<String> workOrderPowerStationNodes = new ArrayList<>();
+
+        List<Long> roleIds = new ArrayList<>();
         for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
             List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
+
             if (longs.contains(areaId)) {
                 workOrderPowerStationNodes.add("area");
             }
@@ -205,6 +210,12 @@ public class WorkOrderController extends BaseController {
             if (longs.contains(designId)) {
                 workOrderPowerStationNodes.add("design");
             }
+            if (longs.contains(delerAdminId)) {
+                workOrderPowerStationNodes.add("design");
+                workOrderPowerStationNodes.add("engineering");
+                workOrderPowerStationNodes.add("area");
+            }
+            roleIds.addAll(longs);
         }
         if (workOrder.getType().equals("3") && workOrderPowerStationNodes != null){
             workOrder.setWorkOrderPowerStationNodes(workOrderPowerStationNodes);
@@ -212,23 +223,22 @@ public class WorkOrderController extends BaseController {
         Page<WorkOrderPage> workOrderPagePage = workOrderServiceImpl.queryForwgpage(workOrder.getCurrent(), workOrder.getSize(), workOrder);
         if (workOrder.getType().equals("3") && workOrderPowerStationNodes != null){
             workOrderPagePage.getRecords().forEach(e->{
+                if (workOrderPowerStationNodes.contains(e.getWorkOrderPowerStationNode()) && (roleIds.contains(areaId) ||roleIds.contains(designId) ||  roleIds.contains(engineeringId)) ){
+                    e.setIsAudit("0");
+                }
+                else {
+                    e.setIsAudit("1");
+                }
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                }
 
-               if (workOrderPowerStationNodes.contains(e.getWorkOrderPowerStationNode())){
-                e.setIsAudit("0");
-               }else {
-                e.setIsAudit("1");
-               }
             });
         }
 
-        workOrderPagePage.getRecords().forEach(e->{
-            if(e.getPeasantHouseholdNo() != null) {
-                e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
-            }
-        });
-
         return ResponseHelper.buildResponse(workOrderPagePage);
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/wgpageList")
     @ApiOperation(httpMethod = "GET",value = "无分页查询",  notes = "无分页查询")
@@ -241,6 +251,16 @@ public class WorkOrderController extends BaseController {
         workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
         workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
         List<WorkOrderPage>  list=workOrderMapper.queryForwgpage(workOrder);
+
+        if(list != null && list.size() > 0) {
+            list.forEach(e -> {
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                }
+            });
+
+        }
+
         return ResponseHelper.buildResponse(list);
     }
 
@@ -327,7 +347,9 @@ public class WorkOrderController extends BaseController {
     @ApiOperation(httpMethod = "POST",value = "更新详情信息",   notes = "更新详情信息")
     @PostMapping(value = "/updateDetail")
     public ResponseModel updateDetail(@RequestBody PowerStationEngineeringInfoAllDto powerStationEngineeringInfoAllDto) {
-         workOrderServiceImpl.updateDetail(powerStationEngineeringInfoAllDto,getUserId());
+        String realName = getSelectedOrgInfo().getUserModel().getRealName();
+
+        workOrderServiceImpl.updateDetail(powerStationEngineeringInfoAllDto,realName);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -356,8 +378,8 @@ public class WorkOrderController extends BaseController {
     @PostMapping(value = "/addRectification")
     public ResponseModel addRectification( @RequestBody HygfRectificationOrder hygfReplenishment) {
 
-        workOrderServiceImpl.addRectification(hygfReplenishment);
-        return ResponseHelper.buildResponse(null);
+
+        return ResponseHelper.buildResponse( workOrderServiceImpl.addRectification(hygfReplenishment));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckAuditing;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckAuditingMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceCheckAuditingService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckAuditingDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 并网审核表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Service
+public class AcceptanceCheckAuditingServiceImpl extends BaseService<AcceptanceCheckAuditingDto,AcceptanceCheckAuditing,AcceptanceCheckAuditingMapper> implements IAcceptanceCheckAuditingService {
+    /**
+     * 分页查询
+     */
+    public Page<AcceptanceCheckAuditingDto> queryForAcceptanceCheckAuditingPage(Page<AcceptanceCheckAuditingDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<AcceptanceCheckAuditingDto> queryForAcceptanceCheckAuditingList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/BasicGridAuditingServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAuditing;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAuditingMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAuditingService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAuditingDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 并网审核表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Service
+public class BasicGridAuditingServiceImpl extends BaseService<BasicGridAuditingDto,BasicGridAuditing,BasicGridAuditingMapper> implements IBasicGridAuditingService {
+    /**
+     * 分页查询
+     */
+    public Page<BasicGridAuditingDto> queryForBasicGridAuditingPage(Page<BasicGridAuditingDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<BasicGridAuditingDto> queryForBasicGridAuditingList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/BasicGridRecordServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridRecord;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridRecordMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridRecordService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 并网验收节点服务实现类
+ *
+ * @author system_generator
+ * @date 2024-08-21
+ */
+@Service
+public class BasicGridRecordServiceImpl extends BaseService<BasicGridRecordDto,BasicGridRecord,BasicGridRecordMapper> implements IBasicGridRecordService {
+    /**
+     * 分页查询
+     */
+    public Page<BasicGridRecordDto> queryForBasicGridRecordPage(Page<BasicGridRecordDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<BasicGridRecordDto> queryForBasicGridRecordList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/ConstructionAcceptanceRecordsServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.ConstructionAcceptanceRecords;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.ConstructionAcceptanceRecordsMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IConstructionAcceptanceRecordsService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ConstructionAcceptanceRecordsDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 并网操作日志服务实现类
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@Service
+public class ConstructionAcceptanceRecordsServiceImpl extends BaseService<ConstructionAcceptanceRecordsDto,ConstructionAcceptanceRecords,ConstructionAcceptanceRecordsMapper> implements IConstructionAcceptanceRecordsService {
+    /**
+     * 分页查询
+     */
+    public Page<ConstructionAcceptanceRecordsDto> queryForConstructionAcceptanceRecordsPage(Page<ConstructionAcceptanceRecordsDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<ConstructionAcceptanceRecordsDto> queryForConstructionAcceptanceRecordsList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/ConstructionGirdRecordsServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.ConstructionGirdRecords;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.ConstructionGirdRecordsMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IConstructionGirdRecordsService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ConstructionGirdRecordsDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 并网操作日志服务实现类
+ *
+ * @author system_generator
+ * @date 2024-09-02
+ */
+@Service
+public class ConstructionGirdRecordsServiceImpl extends BaseService<ConstructionGirdRecordsDto,ConstructionGirdRecords,ConstructionGirdRecordsMapper> implements IConstructionGirdRecordsService {
+    /**
+     * 分页查询
+     */
+    public Page<ConstructionGirdRecordsDto> queryForConstructionGirdRecordsPage(Page<ConstructionGirdRecordsDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<ConstructionGirdRecordsDto> queryForConstructionGirdRecordsList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/FinancingInfoServiceImpl.java

@@ -29,6 +29,7 @@ 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.mapper.FinancingInfoMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
 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;
@@ -71,6 +72,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     @Autowired
     private FinancingRectificationOrderServiceImpl financingRectificationOrderService;
     @Autowired
+    private HouseholdContractMapper householdContractMapper;
+    @Autowired
     private CommonServiceImpl commonService;
 
     @Resource(type = RedisLockUtil.class)
@@ -100,6 +103,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         PageHelper.startPage((int) page.getCurrent(), (int) page.getSize());
         List<Map<String, Object>> list = financingInfoMapper.getStationFinancingInfoList(params, amosOrgCodes);
         list.forEach(e -> {
+            e.put("scale", householdContractMapper.getHygfCommercialScale((String) e.get("peasantHouseholdNo")));
+
             if (null != e.get("instanceId") && e.get("instanceId").toString().contains(",")) {
                 String[] instanceIds = e.get("instanceId").toString().split(",");
                 e.put("instanceId", instanceIds[0]);

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

@@ -137,7 +137,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         if (da.getRegionalAddress() == null || da.getRegionalAddress().isEmpty()) {
             throw new BadRequest("区域公司省市区为空, 请设置省市区");
         }
-        String code = NumberUtil.getCode(CodeEnum.勘察.getCode(), da.getCompanyCode(), da.getRegionalAddress());
+        String code = NumberUtil.getCode(CodeEnum.合同.getCode(), da.getCompanyCode(), da.getRegionalAddress());
         return code;
     }
 

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

@@ -295,7 +295,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 				Map<String, String> data = JSONObject.parseObject(decode, Map.class);
 				log.debug("解密后参数:{}", data);// 进行自己的处理,此处默认处理成功，返回通知方成功,return_code=0
 				// 其中certNo、custName、newPayAcc字段进行了base64编码，可以调用示例代码中的base64Decode进行解码
-				String custName = base64Decode(data.get("custName"));
+				//String custName = base64Decode(data.get("custName"));
 				String certNo = base64Decode(data.get("certNo"));
 				String newPayAcc = base64Decode(data.get("newPayAcc"));
 				String outUserId = data.get("outUserId");
@@ -309,13 +309,6 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 				if (hygfIcbcRecord == null) {
 					hygfIcbcRecord = new HygfIcbcRecord();
 				}
-				hygfIcbcRecord.setCustName(custName);
-				hygfIcbcRecord.setIdCard(certNo);
-
-				hygfIcbcRequest.setPhase("组装");
-				hygfIcbcRequest.setException(data.get("custName") + " -> " + custName);
-				hygfIcbcRequestMapper.updateById(hygfIcbcRequest);
-
 				PeasantHousehold peasantHousehold = peasantHouseholdService.lambdaQuery()
 						.select(PeasantHousehold::getTelephone).eq(PeasantHousehold::getAmosUserId, outUserId)
 						.last("limit 1").one();
@@ -324,6 +317,12 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 				hygfIcbcRecord.setProjectId(projectId);
 				hygfIcbcRecord.setOpenAccountStatus(openAccoutSucceedFlag);
 				hygfIcbcRecord.setSignEntrsutPrtlStatus(signEntrsutPrtlSucceedFlag);
+				hygfIcbcRecord.setCustName(peasantHousehold.getOwnersName());
+				hygfIcbcRecord.setIdCard(certNo);
+				hygfIcbcRequest.setPhase("组装");
+				hygfIcbcRequest.setException(data.get("custName") + " -> " + peasantHousehold.getOwnersName());
+				hygfIcbcRequestMapper.updateById(hygfIcbcRequest);
+				
 				if (hygfIcbcWalletInfo != null) {
 					hygfIcbcRecord.setCustName(hygfIcbcWalletInfo.getCustName());
 					hygfIcbcRecord.setIdCard(hygfIcbcWalletInfo.getCertNo());
@@ -476,11 +475,11 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 			hygfIcbcRecordDTO.setProtocolStatusName(
 					IcbcEnum.ProtocolStatus.getNameByCode(hygfIcbcRecordDTO.getProtocolStatus(), ""));
 			List<PeasantHousehold> peasantHouseholdList = PeasantHouseholdMap.get(hygfIcbcRecordDTO.getAmosUserId());
-			if (IcbcEnum.OpenAccountState.FAIL.getCode().equals(hygfIcbcRecordDTO.getOpenAccountStatus())) {
-				hygfIcbcRecordDTO.setCustName(peasantHouseholds.get(0).getOwnersName());
-				hygfIcbcRecordDTO.setIdCard(peasantHouseholds.get(0).getIdCard());
-				hygfIcbcRecordDTO.setPhone(peasantHouseholds.get(0).getTelephone());
-			}
+//			if (IcbcEnum.OpenAccountState.FAIL.getCode().equals(hygfIcbcRecordDTO.getOpenAccountStatus())) {
+//				hygfIcbcRecordDTO.setCustName(peasantHouseholds.get(0).getOwnersName());
+//				hygfIcbcRecordDTO.setIdCard(peasantHouseholds.get(0).getIdCard());
+//				hygfIcbcRecordDTO.setPhone(peasantHouseholds.get(0).getTelephone());
+//			}
 			if (!CollectionUtils.isEmpty(peasantHouseholdList)) {
 				// 根据区域经销商名称去重
 				List<HygfIcbcRecordDTO.IcbcPeasantHousehold> icbcPeasantHouseholds = Bean.toModels(peasantHouseholdList,

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

@@ -33,7 +33,7 @@ public class HygfRectificationOrderServiceImpl extends BaseService<HygfRectifica
     /**
      * 分页查询
      */
-    public Page<HygfRectificationOrder> queryForHygfRectificationOrderPage(int current, int size, List<String> rectificationSource, String peasantHouseholeId) {
+    public Page<HygfRectificationOrder> queryForHygfRectificationOrderPage(int current, int size, List<String> rectificationSource, String peasantHouseholeId,List<String> status) {
 //        PageHelper.startPage(current, size);
 //        List<HygfRectificationOrder> list = this.getBaseMapper().selectOrderPage(rectificationSource,peasantHouseholeId);
 //        PageInfo<HygfRectificationOrder> infos = new PageInfo<>(list);
@@ -48,6 +48,9 @@ public class HygfRectificationOrderServiceImpl extends BaseService<HygfRectifica
         if (rectificationSource != null && !rectificationSource.isEmpty()) {
             wrapper.in(HygfRectificationOrder::getRectificationSource, rectificationSource);
         }
+        if (status != null && !status.isEmpty()) {
+            wrapper.in(HygfRectificationOrder::getRectificationStatus, status);
+        }
 
         // 创建 Page 对象并设置分页参数
         Page<HygfRectificationOrder> page = new Page<>(current, size);

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

@@ -133,7 +133,12 @@ public class SurveyInformationServiceImpl
 	private RedisLockUtil redisLockUtil;
 	@Autowired
 	WorkflowImpl workflow;
-
+	@Autowired
+	HygfRectificationOrderServiceImpl rectificationOrderService;
+	private static final String PROCESSKEY = "ProcessEngineering";
+	
+	@Autowired
+	AcceptanceCheckMapper acceptanceCheckMapper;
 	/**
 	 * 分页查询
 	 */
@@ -629,9 +634,21 @@ public class SurveyInformationServiceImpl
 			up2.eq(PowerStationConstructionData::getWorkOrderPowerStationId, workOrderPowerStationId);
 			PowerStationConstructionData powerStationConstructionData = powerStationConstructionDataMapper
 					.selectOne(up2);
+			
+			//增加整改单数据
+			List<HygfRectificationOrder> hygfRectificationOrders = rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), PROCESSKEY);
+			if (CollectionUtil.isNotEmpty(hygfRectificationOrders)){
+				List<HygfRectificationOrder>  areaOrders = hygfRectificationOrders.stream().filter(e -> e.getRectificationSource().equals("area")).collect(Collectors.toList());
+				List<HygfRectificationOrder>  engineeringOrders = hygfRectificationOrders.stream().filter(e -> e.getRectificationSource().equals("engineering")).collect(Collectors.toList());
+				List<HygfRectificationOrder>  designOrders = hygfRectificationOrders.stream().filter(e -> e.getRectificationSource().equals("design")).collect(Collectors.toList());
+				powerStationConstructionData.setAreaOrders(areaOrders.size()>0?areaOrders:null);
+				powerStationConstructionData.setEngineeringOrders(engineeringOrders.size()>0?engineeringOrders:null);
+				powerStationConstructionData.setDesignOrders(designOrders.size()>0?designOrders:null);
+			}
+			
+			
 
 			// 工程信息
-
 			LambdaQueryWrapper<PowerStationEngineeringInfo> up3 = new LambdaQueryWrapper();
 			up3.eq(PowerStationEngineeringInfo::getWorkOrderId, workOrderId);
 			up3.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId, workOrderPowerStationId);
@@ -658,6 +675,18 @@ public class SurveyInformationServiceImpl
 			up4.eq(HygfOnGrid::getWorkOrderId, workOrderId);
 			up4.eq(HygfOnGrid::getWorkOrderPowerStationId, workOrderPowerStationId);
 			HygfOnGrid hygfOnGrid = hygfOnGridMapper.selectOne(up4);
+			
+			//增加整改单数据
+			List<HygfRectificationOrder> hygfRectificationOrderList= rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), RectificationOrderEnum.并网.getName());
+			if (CollectionUtil.isNotEmpty(hygfRectificationOrderList)){
+				List<HygfRectificationOrder>  areaOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("bw-area")).collect(Collectors.toList());
+				List<HygfRectificationOrder>  engineeringOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("bw-engineering")).collect(Collectors.toList());
+				List<HygfRectificationOrder>  designOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("bw-design")).collect(Collectors.toList());
+				hygfOnGrid.setAreaOrders(areaOrders.size()>0?areaOrders:null);
+				hygfOnGrid.setEngineeringOrders(engineeringOrders.size()>0?engineeringOrders:null);
+				hygfOnGrid.setDesignOrders(designOrders.size()>0?designOrders:null);
+			}
+			
 			surveyInfoAllDto.setHygfOnGrid(hygfOnGrid != null ? hygfOnGrid : new HygfOnGrid());
 			surveyInfoAllDto
 					.setPowerStationConstructionData(powerStationConstructionData != null ? powerStationConstructionData
@@ -666,12 +695,32 @@ public class SurveyInformationServiceImpl
 					.setPowerStationEngineeringInfo(powerStationEngineeringInfo != null ? powerStationEngineeringInfo
 							: new PowerStationEngineeringInfo());
 			surveyInfoAllDto.setWorkOrder(workOrder != null ? workOrder : new WorkOrder());
+			
 		} else {
 			surveyInfoAllDto.setHygfOnGrid(new HygfOnGrid());
 			surveyInfoAllDto.setPowerStationConstructionData(new PowerStationConstructionData());
 			surveyInfoAllDto.setPowerStationEngineeringInfo(new PowerStationEngineeringInfo());
 			surveyInfoAllDto.setWorkOrder(new WorkOrder());
 		}
+		
+		//验收信息
+		LambdaQueryWrapper<AcceptanceCheck> quv1 = new LambdaQueryWrapper<AcceptanceCheck>();
+		quv1.eq(AcceptanceCheck::getPeasantHouseholdId, peasantHouseholdId);
+		AcceptanceCheck acceptanceCheck = acceptanceCheckMapper.selectOne(quv1);
+		
+		//增加整改单数据
+		List<HygfRectificationOrder> hygfRectificationOrderListYs= rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), RectificationOrderEnum.验收.getName());
+		if (CollectionUtil.isNotEmpty(hygfRectificationOrderListYs)){
+			List<HygfRectificationOrder>  areaOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-area")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  financeOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-tourong")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  legalOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-fawu")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  propertyOrders = hygfRectificationOrderListYs.stream().filter(e -> e.getRectificationSource().equals("ys-zichan")).collect(Collectors.toList());
+			acceptanceCheck.setAreaOrders(areaOrders.size()>0?areaOrders:null);
+			acceptanceCheck.setFinanceOrders(financeOrders.size()>0?financeOrders:null);
+			acceptanceCheck.setLegalOrders(legalOrders.size()>0?legalOrders:null);
+			acceptanceCheck.setPropertyOrders(propertyOrders.size()>0?propertyOrders:null);
+		}
+		surveyInfoAllDto.setAcceptanceCheck(acceptanceCheck);
 
 		if (!StringUtils.isEmpty(processInstanceId)) {
 			try {
@@ -705,6 +754,8 @@ public class SurveyInformationServiceImpl
 				e.printStackTrace();
 			}
 		}
+		
+		
 		return surveyInfoAllDto;
 	}
 

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
+    HouseholdContractMapper householdContractMapper;
+    @Autowired
     CommerceInfoMapper commerceInfoMapper;
     @Autowired
     RegionalCompaniesMapper regionalCompaniesMapper;
@@ -1079,6 +1081,15 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                                                                   String ids){
         PageHelper.startPage(pageNum, pageSize);
         List<PeasantHousehold>  list=peasantHouseholdMapper.selectPeasantHouseholdListsg(unitInfoCode,regionalCompaniesSeq,peasantHouseholdNo,ownersName,ids);
+
+        if(list != null && list.size() > 0) {
+            list.forEach(e -> {
+                if(e.getPeasantHouseholdNo() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+                }
+            });
+        }
+
         PageInfo<PeasantHousehold> page = new PageInfo(list);
         Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
         pagenew.setCurrent(pageNum);

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

@@ -112,4 +112,34 @@ public class WorkFlowService {
         });
         return workflowResultDtoList;
     }
+
+    public List<WorkflowResultDto> buildWorkFlowInfos(List<ProcessTaskDTO> processTaskDTOS) {
+        List<WorkflowResultDto> workflowResultDtoList = new ArrayList<>();
+        processTaskDTOS.forEach(item -> {
+            if (null != item.getProcessInstance()){
+            }
+            //   workflowResultDto.setNextExecutorIds(String.join(",", item.getCandidateGroups()));
+            if (!CollectionUtils.isEmpty(item.getNextTask())) {
+
+                item.getNextTask().forEach(actTaskDTO->{
+                    WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+                    workflowResultDto.setInstanceId(actTaskDTO.getProcessInstanceId());
+                    workflowResultDto.setTaskName(actTaskDTO.getName());
+                    workflowResultDto.setNextTaskId(actTaskDTO.getId());
+                    workflowResultDto.setNextNodeKey(actTaskDTO.getKey()); // 工作流字段还未添加
+                    workflowResultDto.setNextNodeName(actTaskDTO.getName());
+                    List<String> nextGroups = item.getNextCandidateGroups().get(actTaskDTO.getId());
+                    String join = String.join(",", nextGroups);
+                    workflowResultDto.setNextExecutorIds(join);
+                    List<String> nextUserIds = item.getNextTaskExecutor().get(actTaskDTO.getId()).stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
+                    String nextUserIdsString = String.join(",", nextUserIds);
+                    workflowResultDto.setNextExecuteUserIds(nextUserIdsString);
+                    workflowResultDtoList.add(workflowResultDto);
+                });
+
+            }
+
+        });
+        return workflowResultDtoList;
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -2,9 +2,9 @@ exception.debug=true
 ## DB properties:
 spring.datasource.dynamic.primary= mysql-service
 spring.datasource.mysql-service.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.mysql-service.jdbc-url=jdbc:mysql://47.92.234.253:13306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.mysql-service.username=root
-spring.datasource.mysql-service.password=Yeejoin@2020
+spring.datasource.mysql-service.password=Yeejoin_1234
 spring.datasource.mysql-service.type=com.zaxxer.hikari.HikariDataSource
 #最小连接
 spring.datasource.mysql-service.minimum-idle: 5
@@ -93,7 +93,7 @@ emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://47.92.234.253:1883
 emqx.user-name=admin
-emqx.password=public
+emqx.password=Yeejoin@1234
 emqx.max-inflight=1000
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev1.properties

@@ -249,6 +249,7 @@ spring.elasticsearch.rest.password=123456
 spring.elasticsearch.rest.read-timeout=30000
 
 ## 聚富通工行 测试环境配置
+## 聚富通工行 测试环境配置
 hygf.icbc.callbackUrl=https://yth.yunqingtech.com/hygf/icbc/notify
 hygf.icbc.appId=11000000000000009254
 hygf.icbc.corpNo=10000000000000088011
@@ -261,6 +262,7 @@ hygf.icbc.apigwPublicKey=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwFgHD4kzEVPdOj03
 hygf.icbc.outVendorId=071301
 hygf.icbc.projectId=PJ14001401B000160171
 
+
 ## 聚富通工行 生产环境配置
 #hygf.icbc.appId=11000000000000028870
 #hygf.icbc.corpNo=020240710000001169

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

-spring.application.name=AMOS-HYGF-YY
+spring.application.name=AMOS-HYGF-CZ
 server.servlet.context-path=/hygf
 server.port=33330
 server.uri-encoding=UTF-8
-spring.profiles.active=kingbase8
+spring.profiles.active=dev
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
@@ -31,7 +31,7 @@ spring.liquibase.enabled=true
 
 ## eureka properties:
 eureka.instance.prefer-ip-address=true
-eureka.instance.ip-address=172.26.190.244
+eureka.instance.ip-address=172.16.3.6
 eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.health-check-url-path=/actuator/health
 eureka.instance.lease-expiration-duration-in-seconds=10
@@ -75,10 +75,15 @@ dealer.amosDealerId=1767820997374775298
 admin.engineering.roleId=1702512052154687489
 admin.area.roleId=1822904567478620161
 admin.design.roleId=1702511991735738370
+admin.tourong.roleId=1702511733832179714
+admin.fawu.roleId=1702511782167339010
+admin.zichan.roleId=1827897297053159426
 admin.deveEngineering.roleId=1702550832882413570
+admin.delerAdmin.roleId=1702512164058718210
+admin.delerKaId.roleId=1702551022574006274
 
 
-
+exception.debug=true
 feign.okhttp.enabled= true
 
-workflow.feign.name=AMOS-API-WORKFLOW
+workflow.feign.name=AMOS-API-WORKFLOW-CZ

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-dev1.properties

@@ -65,14 +65,14 @@ emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
 emqx.broker=tcp://10.20.1.210:2883
 emqx.user-name=admin
-emqx.password=public
+emqx.password=Yeejoin@2020
 mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000
 emqx.max-inflight=1000
 emqx.client-user-name=admin
-emqx.client-password=public
+emqx.client-password=Yeejoin@2020
 
 ## influxDB
 #spring.influx.url= http://172.16.3.155:18186

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/application-kingbase8.properties

@@ -70,7 +70,7 @@ emqx.client-user-name=
 emqx.client-password=
 emqx.broker=tcp://10.20.1.210:2883
 emqx.user-name=admin
-emqx.password=public
+emqx.password=Yeejoin@2020
 mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt

pom.xml

@@ -35,6 +35,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
         </dependency>