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

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

@@ -666,8 +666,8 @@ public class DateUtils {
         System.out.println(dateFormat(minDateOfMonth(dateParse("2016-03-31", null)), null));*/
 
 
-        List<String> beforeCurrentMonth = getBeforeCurrentMonth(3, true);
-        System.out.println(beforeCurrentMonth);
+
+        System.out.println(getDateNowString());
     }
 
     /**

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

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum RectificationOrderEnum {
+
+
+    施工("ProcessEngineering", "area,design,engineering");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    public static RectificationOrderEnum getNodeByCode(String code) {
+        RectificationOrderEnum dealerReviewEnum = null;
+        for(RectificationOrderEnum type: RectificationOrderEnum.values()) {
+            if (type.getCode().equals(code)) {
+                dealerReviewEnum = type;
+                break;
+            }
+        }
+        return dealerReviewEnum;
+    }
+
+    public static RectificationOrderEnum getNodeByName(String name) {
+        RectificationOrderEnum dealerReviewEnum = null;
+        for(RectificationOrderEnum type: RectificationOrderEnum.values()) {
+            if (type.getName().equals(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/Enum/WorkOrderEnum.java

@@ -24,9 +24,21 @@ public enum WorkOrderEnum {
     审核中("审核中", "审核中"),
 
     待审核("待审核", "待审核"),
+    片区运营待审核("片区运营待审核", "area"),
+    设计待审核("设计待审核", "design"),
+    工程待审核("工程待审核", "engineering"),
 
+    待提交("待提交", "待提交"),
+
+    整改待审核("整改待审核", "整改待审核"),
+    已完成("已完成", "已完成"),
+    已作废("已作废", "已作废"),
+    待整改("待整改", "待整改"),
+
+    整改中("整改中", "整改中"),
 
     未通过("未通过", "未通过"),
+    全部节点("全部节点", "all"),
 
     已完工("已完工", "已完工");
 

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 审核单
+ *
+ * @author system_generator
+ * @date 2024-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "HygfRectificationOrderDto", description = "审核单")
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class HygfRectificationOrderDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "农户姓名")
+    private String peasantHouseholeName;
+
+    @ApiModelProperty(value = "农户编号")
+    private String peasantHouseholeCode;
+
+    @ApiModelProperty(value = "农户场站id")
+    private String peasantHouseholeId;
+
+    @ApiModelProperty(value = "整改项")
+    private List<Object> rectificationIdea;
+
+    @ApiModelProperty(value = "农户项目地址")
+    private String projectAddressName;
+
+    @ApiModelProperty(value = "整改附件")
+    private List<Object> rectificationFile;
+
+    @ApiModelProperty(value = "整改结果附件")
+    private List<Object> resultFile;
+
+    @ApiModelProperty(value = "整改结果")
+    private List<Object> rectificationResult;
+
+
+    @ApiModelProperty(value = "审核意见")
+    private String auditIdea;
+
+    @ApiModelProperty(value = "审核结果")
+    private String auditResult;
+
+
+    /**
+     * 整改类型
+     */
+    private String rectificationType;
+
+
+    /**
+     * 整改来源
+     */
+    private String rectificationSource;
+
+
+    /**
+     * 整改历史意见
+     */
+    private List<Object> rectificationHistory;
+    @ApiModelProperty(value = "整改结果-施工信息展示用")
+    private String rectificationResultWeb;
+    @ApiModelProperty(value = "整改历史意见-施工信息展示用")
+    private String rectificationHistoryWeb;
+    @ApiModelProperty(value = "整改项-施工信息展示用")
+    private String rectificationIdeaWeb;
+
+    /**
+     * 负责人
+     */
+    private String projectRegionManager;
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfWorkOrderStationAuditingDto.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-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="HygfWorkOrderStationAuditingDto", description="施工完工审核表")
+public class HygfWorkOrderStationAuditingDto  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 workOrderPowerStationId;
+
+    @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/RectificationOrderAuditingDto.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-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="RectificationOrderAuditingDto", description="施工完工审核表")
+public class RectificationOrderAuditingDto  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 rectificationOrder;
+
+    @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/WorkOrderPage.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @description:
@@ -47,6 +48,8 @@ public class WorkOrderPage {
 
     @ApiModelProperty(value = "派工电站id")
     protected Long workOrderPowerStationId;
+    @ApiModelProperty(value = "派工电站节点标识")
+    protected String workOrderPowerStationNode;
 
     @ApiModelProperty(value = "派工单id")
     protected String workOrderId;
@@ -58,9 +61,26 @@ public class WorkOrderPage {
     @ApiModelProperty(value = "平台经销商单位id")
     private Long amosDealerId;
 
-    private String  type ;
-
+    private String  type;
+    @ApiModelProperty(value = "片区审核")
+    private String  powerStationAreaStatus ;
+    @ApiModelProperty(value = "设计审核")
+    private String  powerStationDesignStatus ;
+    @ApiModelProperty(value = "工程审核")
+    private String  powerStationEngineeringStatus ;
+    @ApiModelProperty(value = "判断是否有进行中的整改单数量")
+    private Long  rectificationNum ;
+    @ApiModelProperty(value = "最后一条作废整改单id")
+    private Long  rollbackOrderId ;
     int current;
     int size;
-
+    @ApiModelProperty(value = "数据过滤标识")
+    private List<String> workOrderPowerStationNodes ;
+    @ApiModelProperty(value = "判断是否可以审核,默认不可以")
+    private String  isAudit ;
+
+    @ApiModelProperty(value = "历史审核意见")
+    private String  auditIdea ;
+    @ApiModelProperty(value = "实例id")
+    private String  instanceId ;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 审核单
+ *
+ * @author system_generator
+ * @date 2024-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value="hygf_rectification_order",autoResultMap = true)
+public class HygfRectificationOrder extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 农户姓名
+     */
+	@TableField("peasant_househole_name")
+    private String peasantHouseholeName;
+
+    /**
+     * 农户编号
+     */
+	@TableField("peasant_househole_code")
+    private String peasantHouseholeCode;
+
+    /**
+     * 农户编号
+     */
+    @TableField("project_address_name")
+    private String projectAddressName;
+    /**
+     * 农户场站id
+     */
+	@TableField("peasant_househole_id")
+    private Long peasantHouseholeId;
+
+    /**
+     * 整改项
+     */
+	@TableField(value = "rectification_idea", typeHandler = FastjsonTypeHandler.class)
+    private List<Object>  rectificationIdea;
+
+    /**
+     * 整改附件
+     */
+	@TableField(value = "rectification_file", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> rectificationFile;
+
+    /**
+     * 整改结果附件
+     */
+	@TableField(value = "result_file", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> resultFile;
+
+    /**
+     * 整改结果
+     */
+	@TableField(value ="rectification_result", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> rectificationResult;
+
+    /**
+     * 审核意见
+     */
+	@TableField("audit_idea")
+    private String auditIdea;
+
+    /**
+     * 审核结果
+     */
+	@TableField("audit_result")
+    private String auditResult;
+
+
+    /**
+     * 整改类型
+     */
+    @TableField("rectification_type")
+    private String rectificationType;
+
+
+    /**
+     * 整改来源
+     */
+    @TableField("rectification_source")
+    private String rectificationSource;
+
+
+    /**
+     * 整改历史意见
+     */
+    @TableField(value = "rectification_history", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> rectificationHistory;
+
+    /**
+     * 整改单状态
+     */
+    @TableField("rectification_status")
+    private String rectificationStatus;
+
+
+    /**
+     * 是否提交 0 提交 1 暂存
+     */
+    @TableField(exist = false)
+    private String addorSubmit;
+
+
+    /**
+     * 工程负责人
+     */
+    @TableField("project_region_manger")
+    private String projectRegionManager;
+
+
+    /**
+     * 是否提交 0 提交 1 暂存
+     */
+    @TableField(exist = false)
+    private String isAudit;
+
+    @TableField(exist = false)
+    private String rectificationResultWeb;
+    @TableField(exist = false)
+    private String rectificationHistoryWeb;
+    @TableField(exist = false)
+    private String rectificationIdeaWeb;
+
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfWorkOrderStationAuditing.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-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_work_order_station_auditing")
+public class HygfWorkOrderStationAuditing 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("power_station_id")
+    private Long workOrderPowerStationId;
+
+    /**
+     *  待执行节点小程序路由
+     */
+	@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/PowerStationConstructionData.java

@@ -186,4 +186,22 @@ public class PowerStationConstructionData extends BaseEntity {
     @TableField(exist = false)
     private boolean commitFlow;
 
+
+
+    /**
+     * 片区整改单
+     */
+    @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/RectificationOrderAuditing.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-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("hygf_rectification_order_auditing")
+public class RectificationOrderAuditing 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("rectification_order")
+    private Long rectificationOrder;
+
+    /**
+     *  待执行节点小程序路由
+     */
+	@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/WorkOrderPowerStation.java

@@ -46,4 +46,29 @@ public class WorkOrderPowerStation extends BaseEntity {
 	@TableField("completion_audit_opinion")
     private String completionAuditOpinion;
 
+
+    /**
+     * 施工电站节点标识
+     */
+    @TableField("work_order_power_station_node")
+    private String workOrderPowerStationNode;
+
+
+    /**
+     * 电站施工状态 - 片区审核
+     */
+    @TableField("power_station_area_status")
+    private String powerStationAreaStatus;
+
+    /**
+     * 电站施工状态 - 设计审核
+     */
+    @TableField("power_station_design_status")
+    private String powerStationDesignStatus;
+
+    /**
+     * 电站施工状态 - 工程审核
+     */
+    @TableField("power_station_engineering_status")
+    private String powerStationEngineeringStatus;
 }

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 审核单 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-08-12
+ */
+public interface HygfRectificationOrderMapper extends BaseMapper<HygfRectificationOrder> {
+
+
+   List<HygfRectificationOrder> selectOrderPage(@Param("rectificationSource")List<String> rectificationSource, @Param("peasantHouseholeId")String peasantHouseholeId);
+
+}

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

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

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

+package com.yeejoin.amos.boot.module.hygf.api.mapper;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.RectificationOrderAuditing;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 施工完工审核表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-08-13
+ */
+public interface RectificationOrderAuditingMapper extends BaseMapper<RectificationOrderAuditing> {
+
+   void deleteByInstanceId(String instanceId);
+
+}

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

@@ -18,7 +18,7 @@ import java.util.List;
 public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
     @UserEmpower(field = {}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code"}, fieldConditions = {"eq", "in", }, relationship = "and")
     List<WorkOrder> selectWorkOrderList(@Param("dto") WorkOrder dto);
-    @UserEmpower(field = {}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code","hygf_peasant_household.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
+    @UserEmpower(field = {"region_code"}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code","hygf_peasant_household.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
     List<WorkOrderPage> queryForwgpage(@Param("dto") WorkOrderPage dto);
 
     String getRealNameByUserId(String userId);

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 审核单接口类
+ *
+ * @author system_generator
+ * @date 2024-08-12
+ */
+public interface IHygfRectificationOrderService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 施工完工审核表接口类
+ *
+ * @author system_generator
+ * @date 2024-08-08
+ */
+public interface IHygfWorkOrderStationAuditingService {
+
+}

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

+package com.yeejoin.amos.boot.module.hygf.api.service;
+
+
+/**
+ * 施工完工审核表接口类
+ *
+ * @author system_generator
+ * @date 2024-08-13
+ */
+public interface IRectificationOrderAuditingService {
+
+}

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

@@ -84,7 +84,7 @@
                 </if>
             </if>
         </where>
-        <if test="param.offset != null and param.offset != '' and param.limit != null and param.limit != ''">
+        <if test="param.offset != null and param.limit != null">
             LIMIT ${param.offset}, ${param.limit}
         </if>
         ORDER BY

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfRectificationOrderMapper.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.HygfRectificationOrderMapper">
+
+    <select id="selectOrderPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder">
+        select
+        sequence_nbr,
+        peasant_househole_name,
+        peasant_househole_code,
+        project_address_name,
+        peasant_househole_id,
+        rectification_idea,
+        rectification_file  as rectificationFile,
+        result_file  as resultFile,
+        rectification_result ,
+        audit_idea,
+        audit_result,
+        rectification_type,
+        rectification_source,
+        rectification_history,
+        rectification_status,
+        project_region_manger
+        from hygf_rectification_order where
+        peasant_househole_id = #{peasantHouseholeId}
+    <if test="rectificationSource != null and rectificationSource.size() > 0" >
+     and   rectification_source in
+        <foreach collection="rectificationSource" separator="," item="item" open="(" close=")" >
+            #{item}
+        </foreach>
+    </if>
+    </select>
+
+
+</mapper>

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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RectificationOrderAuditingMapper.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.RectificationOrderAuditingMapper">
+
+    <delete id="deleteByInstanceId">
+        DELETE FROM hygf_rectification_order_auditing where instance_id = #{instanceId}
+    </delete>
+</mapper>

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

@@ -60,62 +60,69 @@
         hygf_power_station_engineering_info.completion_date completionDate ,
         hygf_peasant_household.project_address_name projectAddressName,
         hygf_work_order_power_station.power_station_construction_status powerStationConstructionStatus,
-        hygf_work_order_power_station.sequence_nbr  workOrderPowerStationId
+        hygf_work_order_power_station.sequence_nbr  workOrderPowerStationId,
+        hygf_work_order_power_station.work_order_power_station_node  workOrderPowerStationNode,
+        hygf_work_order_power_station.power_station_area_status powerStationAreaStatus ,
+        hygf_work_order_power_station.power_station_design_status powerStationDesignStatus ,
+        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,
+        (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,
+        (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
         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
         LEFT JOIN hygf_power_station_engineering_info on hygf_power_station_engineering_info.work_order_power_station_id=hygf_work_order_power_station.sequence_nbr
-
         <where>
-
         <if test="dto.workOrderId!=null and dto.workOrderId!=''">
             and hygf_work_order.sequence_nbr = #{dto.workOrderId}
         </if>
         <if test=' dto.type!=null and dto.type == "1"'>
             and  hygf_work_order_power_station.power_station_construction_status in ('待登记','未通过','已完工','待审核')
         </if>
-
         <if test=' dto.type !=null and dto.type == "2"'>
-            and  hygf_work_order_power_station.power_station_construction_status in ('未通过','已完工','待审核')
+          and  hygf_work_order_power_station.power_station_construction_status IN ( '未通过', '已完工', '待审核', '待整改', '整改中','整改待审核' )
+        </if>
+        <if test=' dto.type !=null and dto.type == "3" and dto.workOrderPowerStationNodes  !=null'>
+                and ( hygf_work_order_power_station.work_order_power_station_node  is not null
+                or hygf_work_order_power_station.work_order_power_station_node = 'all'
+                or hygf_work_order_power_station.power_station_area_status  is not null
+                or hygf_work_order_power_station.power_station_design_status  is not null
+                or hygf_work_order_power_station.power_station_engineering_status  is not null
+            )
         </if>
-
         <if test="dto.projectAddressName!=null and dto.projectAddressName!=''">
             and hygf_peasant_household.project_address_name like concat(concat('%',#{dto.projectAddressName}),'%')
         </if>
-
         <if test="dto.peasantHouseholdNo!=null and dto.peasantHouseholdNo!=''">
             and hygf_peasant_household.peasant_household_no like concat(concat('%',#{dto.peasantHouseholdNo}),'%')
         </if>
-
         <if test="dto.ownersName!=null and dto.ownersName!=''">
             and hygf_peasant_household.owners_name like concat(concat('%',#{dto.ownersName}),'%')
         </if>
-
         <if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
             and hygf_work_order.work_order_num like concat(concat('%',#{dto.workOrderNum}),'%')
         </if>
-
         <if test="dto.projectRegionManager!=null and dto.projectRegionManager!=''">
             and hygf_work_order.project_region_manager like concat(concat('%',#{dto.projectRegionManager}),'%')
         </if>
         <if test="dto.powerStationConstructionStatus!=null and dto.powerStationConstructionStatus!=''">
             and hygf_work_order_power_station.power_station_construction_status=#{dto.powerStationConstructionStatus}
         </if>
-
         <if test="dto.amosDealerId!=null and dto.amosDealerId!=''">
             and hygf_work_order.amos_dealer_id = #{dto.amosDealerId}
         </if>
         <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
             and hygf_work_order.region_company_id =#{dto.regionCompanyId}
         </if>
+        </where>
         ORDER BY
-
-        hygf_work_order.rec_date DESC,
-
-        FIELD(hygf_work_order_power_station.power_station_construction_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工')
-
-    </where>
-
+        hygf_work_order_power_station.sequence_nbr DESC
     </select>
 
 </mapper>

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

+package com.yeejoin.amos.boot.module.hygf.biz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationOrderEnum;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfRectificationOrderServiceImpl;
+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.HygfRectificationOrderDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 审核单
+ *
+ * @author system_generator
+ * @date 2024-08-12
+ */
+@RestController
+@Api(tags = "审核单Api")
+@RequestMapping(value = "/hygf-rectification-order")
+public class HygfRectificationOrderController extends BaseController {
+
+    @Autowired
+    HygfRectificationOrderServiceImpl hygfRectificationOrderServiceImpl;
+	@Value("${admin.engineering.roleId}")
+	Long engineeringId;
+	@Value("${admin.area.roleId}")
+	Long areaId;
+	@Value("${admin.design.roleId}")
+	Long designId;
+	@Value("${admin.deveEngineering.roleId}")
+	Long deveEngineeringId;
+    /**
+     * 新增审核单
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增审核单", notes = "新增审核单")
+	public ResponseModel<HygfRectificationOrderDto> save(@RequestBody HygfRectificationOrderDto model) {
+	    model = hygfRectificationOrderServiceImpl.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<HygfRectificationOrderDto> updateBySequenceNbrHygfRectificationOrder(@RequestBody HygfRectificationOrderDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(hygfRectificationOrderServiceImpl.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(hygfRectificationOrderServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个审核单",  notes = "根据sequenceNbr查询单个审核单")
+	public ResponseModel<HygfRectificationOrder> selectOne(@PathVariable Long sequenceNbr) {
+
+	    return ResponseHelper.buildResponse(hygfRectificationOrderServiceImpl.getBaseMapper().selectById(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "审核单分页查询",  notes = "审核单分页查询")
+	public ResponseModel<Page<HygfRectificationOrder>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+                    (value = "size") int size, @RequestParam(value = "rectificationSource",required = false) String rectificationSource, @RequestParam(value = "peasantHouseholeId") String peasantHouseholeId) {
+
+		ReginParams reginParams = getSelectedOrgInfo();
+		List<String> workOrderPowerStationNodes = new ArrayList<>();
+//		workOrderPowerStationNodes.add(rectificationSource);
+		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
+			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
+			if (longs.contains(areaId) ) {
+				workOrderPowerStationNodes.add("area");
+			}
+			if (longs.contains(engineeringId) ) {
+				workOrderPowerStationNodes.add("engineering");
+			}
+			if (longs.contains(designId) ) {
+				workOrderPowerStationNodes.add("design");
+			}
+		}
+
+		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId);
+		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
+			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
+				page.getRecords().forEach(e->{
+					if (longs.contains(areaId) && e.getRectificationSource().equals("area")){
+						e.setIsAudit("0");
+					}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("engineering")){
+						e.setIsAudit("0");
+					}else if (longs.contains(designId) && e.getRectificationSource().equals("design")){
+						e.setIsAudit("0");
+					}else if (longs.contains(engineeringId)){
+						e.setIsAudit("0");
+					}else {
+						e.setIsAudit("1");
+					}
+				});
+		}
+
+	    return ResponseHelper.buildResponse(page);
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "审核单列表全部数据查询",   notes = "审核单列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<HygfRectificationOrder>> selectForList(@RequestParam(value = "peasantHouseholeId") String peasantHouseholeId,@RequestParam(value = "sourceType") String sourceType) {
+
+		return ResponseHelper.buildResponse(hygfRectificationOrderServiceImpl.selectForListBySource(peasantHouseholeId,sourceType));
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfWorkOrderStationAuditingController.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.HygfWorkOrderStationAuditingServiceImpl;
+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.HygfWorkOrderStationAuditingDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 施工完工审核表
+ *
+ * @author system_generator
+ * @date 2024-08-08
+ */
+@RestController
+@Api(tags = "施工完工审核表Api")
+@RequestMapping(value = "/hygf-work-order-station-auditing")
+public class HygfWorkOrderStationAuditingController extends BaseController {
+
+    @Autowired
+    HygfWorkOrderStationAuditingServiceImpl hygfWorkOrderStationAuditingServiceImpl;
+
+    /**
+     * 新增施工完工审核表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增施工完工审核表", notes = "新增施工完工审核表")
+	public ResponseModel<HygfWorkOrderStationAuditingDto> save(@RequestBody HygfWorkOrderStationAuditingDto model) {
+	    model = hygfWorkOrderStationAuditingServiceImpl.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<HygfWorkOrderStationAuditingDto> updateBySequenceNbrHygfWorkOrderStationAuditing(@RequestBody HygfWorkOrderStationAuditingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(hygfWorkOrderStationAuditingServiceImpl.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(hygfWorkOrderStationAuditingServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工完工审核表",  notes = "根据sequenceNbr查询单个施工完工审核表")
+	public ResponseModel<HygfWorkOrderStationAuditingDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(hygfWorkOrderStationAuditingServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "施工完工审核表分页查询",  notes = "施工完工审核表分页查询")
+	public ResponseModel<Page<HygfWorkOrderStationAuditingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<HygfWorkOrderStationAuditingDto> page = new Page<HygfWorkOrderStationAuditingDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(hygfWorkOrderStationAuditingServiceImpl.queryForHygfWorkOrderStationAuditingPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "施工完工审核表列表全部数据查询",   notes = "施工完工审核表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<HygfWorkOrderStationAuditingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(hygfWorkOrderStationAuditingServiceImpl.queryForHygfWorkOrderStationAuditingList());
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/RectificationOrderAuditingController.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.RectificationOrderAuditingServiceImpl;
+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.RectificationOrderAuditingDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 施工完工审核表
+ *
+ * @author system_generator
+ * @date 2024-08-13
+ */
+@RestController
+@Api(tags = "施工完工审核表Api")
+@RequestMapping(value = "/rectification-order-auditing")
+public class RectificationOrderAuditingController extends BaseController {
+
+    @Autowired
+    RectificationOrderAuditingServiceImpl rectificationOrderAuditingServiceImpl;
+
+    /**
+     * 新增施工完工审核表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增施工完工审核表", notes = "新增施工完工审核表")
+	public ResponseModel<RectificationOrderAuditingDto> save(@RequestBody RectificationOrderAuditingDto model) {
+	    model = rectificationOrderAuditingServiceImpl.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<RectificationOrderAuditingDto> updateBySequenceNbrRectificationOrderAuditing(@RequestBody RectificationOrderAuditingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(rectificationOrderAuditingServiceImpl.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(rectificationOrderAuditingServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个施工完工审核表",  notes = "根据sequenceNbr查询单个施工完工审核表")
+	public ResponseModel<RectificationOrderAuditingDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(rectificationOrderAuditingServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "施工完工审核表分页查询",  notes = "施工完工审核表分页查询")
+	public ResponseModel<Page<RectificationOrderAuditingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<RectificationOrderAuditingDto> page = new Page<RectificationOrderAuditingDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(rectificationOrderAuditingServiceImpl.queryForRectificationOrderAuditingPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "施工完工审核表列表全部数据查询",   notes = "施工完工审核表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<RectificationOrderAuditingDto>> selectForList() {
+	    return ResponseHelper.buildResponse(rectificationOrderAuditingServiceImpl.queryForRectificationOrderAuditingList());
+	}
+}

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

@@ -2,13 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
-import com.yeejoin.amos.boot.module.hygf.api.entity.ConstructionRecords;
-import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
-import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
-import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationConstructionDataMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.WorkOrderMapper;
@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.WorkOrderServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -24,6 +25,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +52,12 @@ public class WorkOrderController extends BaseController {
     PersonnelBusinessMapper personnelBusinessMapper;
     @Autowired
     PowerStationConstructionDataMapper powerStationConstructionDataMapper;
+    @Value("${admin.engineering.roleId}")
+    Long engineeringId;
+    @Value("${admin.area.roleId}")
+    Long areaId;
+    @Value("${admin.design.roleId}")
+    Long designId;
     /**
      * 新增施工派工工单
      *
@@ -157,14 +165,19 @@ public class WorkOrderController extends BaseController {
     @GetMapping(value = "/getWorkOrderHousehold")
     public ResponseModel<  Page<PeasantHousehold>  > getPeasantHouseholdData(
             @RequestParam(required=false) Long sequenceNbr,
+            @RequestParam(required=false) Integer current,
+            @RequestParam(required=false) Integer size,
             @RequestParam(required=false) String ownersName
     ) {
+        Page<PeasantHousehold> page = new Page<>();
+        PageHelper.startPage(current,size);
         List<PeasantHousehold> list=workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr,ownersName);
-
-        Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
-        pagenew.setRecords(list);
-        pagenew.setTotal(list.size());
-        return ResponseHelper.buildResponse(pagenew);
+        PageInfo<PeasantHousehold> pageInfo = new PageInfo<>(list);
+        page.setSize(pageInfo.getSize());
+        page.setCurrent(pageInfo.getPageNum());
+        page.setTotal(pageInfo.getTotal());
+        page.setRecords(list);
+        return ResponseHelper.buildResponse(page);
     }
 
 
@@ -172,8 +185,7 @@ public class WorkOrderController extends BaseController {
     @PostMapping (value = "/wgpage")
     @ApiOperation(httpMethod = "GET",value = "施工派工工单分页查询",  notes = "施工派工工单分页查询")
     @UserLimits
-    public ResponseModel<Page<WorkOrderPage>> queryForwgpage(
-                                                         @RequestBody WorkOrderPage  workOrder
+    public ResponseModel<Page<WorkOrderPage>> queryForwgpage(@RequestBody WorkOrderPage  workOrder
     ) {
 
 	     //当前登录人所属场站
@@ -181,8 +193,35 @@ public class WorkOrderController extends BaseController {
 //
 //        workOrder.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
 //        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
-
-        return ResponseHelper.buildResponse(workOrderServiceImpl.queryForwgpage(workOrder.getCurrent(),workOrder.getSize(), workOrder));
+        ReginParams reginParams = getSelectedOrgInfo();
+        List<String> workOrderPowerStationNodes = new ArrayList<>();
+        for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
+            List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
+            if (longs.contains(areaId)) {
+                workOrderPowerStationNodes.add("area");
+            }
+            if (longs.contains(engineeringId)) {
+                workOrderPowerStationNodes.add("engineering");
+            }
+            if (longs.contains(designId)) {
+                workOrderPowerStationNodes.add("design");
+            }
+        }
+        if (workOrder.getType().equals("3") && workOrderPowerStationNodes != null){
+            workOrder.setWorkOrderPowerStationNodes(workOrderPowerStationNodes);
+        }
+        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())){
+                e.setIsAudit("0");
+               }else {
+                e.setIsAudit("1");
+               }
+            });
+        }
+
+        return ResponseHelper.buildResponse(workOrderPagePage);
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/wgpageList")
@@ -291,6 +330,48 @@ public class WorkOrderController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST",value = "完工自审管理审核",   notes = "完工自审管理审核")
+    @PostMapping(value = "/completeAudit")
+    public ResponseModel completeAudit( @RequestBody  Map<String,String> kv) {
+        workOrderServiceImpl.completeAudit(kv);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "完工整改单下发",   notes = "完工整改单下发")
+    @PostMapping(value = "/addRectification")
+    public ResponseModel addRectification( @RequestBody HygfRectificationOrder hygfReplenishment) {
+
+        workOrderServiceImpl.addRectification(hygfReplenishment);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST",value = "完工整改单添加信息",   notes = "完工整改单添加信息")
+    @PostMapping(value = "/nextTaskExcute")
+    public ResponseModel nextTaskExcute( @RequestBody HygfRectificationOrder hygfReplenishment) {
 
+        workOrderServiceImpl.nextTaskExcute(hygfReplenishment);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST",value = "完工整改单审核",   notes = "完工整改单审核")
+    @PostMapping(value = "/nextTaskAduit")
+    public ResponseModel nextTaskAduit( @RequestBody HygfRectificationOrder hygfReplenishment) {
+
+        workOrderServiceImpl.nextTaskAduit(hygfReplenishment);
+        return ResponseHelper.buildResponse(null);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "PUT",value = "完工整改单作废",   notes = "完工整改单作废")
+    @PutMapping(value = "/rollback")
+    public ResponseModel rollback( @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+
+        workOrderServiceImpl.rollback(sequenceNbr);
+        return ResponseHelper.buildResponse(null);
+    }
 
 }

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

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationOrderEnum;
+import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingRectificationOrderDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfRectificationOrderMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IHygfRectificationOrderService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HygfRectificationOrderDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * 审核单服务实现类
+ *
+ * @author system_generator
+ * @date 2024-08-12
+ */
+@Service
+public class HygfRectificationOrderServiceImpl extends BaseService<HygfRectificationOrderDto,HygfRectificationOrder,HygfRectificationOrderMapper> implements IHygfRectificationOrderService {
+    /**
+     * 分页查询
+     */
+    public Page<HygfRectificationOrder> queryForHygfRectificationOrderPage(int current, int size, List<String> rectificationSource, String peasantHouseholeId) {
+//        PageHelper.startPage(current, size);
+//        List<HygfRectificationOrder> list = this.getBaseMapper().selectOrderPage(rectificationSource,peasantHouseholeId);
+//        PageInfo<HygfRectificationOrder> infos = new PageInfo<>(list);
+//        Page<HygfRectificationOrder> page = new Page<>();
+//        page.setRecords(list);
+//        page.setSize(infos.getSize());
+//        page.setCurrent(infos.getPageNum());
+//        page.setTotal(infos.getTotal());
+        // 创建 LambdaQueryWrapper 并添加查询条件
+        LambdaQueryWrapper<HygfRectificationOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HygfRectificationOrder::getPeasantHouseholeId, peasantHouseholeId);
+        if (rectificationSource != null && !rectificationSource.isEmpty()) {
+            wrapper.in(HygfRectificationOrder::getRectificationSource, rectificationSource);
+        }
+
+        // 创建 Page 对象并设置分页参数
+        Page<HygfRectificationOrder> page = new Page<>(current, size);
+        // 使用 service 的 page 方法执行分页查询
+        this.page(page, wrapper);
+        return page;
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<HygfRectificationOrderDto> queryForHygfRectificationOrderList()   {
+        return this.queryForList("" , false);
+    }
+
+    public List<HygfRectificationOrder> selectForListBySource(String peasantHouseholeId, String sourceType) {
+        //目前希望此接口公用 通过传递的枚举值来确定查询数据的范围
+        LambdaQueryWrapper<HygfRectificationOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HygfRectificationOrder::getPeasantHouseholeId,peasantHouseholeId);
+        wrapper.in(HygfRectificationOrder::getRectificationSource, Arrays.asList(RectificationOrderEnum.getNodeByName(sourceType).getCode().split(",")));
+        wrapper.orderByDesc(BaseEntity::getRecDate);
+        List<HygfRectificationOrder> hygfRectificationOrders = this.getBaseMapper().selectList(wrapper);
+        for (HygfRectificationOrder hygfRectificationOrder : hygfRectificationOrders) {
+            if (hygfRectificationOrder.getRectificationIdea() != null){
+                hygfRectificationOrder.setRectificationIdeaWeb(formatJsonListWithNumbers(hygfRectificationOrder.getRectificationIdea()));
+            }
+            if (hygfRectificationOrder.getRectificationHistory() != null){
+                hygfRectificationOrder.setRectificationHistoryWeb(formatJsonListWithNumbers(hygfRectificationOrder.getRectificationHistory()));
+            }
+            if (hygfRectificationOrder.getRectificationResult() != null){
+                hygfRectificationOrder.setRectificationResultWeb(formatJsonListWithNumbers(hygfRectificationOrder.getRectificationResult()));
+            }
+        }
+        return hygfRectificationOrders;
+    }
+
+
+    public static String formatListWithNumbers(List<String> items) {
+        return IntStream.range(0, items.size())
+                .mapToObj(index -> (index + 1) + ". " + items.get(index) + "\n")
+                .collect(Collectors.joining());
+    }
+
+
+    public static String formatJsonListWithNumbers(List<Object> items) {
+        return IntStream.range(0, items.size())
+                .mapToObj(index -> {
+                    JSONObject item = (JSONObject) items.get(index);
+                    String value = item.getString("value");
+                    return (index + 1) + ". " + value + "\n";
+                })
+                .collect(Collectors.joining());
+    }
+}
\ 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/HygfWorkOrderStationAuditingServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfWorkOrderStationAuditing;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfWorkOrderStationAuditingMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IHygfWorkOrderStationAuditingService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HygfWorkOrderStationAuditingDto;
+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-08
+ */
+@Service
+public class HygfWorkOrderStationAuditingServiceImpl extends BaseService<HygfWorkOrderStationAuditingDto,HygfWorkOrderStationAuditing,HygfWorkOrderStationAuditingMapper> implements IHygfWorkOrderStationAuditingService {
+    /**
+     * 分页查询
+     */
+    public Page<HygfWorkOrderStationAuditingDto> queryForHygfWorkOrderStationAuditingPage(Page<HygfWorkOrderStationAuditingDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<HygfWorkOrderStationAuditingDto> queryForHygfWorkOrderStationAuditingList()   {
+        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/RectificationOrderAuditingServiceImpl.java

+package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapBuilder;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HygfWorkOrderStationAuditingDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfWorkOrderStationAuditing;
+import com.yeejoin.amos.boot.module.hygf.api.entity.RectificationOrderAuditing;
+import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrderPowerStation;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.RectificationOrderAuditingMapper;
+import com.yeejoin.amos.boot.module.hygf.api.service.IRectificationOrderAuditingService;
+import com.yeejoin.amos.boot.module.hygf.api.dto.RectificationOrderAuditingDto;
+import com.yeejoin.amos.feign.workflow.model.*;
+import javafx.beans.binding.MapBinding;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
+import java.util.*;
+
+/**
+ * 施工完工审核表服务实现类
+ *
+ * @author system_generator
+ * @date 2024-08-13
+ */
+@Service
+public class RectificationOrderAuditingServiceImpl extends BaseService<RectificationOrderAuditingDto, RectificationOrderAuditing, RectificationOrderAuditingMapper> implements IRectificationOrderAuditingService {
+    @Autowired
+    HygfRectificationOrderServiceImpl rectificationOrderService;
+
+    @Autowired
+    private WorkFlowService workFlowService;
+
+    private static final String PROCESSKEY = "RectificationAudit";
+
+    /**
+     * 分页查询
+     */
+    public Page<RectificationOrderAuditingDto> queryForRectificationOrderAuditingPage(Page<RectificationOrderAuditingDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<RectificationOrderAuditingDto> queryForRectificationOrderAuditingList() {
+        return this.queryForList("", false);
+    }
+
+
+    public void addRectification(HygfRectificationOrder hygfRectificationOrder) {
+        //添加整改单
+        hygfRectificationOrder.setRectificationStatus(hygfRectificationOrder.getAddorSubmit().equals("1") ?
+                WorkOrderEnum.待提交.getCode() : WorkOrderEnum.待整改.getCode());
+        rectificationOrderService.saveOrUpdate(hygfRectificationOrder);
+
+
+        if (hygfRectificationOrder.getAddorSubmit().equals("0")) {
+            //开启工作流 并执行一步
+            ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+            List<ActWorkflowStartDTO> params = new ArrayList<>();
+            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            dto.setProcessDefinitionKey(PROCESSKEY);
+            dto.setBusinessKey(String.valueOf(new Date().getTime()));
+            dto.setCompleteFirstTask(true);
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("approvalStatus", "0");
+            dto.setVariables(map);
+            params.add(dto);
+            actWorkflowBatchDTO.setProcess(params);
+            List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
+            List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
+
+            WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+            RectificationOrderAuditingDto rectificationOrderAuditingDto = new RectificationOrderAuditingDto();
+            BeanUtils.copyProperties(workflowResultDto, rectificationOrderAuditingDto);
+            rectificationOrderAuditingDto.setRectificationOrder(hygfRectificationOrder.getSequenceNbr());
+            rectificationOrderAuditingDto.setPromoter(RequestContext.getExeUserId());
+            this.createWithModel(rectificationOrderAuditingDto);
+
+        }
+    }
+
+
+    //	工作流执行一步
+    public void wofkflowExcute(String instanceId, String approvalStatus, String comment) {
+        LambdaQueryWrapper<RectificationOrderAuditing> query = new LambdaQueryWrapper<>();
+        query.eq(RectificationOrderAuditing::getInstanceId, instanceId);
+        query.orderByDesc(BaseEntity::getRecDate);
+        query.last("limit 1");
+        RectificationOrderAuditing rectificationOrderAuditing = this.getBaseMapper().selectOne(query);
+
+        //组装信息
+        TaskResultDTO task = new TaskResultDTO();
+
+        task.setTaskId(rectificationOrderAuditing.getNextTaskId());
+        HashMap<String, Object> map = new HashMap<>();
+        RectificationOrderAuditingDto rectificationOrderAuditingDto = new RectificationOrderAuditingDto();
+        task.setResultCode("approvalStatus");
+        map.put("approvalStatus", approvalStatus);
+        task.setComment(comment == null ? "" : comment);
+        task.setVariable(map);
+        //执行流程
+        ProcessTaskDTO processTaskDTO = workFlowService.complete(rectificationOrderAuditing.getNextTaskId(), task);
+        List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
+        WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+        BeanUtils.copyProperties(workflowResultDto, rectificationOrderAuditingDto);
+        rectificationOrderAuditingDto.setRectificationOrder(rectificationOrderAuditing.getRectificationOrder());
+        rectificationOrderAuditingDto.setPromoter(rectificationOrderAuditing.getPromoter());
+        if (null == rectificationOrderAuditingDto.getInstanceId()) {
+            rectificationOrderAuditingDto.setInstanceId(rectificationOrderAuditing.getInstanceId());
+        }
+        this.createWithModel(rectificationOrderAuditingDto);
+    }
+
+
+    public void nextTaskExcute(HygfRectificationOrder hygfRectificationOrder) {
+        //添加整改单信息
+        rectificationOrderService.saveOrUpdate(hygfRectificationOrder);
+        LambdaQueryWrapper<RectificationOrderAuditing> query = new LambdaQueryWrapper<>();
+        query.eq(RectificationOrderAuditing::getRectificationOrder, hygfRectificationOrder.getSequenceNbr());
+        query.orderByDesc(BaseEntity::getRecDate);
+        query.last("limit 1");
+        RectificationOrderAuditing rectificationOrderAuditing = this.getBaseMapper().selectOne(query);
+
+        if (hygfRectificationOrder.getAddorSubmit().equals("0")) {
+            this.wofkflowExcute(rectificationOrderAuditing.getInstanceId(), "0", "填写整改单");
+        }
+    }
+
+    public void nextTaskAduit(HygfRectificationOrder hygfRectificationOrder) {
+        //添加整改单信息 若审核结果为不通过时候 添加历史审核意见 直接组装好格式 时间+审核意见
+        String auditResult = hygfRectificationOrder.getAuditResult();
+        if (hygfRectificationOrder.getAuditResult().equals("不通过")) {
+            if (StringUtils.isEmpty(hygfRectificationOrder.getAuditIdea())){
+                throw new  BadRequest("审核不通过时审核意见不可为空");
+            }
+            hygfRectificationOrder.setAuditIdea(null);
+            hygfRectificationOrder.setAuditResult(null);
+        }
+        rectificationOrderService.saveOrUpdate(hygfRectificationOrder);
+        LambdaQueryWrapper<RectificationOrderAuditing> query = new LambdaQueryWrapper<>();
+        query.eq(RectificationOrderAuditing::getRectificationOrder, hygfRectificationOrder.getSequenceNbr());
+        query.orderByDesc(BaseEntity::getRecDate);
+        query.last("limit 1");
+        RectificationOrderAuditing rectificationOrderAuditing = this.getBaseMapper().selectOne(query);
+        this.wofkflowExcute(rectificationOrderAuditing.getInstanceId(), auditResult.equals("通过") ? "0" : "1", "审核整改单");
+    }
+
+    public void rollback(Long sequenceNbr) {
+        LambdaQueryWrapper<RectificationOrderAuditing> query = new LambdaQueryWrapper<>();
+        query.eq(RectificationOrderAuditing::getRectificationOrder, sequenceNbr);
+        query.orderByDesc(BaseEntity::getRecDate);
+        query.last("limit 1");
+        RectificationOrderAuditing rectificationOrderAuditing = this.getBaseMapper().selectOne(query);
+        if (null != rectificationOrderAuditing ){
+            workFlowService.stopProcess(rectificationOrderAuditing.getInstanceId());
+            this.getBaseMapper().deleteByInstanceId(rectificationOrderAuditing.getInstanceId());
+        }
+
+        LambdaUpdateWrapper<HygfRectificationOrder> up = new LambdaUpdateWrapper<>();
+        up.set(HygfRectificationOrder::getRectificationStatus,WorkOrderEnum.已作废.getCode());
+        up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
+        rectificationOrderService.getBaseMapper().update(null,up);
+    }
+}
\ 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/WorkOrderServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.DeliveryStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
+import com.yeejoin.amos.boot.module.hygf.api.service.IHygfWorkOrderStationAuditingService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWorkOrderService;
 import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -44,10 +55,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	WorkOrderMapper workOrderMapper;
 	@Autowired
 	WorkOrderPowerStationServiceImpl workOrderPowerStationServiceImpl;
-
+	@Autowired
+	private WorkFlowService workFlowService;
 	@Autowired
 	WorkOrderPowerStationMapper workOrderPowerStationMapper;
 	@Autowired
+	HygfWorkOrderStationAuditingServiceImpl hygfWorkOrderStationAuditingService;
+	@Autowired
+	RectificationOrderAuditingServiceImpl rectificationOrderAuditingService;
+	@Autowired
 	DesignInformationMapper designInformationMapper;
 	@Autowired
 	PowerStationConstructionDataServiceImpl powerStationConstructionDataService;
@@ -56,6 +72,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	SurveyDetailsServiceImpl surveyDetailsService;
 
 	@Autowired
+	HygfRectificationOrderServiceImpl rectificationOrderService;
+
+	@Autowired
 	InformationServiceImpl informationService;
 
 	@Autowired
@@ -97,6 +116,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	@Autowired
 	PeasantHouseholdMapper peasantHouseholdMapper;
 
+	private static final String PROCESSKEY = "ProcessEngineering";
+
 	/**
 	 * 分页查询
 	 */
@@ -291,6 +312,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		// 如果不是提交进行单独保存
 		if (powerStationConstructionData.isCommitFlow()) {
 //        if(powerStationConstructionData.getSequenceNbr()!=null){
+
+
 			// 修改施工电站状态
 			LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper();
 			up.eq(WorkOrderPowerStation::getSequenceNbr, powerStationConstructionData.getWorkOrderPowerStationId());
@@ -299,16 +322,52 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			} else {
 				up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.待登记.getCode());
 
-				WorkOrderPowerStation basicGridAcceptanc = workOrderPowerStationMapper
-						.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
-				// 施工完成
-				LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
-				up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
-				long idsk = basicGridAcceptanc.getPeasantHouseholdId();
-				up1.eq(PeasantHousehold::getSequenceNbr, idsk);
-				peasantHouseholdMapper.update(null, up1);
+//				WorkOrderPowerStation basicGridAcceptanc = workOrderPowerStationMapper
+//						.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
+
+
+				LambdaQueryWrapper<HygfWorkOrderStationAuditing> audit = new LambdaQueryWrapper();
+				audit.eq(HygfWorkOrderStationAuditing::getWorkOrderPowerStationId, powerStationConstructionData.getWorkOrderPowerStationId());
+				audit.last("limit 1");
+				HygfWorkOrderStationAuditing workOrderStationAuditing = hygfWorkOrderStationAuditingService.getBaseMapper().selectOne(audit);
+
+				if (Objects.isNull(workOrderStationAuditing)){
+					//开启工作流 并执行一步
+					ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+					List<ActWorkflowStartDTO> params = new ArrayList<>();
+					ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+					dto.setProcessDefinitionKey(PROCESSKEY);
+					dto.setBusinessKey(String.valueOf(new Date().getTime()));
+					dto.setCompleteFirstTask(true);
+					HashMap<String, Object> map = new HashMap<>();
+					map.put("approvalStatus", "0");
+					dto.setVariables(map);
+					params.add(dto);
+					actWorkflowBatchDTO.setProcess(params);
+					List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
+					List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
+
+					WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+					HygfWorkOrderStationAuditingDto hygfWorkOrderStationAuditingDto = new HygfWorkOrderStationAuditingDto();
+					BeanUtils.copyProperties(workflowResultDto, hygfWorkOrderStationAuditingDto);
+					hygfWorkOrderStationAuditingDto.setWorkOrderPowerStationId(powerStationConstructionData.getWorkOrderPowerStationId());
+					hygfWorkOrderStationAuditingDto.setPromoter(RequestContext.getExeUserId());
+					hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto);
+				}else {
+					this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过");
+				}
 
+
+//				// 施工完成
+//				LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
+//				up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
+//				long idsk = basicGridAcceptanc.getPeasantHouseholdId();
+//				up1.eq(PeasantHousehold::getSequenceNbr, idsk);
+//				peasantHouseholdMapper.update(null, up1);
 			}
+			up.set(WorkOrderPowerStation::getPowerStationAreaStatus,null);
+			up.set(WorkOrderPowerStation::getPowerStationDesignStatus,null);
+			up.set(WorkOrderPowerStation::getPowerStationEngineeringStatus,null);
 			workOrderPowerStationMapper.update(null, up);
 			// 修改派工单状态
 			LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
@@ -396,6 +455,38 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		return powerStationConstructionData;
 	}
 
+ 		//	工作流执行一步
+	public void wofkflowExcute(String instanceId, String approvalStatus,String comment) {
+		LambdaQueryWrapper<HygfWorkOrderStationAuditing> query = new LambdaQueryWrapper<>();
+		query.eq(HygfWorkOrderStationAuditing::getInstanceId, instanceId);
+		query.orderByDesc(BaseEntity::getRecDate);
+		query.last("limit 1");
+		HygfWorkOrderStationAuditing hygfWorkOrderStationAuditing = hygfWorkOrderStationAuditingService.getBaseMapper().selectOne(query);
+
+		//组装信息
+		TaskResultDTO task = new TaskResultDTO();
+
+		task.setTaskId(hygfWorkOrderStationAuditing.getNextTaskId());
+		HashMap<String, Object> map = new HashMap<>();
+		HygfWorkOrderStationAuditingDto workOrderStationAuditingDto = new HygfWorkOrderStationAuditingDto();
+		task.setResultCode("approvalStatus");
+		map.put("approvalStatus", approvalStatus);
+		task.setComment(comment == null?"":comment);
+		task.setVariable(map);
+		//执行流程
+		ProcessTaskDTO processTaskDTO = workFlowService.complete(hygfWorkOrderStationAuditing.getNextTaskId(), task);
+		List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
+		WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+		BeanUtils.copyProperties(workflowResultDto, workOrderStationAuditingDto);
+		workOrderStationAuditingDto.setWorkOrderPowerStationId(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId());
+		workOrderStationAuditingDto.setPromoter(hygfWorkOrderStationAuditing.getPromoter());
+		workOrderStationAuditingDto.setStatus(approvalStatus);
+		if (null == workOrderStationAuditingDto.getInstanceId()) {
+			workOrderStationAuditingDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
+		}
+		hygfWorkOrderStationAuditingService.createWithModel(workOrderStationAuditingDto);
+	}
+
 	public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) {
 		PageHelper.startPage(pageNum, pageSize);
 		List<WorkOrder> list = workOrderMapper.selectWorkOrderList(workOrder);
@@ -531,6 +622,18 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		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();
@@ -563,6 +666,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		List<ConstructionRecords> li = constructionRecordsMapper.selectList(up5);
 		ConstructionRecords data = new ConstructionRecords();
 		data.setConstructionRecordsList(li);
+
+
+
 		surveyInfoAllDto.setConstructionRecords(data);
 
 		// 并网信息
@@ -703,6 +809,18 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		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();
@@ -860,6 +978,17 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
 		qu.eq(WorkOrderPowerStation::getSequenceNbr, powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId());
 		WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
+
+		LambdaQueryWrapper<HygfWorkOrderStationAuditing> audit = new LambdaQueryWrapper();
+		audit.eq(HygfWorkOrderStationAuditing::getWorkOrderPowerStationId, powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId());
+		audit.last("limit 1");
+		HygfWorkOrderStationAuditing workOrderStationAuditing = hygfWorkOrderStationAuditingService.getBaseMapper().selectOne(audit);
+		//兼容历史数据
+		if(!Objects.isNull(workOrderStationAuditing )){
+			this.wofkflowExcute(workOrderStationAuditing.getInstanceId(), "0", "通过");
+
+		}
+
 		// 修改电站状态
 		workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getCode());
 		workOrderPowerStationMapper.updateById(workOrderPowerStation);
@@ -927,51 +1056,61 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
         qu.eq(WorkOrderPowerStation::getSequenceNbr, constructionRecords.getWorkOrderPowerStationId());
         WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
 
-        if (constructionRecords.getOperationResults().equals("通过")) {
-            // 修改电站状态
-            workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode());
-
-            // 修改完工时间
-            LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1 = new LambdaUpdateWrapper();
-            upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,
-                    workOrderPowerStation.getSequenceNbr());
-            upq1.set(PowerStationEngineeringInfo::getCompletionDate, new Date());
-            powerStationEngineeringInfoMapper.update(null, upq1);
+		LambdaQueryWrapper<HygfWorkOrderStationAuditing> audit = new LambdaQueryWrapper();
+		audit.eq(HygfWorkOrderStationAuditing::getWorkOrderPowerStationId, constructionRecords.getWorkOrderPowerStationId());
+		audit.last("limit 1");
+		HygfWorkOrderStationAuditing workOrderStationAuditing = hygfWorkOrderStationAuditingService.getBaseMapper().selectOne(audit);
 
-            BasicGridAcceptance dat = new BasicGridAcceptance();
-            dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
-            dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
-            dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
-            dat.setGridStatus("1");
 
-//				// 新增并网记录
-//				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
-//				bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
-//				BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
-//				// 防止重复增加
-//				if (b == null) {
-//					basicGridAcceptanceMapper.insert(dat);
-//				}
-            basicGridAcceptanceService.saveOrUpdate(dat,new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getPeasantHouseholdId,workOrderPowerStation.getPeasantHouseholdId()));
+        if (constructionRecords.getOperationResults().equals("通过")) {
+            // 修改电站状态
+            workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getName());
+            workOrderPowerStation.setWorkOrderPowerStationNode(WorkOrderEnum.片区运营待审核.getCode());
+			workOrderPowerStation.setPowerStationAreaStatus(null);
+			workOrderPowerStation.setPowerStationDesignStatus(null);
+			workOrderPowerStation.setPowerStationEngineeringStatus(null);
+//            // 修改完工时间
+//            LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1 = new LambdaUpdateWrapper();
+//            upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,
+//                    workOrderPowerStation.getSequenceNbr());
+//            upq1.set(PowerStationEngineeringInfo::getCompletionDate, new Date());
+//            powerStationEngineeringInfoMapper.update(null, upq1);
+
+//            BasicGridAcceptance dat = new BasicGridAcceptance();
+//            dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
+//            dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
+//            dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
+//            dat.setGridStatus("1");
+//
+////				// 新增并网记录
+////				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
+////				bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
+////				BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
+////				// 防止重复增加
+////				if (b == null) {
+////					basicGridAcceptanceMapper.insert(dat);
+////				}
+//            basicGridAcceptanceService.saveOrUpdate(dat,new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getPeasantHouseholdId,workOrderPowerStation.getPeasantHouseholdId()));
 
             workOrderPowerStationMapper.updateById(workOrderPowerStation);
-            // 修改派工单状态
-            LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
-            qu1.eq(WorkOrderPowerStation::getWorkOrderId, workOrderPowerStation.getWorkOrderId());
-            List<String> d = new ArrayList<>();
-            d.add(WorkOrderEnum.施工中.getCode());
-            d.add(WorkOrderEnum.待施工.getCode());
-            d.add(WorkOrderEnum.待登记.getCode());
-            d.add(WorkOrderEnum.待审核.getCode());
-            d.add(WorkOrderEnum.未通过.getCode());
-            qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
-            List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);
-            LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
-            upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
-            if (list == null || list.isEmpty()) {
-                upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
-                workOrderMapper.update(null, upq);
-            }
+//            // 修改派工单状态
+//            LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
+//            qu1.eq(WorkOrderPowerStation::getWorkOrderId, workOrderPowerStation.getWorkOrderId());
+//            List<String> d = new ArrayList<>();
+//            d.add(WorkOrderEnum.施工中.getCode());
+//            d.add(WorkOrderEnum.待施工.getCode());
+//            d.add(WorkOrderEnum.待登记.getCode());
+//            d.add(WorkOrderEnum.待审核.getCode());
+//            d.add(WorkOrderEnum.未通过.getCode());
+//            qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
+//            List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);
+//            LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
+//            upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
+//            if (list == null || list.isEmpty()) {
+//                upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
+//                workOrderMapper.update(null, upq);
+//            }
+
         } else {
             // 修改电站状态
             workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());
@@ -987,8 +1126,14 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 					workOrderPowerStation.getSequenceNbr());
 			upq1.set(PowerStationEngineeringInfo::getCompletionDate, null);
 			powerStationEngineeringInfoMapper.update(null, upq1);
-
         }
+        //线上历史数据有部分因当时没流程 所以已跳过流程开启节点 允许没有流程的业务驳回
+        if(!Objects.isNull(workOrderStationAuditing)){
+			this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),
+					constructionRecords.getOperationResults().equals("通过")?"0":"1",
+					constructionRecords.getOperationResults());
+		}
+
 
         // 增加操作日志
         constructionRecords.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
@@ -999,4 +1144,191 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		return constructionRecords;
 	}
 
+
+	public void completeAudit(Map<String,String> kv) {
+		String powerStationId = kv.get("powerStationId");
+		String comment = kv.get("comment");
+		String status = kv.get("status");
+		String approvalStatus = kv.get("approvalStatus");
+		LambdaQueryWrapper<HygfWorkOrderStationAuditing> audit = new LambdaQueryWrapper();
+		audit.eq(HygfWorkOrderStationAuditing::getWorkOrderPowerStationId, powerStationId);
+		audit.last("limit 1");
+		HygfWorkOrderStationAuditing workOrderStationAuditing = hygfWorkOrderStationAuditingService.getBaseMapper().selectOne(audit);
+		this.wofkflowExcute(workOrderStationAuditing.getInstanceId(), approvalStatus , comment  );
+
+		LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
+		qu.eq(WorkOrderPowerStation::getSequenceNbr, powerStationId);
+		WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
+		ConstructionRecords constructionRecords = new ConstructionRecords();
+		switch (status){
+			case "area":
+				workOrderPowerStation.setPowerStationAreaStatus(approvalStatus.equals("0")?"通过":"驳回");
+				constructionRecords.setOperationContent("施工验收-片区运营审核-" +workOrderPowerStation.getPowerStationAreaStatus());
+				workOrderPowerStation.setWorkOrderPowerStationNode(WorkOrderEnum.工程待审核.getCode());
+				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getName());
+				break;
+			case "design":
+				workOrderPowerStation.setPowerStationDesignStatus(approvalStatus.equals("0")?"通过":"驳回");
+				constructionRecords.setOperationContent("施工验收-设计审核-" + workOrderPowerStation.getPowerStationDesignStatus());
+				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode());
+				workOrderPowerStation.setWorkOrderPowerStationNode(WorkOrderEnum.全部节点.getCode());
+				break;
+			default:
+				workOrderPowerStation.setPowerStationEngineeringStatus(approvalStatus.equals("0")?"通过":"驳回");
+				constructionRecords.setOperationContent("施工验收-工程审核-" + workOrderPowerStation.getPowerStationEngineeringStatus());
+				workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.待审核.getName());
+				workOrderPowerStation.setWorkOrderPowerStationNode(WorkOrderEnum.设计待审核.getCode());
+				break;
+		}
+		//若驳回则修改施工场站状态为未通过 上述switch作通过状态的统一处理 且节点恢复为null
+		if (approvalStatus.equals("1")){
+			workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());
+			workOrderPowerStation.setWorkOrderPowerStationNode(null);
+			//此处sql可以和updateById合并优化 后续处理
+			LambdaUpdateWrapper<WorkOrderPowerStation> qqq = new LambdaUpdateWrapper();
+			qqq.eq(BaseEntity::getSequenceNbr,workOrderPowerStation.getSequenceNbr());
+			qqq.set(WorkOrderPowerStation::getWorkOrderPowerStationNode,null);
+			workOrderPowerStationMapper.update(null,qqq);
+
+			LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
+			upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
+			upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.未通过.getCode());
+			workOrderMapper.update(null, upq);
+
+		}
+
+		// 增加操作日志
+		constructionRecords.setOperationTime(new Date());
+		constructionRecords.setOperator(kv.get("operator"));
+		constructionRecords.setOperationResults(approvalStatus.equals("0")?"通过":"驳回");
+		constructionRecords.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
+		constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
+		constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
+		constructionRecords.setNotes(kv.get("comment"));
+		constructionRecordsServiceImpl.save(constructionRecords);
+
+		workOrderPowerStationMapper.updateById(workOrderPowerStation);
+
+		if (status.equals("design") && approvalStatus.equals("0")){
+
+			// 修改完工时间
+			LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1 = new LambdaUpdateWrapper();
+			upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,
+					workOrderPowerStation.getSequenceNbr());
+			upq1.set(PowerStationEngineeringInfo::getCompletionDate, new Date());
+			powerStationEngineeringInfoMapper.update(null, upq1);
+
+			BasicGridAcceptance dat = new BasicGridAcceptance();
+			dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
+			dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
+			dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
+			dat.setGridStatus("1");
+
+//				// 新增并网记录
+//				LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
+//				bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
+//				BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
+//				// 防止重复增加
+//				if (b == null) {
+//					basicGridAcceptanceMapper.insert(dat);
+//				}
+			basicGridAcceptanceService.saveOrUpdate(dat,new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getPeasantHouseholdId,workOrderPowerStation.getPeasantHouseholdId()));
+			// 修改派工单状态
+			LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
+			qu1.eq(WorkOrderPowerStation::getWorkOrderId, workOrderPowerStation.getWorkOrderId());
+			List<String> d = new ArrayList<>();
+			d.add(WorkOrderEnum.施工中.getCode());
+			d.add(WorkOrderEnum.待施工.getCode());
+			d.add(WorkOrderEnum.待登记.getCode());
+			d.add(WorkOrderEnum.待审核.getCode());
+			d.add(WorkOrderEnum.未通过.getCode());
+			qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
+			List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);
+			LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
+			upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
+			if (list == null || list.isEmpty()) {
+				upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
+				workOrderMapper.update(null, upq);
+			}
+
+
+			// 施工完成
+			LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
+			up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.施工完成.getCode());
+			if (null != workOrderPowerStation.getPeasantHouseholdId() && workOrderPowerStation.getPeasantHouseholdId().longValue() != 0L ){
+				long idsk = workOrderPowerStation.getPeasantHouseholdId();
+				up1.eq(PeasantHousehold::getSequenceNbr, idsk);
+				peasantHouseholdMapper.update(null, up1);
+			}
+
+		}
+
+	}
+
+
+
+	public void addRectification(HygfRectificationOrder hygfRectificationOrder) {
+		rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
+		String addorSubmit = hygfRectificationOrder.getAddorSubmit();
+		//修改电站状态
+		if (addorSubmit.equals("0")){
+			LambdaUpdateWrapper<WorkOrderPowerStation> qu = new LambdaUpdateWrapper();
+			qu.eq(WorkOrderPowerStation::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+			qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待整改.getCode());
+			workOrderPowerStationMapper.update(null,qu);
+		}
+
+
+
+	}
+
+
+	public void nextTaskExcute(HygfRectificationOrder hygfRectificationOrder) {
+		//修改电站状态
+		LambdaUpdateWrapper<WorkOrderPowerStation> qu = new LambdaUpdateWrapper();
+		qu.eq(WorkOrderPowerStation::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+
+		if (hygfRectificationOrder.getAddorSubmit().equals("0")) {
+			qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.整改待审核.getCode());
+			workOrderPowerStationMapper.update(null,qu);
+			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.待审核.getCode());
+		}else {
+		//	qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.整改中.getCode());
+			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
+		}
+		rectificationOrderAuditingService.nextTaskExcute(hygfRectificationOrder);
+	}
+
+		public void nextTaskAduit(HygfRectificationOrder hygfRectificationOrder) {
+		//修改电站状态
+		LambdaUpdateWrapper<WorkOrderPowerStation> qu = new LambdaUpdateWrapper();
+		qu.eq(WorkOrderPowerStation::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+
+		if (hygfRectificationOrder.getAuditResult().equals("通过")){
+			qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待审核.getCode());
+			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.已完成.getCode());
+		}else {
+			qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待整改.getCode());
+			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.待整改.getCode());
+		}
+		rectificationOrderAuditingService.nextTaskAduit(hygfRectificationOrder);
+		workOrderPowerStationMapper.update(null,qu);
+	}
+
+	public void rollback(Long sequenceNbr) {
+		HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectById(sequenceNbr);
+		if (hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待提交.getCode()) ||
+				hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待整改.getCode())){
+			rectificationOrderAuditingService.rollback(sequenceNbr);
+		}else {
+			throw new BadRequest("仅单据状态为待提交或待整改时方可作废");
+		}
+		//修改施工电站状态
+		LambdaUpdateWrapper<WorkOrderPowerStation> qu = new LambdaUpdateWrapper();
+		qu.eq(WorkOrderPowerStation::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+		qu.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待审核.getCode());
+		workOrderPowerStationMapper.update(null,qu);
+
+
+	}
 }
\ No newline at end of file

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

@@ -72,6 +72,12 @@ dealer.appcode.manage=studio_normalapp_5155413,studio_normalapp_5133538
 dealer.appcode.role=1767363928842571777
 dealer.amosDealerId=1767820997374775298
 
+admin.engineering.roleId=1702512052154687489
+admin.area.roleId=1822904567478620161
+admin.design.roleId=1702511991735738370
+admin.deveEngineering.roleId=1702550832882413570
+
+
 
 feign.okhttp.enabled= true