并网优化

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

@@ -17,12 +17,12 @@ public enum GridStatusEnum {
     JXSGLYDSH("经销商管理员待审核", "2"),
     YWC("已完成", "3"),
     WTG("未通过", "4"),
-    ZGDSH("整改待审核", "5"),
-    PQYYDSH("片区运营待审核", "6"),
-    GCDSH("工程待审核", "7"),
-    SJDSH("设计待审核", "8"),
-    DZG("待整改", "9"),
-    ROLESDSH("设计待审核/工程待审核", "10");
+    SJDSH("设计待审核", "5"),
+    ROLESDSH("设计待审核/工程待审核", "6"),
+    PQYYDSH("片区运营待审核", "7"),
+    GCDSH("工程待审核", "8"),
+    ZGDSH("整改待审核", "9"),
+    DZG("待整改", "10");
 
 
     /**

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

@@ -49,7 +49,7 @@ public class AcceptanceCheckAuditingDto  extends BaseDto {
     private String status;
 
     @ApiModelProperty(value = "验收id")
-    private Long acceptance checkId;
+    private Long peasantHouseholdId;
 
     @ApiModelProperty(value = " 待执行节点小程序路由")
     private String nodeRouting;

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -31,7 +32,7 @@ public class AcceptanceCheckDto  extends BaseDto {
     private Long peasantHouseholdId;
 
     @ApiModelProperty(value = "验收状态")
-    private String acceptance checkStatus;
+    private String acceptanceCheckStatus;
 
     @ApiModelProperty(value = "节点标识")
     private String basicGridNode;
@@ -46,7 +47,6 @@ public class AcceptanceCheckDto  extends BaseDto {
     private String powerStationEngineeringStatus;
 
     @ApiModelProperty(value = "实例id")
-    @TableField("instance_Id")
     private String instanceId;
 
 }

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

@@ -73,4 +73,5 @@ public class BasicGridAcceptanceDto extends BaseDto {
     //并网登记id
 
     private Long fonGridId;
+
 }

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

@@ -46,7 +46,29 @@ public class BasicGridRecordDto  extends BaseDto {
     private String powerStationEngineeringStatus;
 
     @ApiModelProperty(value = "实例id")
-    @TableField("instance_Id")
     private String instanceId;
 
+    @ApiModelProperty(value = "当前存在的整改单类型")
+    private String rectificationStatus;
+
+ //电站编号
+ private String peasantHouseholdNo;
+ //户主姓名
+ private String ownersName;
+ ///项目地址
+ private String projectAddressName;
+ //并网日期
+ private Date gridConnectionTime;
+
+ private String regionalCompaniesName;
+
+ private String serviceAgent;
+
+
+ //并网登记id
+
+ private Long fonGridId;
+
+
+ private String isAudit;
 }

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

@@ -43,8 +43,8 @@ public class AcceptanceCheck extends BaseEntity {
     /**
      * 验收状态
      */
-	@TableField("acceptance check_status")
-    private String acceptance checkStatus;
+	@TableField("acceptance_check_status")
+    private String acceptanceCheckStatus;
 
     /**
      * 节点标识

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

@@ -79,8 +79,8 @@ public class AcceptanceCheckAuditing extends BaseEntity {
     /**
      * 验收id
      */
-	@TableField("acceptance check_id")
-    private Long acceptance checkId;
+	@TableField("peasant_household_id")
+    private Long peasantHouseholdId;
 
     /**
      *  待执行节点小程序路由

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

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

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

@@ -12,7 +12,7 @@
             hogaa.peasant_household_id = #{id}
     </select>
 
-    <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto">
+    <select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto">
 
         SELECT
         hogaa.sequence_nbr fonGridId,
@@ -20,10 +20,12 @@
         hbga.work_order_id workOrderId,
         hbga.work_order_power_station_id workOrderPowerStationId,
         hbga.peasant_household_id peasantHouseholdId,
-        hbga.acceptance_rec_date acceptanceRecDate,
+        hbga.basic_grid_node basicGridNode,
+        hbga.power_station_area_status powerStationAreaStatus,
+        hbga.power_station_design_status powerStationDesignStatus,
+        hbga.rectification_status rectificationStatus,
+        hbga.power_station_engineering_status powerStationEngineeringStatus,
         hbga.instance_id instanceId,
-        hbga.next_executor_ids nextExecutorIds,
-        hbga.next_node_key nextNodeKey,
         hph.developer_name as serviceAgent,
         hph.regional_companies_name AS regionalCompaniesName,
         hph.owners_name AS ownersName,
@@ -31,11 +33,17 @@
         hph.project_address_name projectAddressName,
         DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d %H:%i:%S') AS gridConnectionTime,
         CASE WHEN hbga.grid_status = '1' THEN '待登记'
-        WHEN hbga.grid_status = '2' THEN '待审核'
+        WHEN hbga.grid_status = '2' THEN '经销商管理员待审核'
         WHEN hbga.grid_status = '3' THEN '已完成'
-        ELSE '未通过' END AS gridStatus
+        WHEN hbga.grid_status = '4' THEN '未通过'
+        WHEN hbga.grid_status = '5' THEN '设计待审核'
+        WHEN hbga.grid_status = '6' THEN '设计待审核/工程待审核'
+        WHEN hbga.grid_status = '7' THEN '片区运营待审核'
+        WHEN hbga.grid_status = '8' THEN '工程待审核'
+        WHEN hbga.grid_status = '9' THEN '整改待审核'
+        ELSE '待整改' END AS gridStatus
         FROM
-            hygf_basic_grid_acceptance hbga
+            hygf_basic_grid_record hbga
             LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
             LEFT JOIN hygf_on_grid_and_acceptance hogaa ON hogaa.work_order_power_station_id = hbga.work_order_power_station_id
             LEFT JOIN hygf_work_order  ON hygf_work_order.sequence_nbr = hbga.work_order_id

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.BasicGridAcceptanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
@@ -16,12 +18,15 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.WorkflowImpl;
 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.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +53,15 @@ public class BasicGridAcceptanceController extends BaseController {
 	@Autowired
 	WorkflowImpl workflow;
 
+	@Value("${admin.engineering.roleId}")
+	Long engineeringId;
+	@Value("${admin.area.roleId}")
+	Long areaId;
+	@Value("${admin.design.roleId}")
+	Long designId;
+	@Value("${admin.delerAdmin.roleId}")
+	Long delerAdminId;
+
     /**
      * 新增保存
      *
@@ -125,7 +139,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
 	@UserLimits
-	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForPage(@RequestParam(value = "current") int current,
+	public ResponseModel<Page<BasicGridRecordDto>> queryForPage(@RequestParam(value = "current") int current,
 																	@RequestParam(value = "size") int size,
 																	@RequestParam(required = false,value = "projectAddress") String projectAddress,
 																	@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
@@ -134,7 +148,36 @@ public class BasicGridAcceptanceController extends BaseController {
 																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
         //当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
-	    Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
+
+		ReginParams reginParams = getSelectedOrgInfo();
+		List<String> basicGridNodes = new ArrayList<>();
+		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
+			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
+			if (longs.contains(areaId)) {
+				basicGridNodes.add("bw-area");
+			}
+			if (longs.contains(engineeringId)) {
+				basicGridNodes.add("bw-engineering");
+			}
+			if (longs.contains(designId)) {
+				basicGridNodes.add("bw-design");
+			}
+		}
+	    Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
+		//根据角色及当前节点判断是否有操作权限
+		if (basicGridNodes != null){
+			for (BasicGridRecordDto e : page.getRecords()) {
+				for (String g : basicGridNodes) {
+					if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g)){
+						e.setIsAudit("0");
+						break;
+					}else {
+						e.setIsAudit("1");
+					}
+				}
+			}
+
+		}
 	    return ResponseHelper.buildResponse(page);
 	}
 
@@ -149,7 +192,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@GetMapping(value = "/check/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
     @UserLimits
-	public ResponseModel<Page<BasicGridAcceptanceDto>> queryForCheckPage(@RequestParam(value = "current") int current,
+	public ResponseModel<Page<BasicGridRecordDto>> queryForCheckPage(@RequestParam(value = "current") int current,
 																	@RequestParam(value = "size") int size,
 																	@RequestParam(required = false,value = "projectAddress") String projectAddress,
 																	@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
@@ -158,7 +201,7 @@ public class BasicGridAcceptanceController extends BaseController {
 																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
         //当前登录人所属场站
 
-        Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check");
+        Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check");
 		return ResponseHelper.buildResponse(page);
 	}
 
@@ -193,6 +236,14 @@ public class BasicGridAcceptanceController extends BaseController {
 
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "完工自审-经销商管理",   notes = "完工自审经销商管理")
+	@PostMapping(value = "/completeAdminAudit")
+	public ResponseModel completeAdminAudit( @RequestBody Map<String,String> kv) {
+		basicGridAcceptanceServiceImpl.completeAdminAudit(kv);
+		return ResponseHelper.buildResponse(null);
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "完工自审管理审核",   notes = "完工自审管理审核")
 	@PostMapping(value = "/completeAudit")
 	public ResponseModel completeAudit( @RequestBody Map<String,String> kv) {
@@ -221,6 +272,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "整改单审核",   notes = "整改单审核")
 	@PostMapping(value = "/nextTaskAduit")
+	@Transactional
 	public ResponseModel nextTaskAduit( @RequestBody HygfRectificationOrder hygfReplenishment) {
 
 		basicGridAcceptanceServiceImpl.nextTaskAduit(hygfReplenishment);

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

@@ -46,6 +46,10 @@ public class HygfRectificationOrderController extends BaseController {
 	Long designId;
 	@Value("${admin.deveEngineering.roleId}")
 	Long deveEngineeringId;
+	@Value("${admin.delerAdmin.roleId}")
+	Long delerAdminId;
+	@Value("${admin.delerKaId.roleId}")
+	Long delerKfId;
     /**
      * 新增审核单
      *
@@ -127,6 +131,11 @@ public class HygfRectificationOrderController extends BaseController {
 			if (longs.contains(designId) ) {
 				workOrderPowerStationNodes.add("design");
 			}
+			if (longs.contains(delerAdminId) ) {
+				workOrderPowerStationNodes.add("design");
+				workOrderPowerStationNodes.add("engineering");
+				workOrderPowerStationNodes.add("area");
+			}
 		}
 
 		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId);
@@ -139,7 +148,7 @@ public class HygfRectificationOrderController extends BaseController {
 						e.setIsAudit("0");
 					}else if (longs.contains(designId) && e.getRectificationSource().equals("design")){
 						e.setIsAudit("0");
-					}else if (longs.contains(engineeringId)){
+					}else if (longs.contains(deveEngineeringId)){
 						e.setIsAudit("0");
 					}else {
 						e.setIsAudit("1");
@@ -150,6 +159,127 @@ public class HygfRectificationOrderController extends BaseController {
 	    return ResponseHelper.buildResponse(page);
 	}
 
+
+	/**
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/bwpage")
+	@ApiOperation(httpMethod = "GET",value = "审核单分页查询 并网",  notes = "审核单分页查询 并网")
+	public ResponseModel<Page<HygfRectificationOrder>> queryForPageBybw(@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("bw-area");
+			}
+			if (longs.contains(engineeringId) ) {
+				workOrderPowerStationNodes.add("bw-engineering");
+			}
+			if (longs.contains(designId) ) {
+				workOrderPowerStationNodes.add("bw-design");
+			}
+			if (longs.contains(delerAdminId) ) {
+				workOrderPowerStationNodes.add("bw-design");
+				workOrderPowerStationNodes.add("bw-engineering");
+				workOrderPowerStationNodes.add("bw-area");
+			}if (longs.contains(delerKfId) ) {
+				workOrderPowerStationNodes.add("bw-design");
+				workOrderPowerStationNodes.add("bw-engineering");
+				workOrderPowerStationNodes.add("bw-area");
+			}
+		}
+
+		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("bw-area")){
+					e.setIsAudit("0");
+				}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("bw-engineering")){
+					e.setIsAudit("0");
+				}else if (longs.contains(designId) && e.getRectificationSource().equals("bw-design")){
+					e.setIsAudit("0");
+				}else if (longs.contains(delerKfId)){
+					e.setIsAudit("0");
+				}else {
+					e.setIsAudit("1");
+				}
+			});
+		}
+
+		return ResponseHelper.buildResponse(page);
+	}
+
+
+
+	/**
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/yspage")
+	@ApiOperation(httpMethod = "GET",value = "审核单分页查询 验收",  notes = "审核单分页查询 验收")
+	public ResponseModel<Page<HygfRectificationOrder>> queryForPageByYs(@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("bw-area");
+			}
+			if (longs.contains(engineeringId) ) {
+				workOrderPowerStationNodes.add("bw-engineering");
+			}
+			if (longs.contains(designId) ) {
+				workOrderPowerStationNodes.add("bw-design");
+			}
+			if (longs.contains(delerAdminId) ) {
+				workOrderPowerStationNodes.add("bw-design");
+				workOrderPowerStationNodes.add("bw-engineering");
+				workOrderPowerStationNodes.add("bw-area");
+			}if (longs.contains(delerKfId) ) {
+				workOrderPowerStationNodes.add("bw-design");
+				workOrderPowerStationNodes.add("bw-engineering");
+				workOrderPowerStationNodes.add("bw-area");
+			}
+		}
+
+		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("bw-area")){
+					e.setIsAudit("0");
+				}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("bw-engineering")){
+					e.setIsAudit("0");
+				}else if (longs.contains(designId) && e.getRectificationSource().equals("bw-design")){
+					e.setIsAudit("0");
+				}else if (longs.contains(delerKfId)){
+					e.setIsAudit("0");
+				}else {
+					e.setIsAudit("1");
+				}
+			});
+		}
+
+		return ResponseHelper.buildResponse(page);
+	}
+
 	/**
 	 * 列表全部数据查询
      *

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

@@ -58,6 +58,8 @@ public class WorkOrderController extends BaseController {
     Long areaId;
     @Value("${admin.design.roleId}")
     Long designId;
+    @Value("${admin.delerAdmin.roleId}")
+    Long delerAdminId;
     /**
      * 新增施工派工工单
      *
@@ -195,8 +197,11 @@ public class WorkOrderController extends BaseController {
 //        workOrder.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
         ReginParams reginParams = getSelectedOrgInfo();
         List<String> workOrderPowerStationNodes = new ArrayList<>();
+
+        List<Long> roleIds = new ArrayList<>();
         for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
             List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
+            roleIds.addAll(roleIds);
             if (longs.contains(areaId)) {
                 workOrderPowerStationNodes.add("area");
             }
@@ -206,6 +211,11 @@ public class WorkOrderController extends BaseController {
             if (longs.contains(designId)) {
                 workOrderPowerStationNodes.add("design");
             }
+            if (longs.contains(delerAdminId)) {
+                workOrderPowerStationNodes.add("design");
+                workOrderPowerStationNodes.add("engineering");
+                workOrderPowerStationNodes.add("area");
+            }
         }
         if (workOrder.getType().equals("3") && workOrderPowerStationNodes != null){
             workOrder.setWorkOrderPowerStationNodes(workOrderPowerStationNodes);
@@ -213,9 +223,10 @@ public class WorkOrderController extends BaseController {
         Page<WorkOrderPage> workOrderPagePage = workOrderServiceImpl.queryForwgpage(workOrder.getCurrent(), workOrder.getSize(), workOrder);
         if (workOrder.getType().equals("3") && workOrderPowerStationNodes != null){
             workOrderPagePage.getRecords().forEach(e->{
-               if (workOrderPowerStationNodes.contains(e.getWorkOrderPowerStationNode())){
+               if (workOrderPowerStationNodes.contains(e.getWorkOrderPowerStationNode()) && (roleIds.contains(areaId) ||roleIds.contains(designId) ||  roleIds.contains(engineeringId)) ){
                 e.setIsAudit("0");
-               }else {
+               }
+               else {
                 e.setIsAudit("1");
                }
             });

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheck;
+import cn.hutool.core.collection.CollectionUtil;
+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.module.hygf.api.Enum.GridStatusEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckAuditingDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAuditingDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceCheckService;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckDto;
+import com.yeejoin.amos.component.robot.BadRequest;
+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.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 并网验收节点服务实现类
@@ -17,6 +34,18 @@ import java.util.List;
  */
 @Service
 public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,AcceptanceCheck,AcceptanceCheckMapper> implements IAcceptanceCheckService {
+    @Autowired
+    AcceptanceCheckAuditingServiceImpl acceptanceCheckAuditingService;
+    @Autowired
+    private WorkFlowService workFlowService;
+//    @Autowired
+//    AcceptanceCheckAuditingServiceImpl acceptanceCheckAuditingService;
+//    @Autowired
+//    RectificationOrderAuditingServiceImpl rectificationOrderAuditingService;
+//    @Autowired
+//    HygfRectificationOrderServiceImpl rectificationOrderService;
+    
+    
     /**
      * 分页查询
      */
@@ -30,4 +59,310 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     public List<AcceptanceCheckDto> queryForAcceptanceCheckList()   {
         return this.queryForList("" , false);
     }
+
+    //	工作流执行一步
+    public void wofkflowExcute(String instanceId, String approvalStatus,String comment) {
+        LambdaQueryWrapper<AcceptanceCheckAuditing> query = new LambdaQueryWrapper<>();
+        query.eq(AcceptanceCheckAuditing::getInstanceId, instanceId);
+        query.orderByDesc(BaseEntity::getRecDate);
+        query.last("limit 1");
+        AcceptanceCheckAuditing basicGridAuditing = acceptanceCheckAuditingService.getBaseMapper().selectOne(query);
+
+        //组装信息
+        TaskResultDTO task = new TaskResultDTO();
+
+        task.setTaskId(basicGridAuditing.getNextTaskId());
+        HashMap<String, Object> map = new HashMap<>();
+        AcceptanceCheckAuditingDto basicGridAuditingDto = new AcceptanceCheckAuditingDto();
+        task.setResultCode("approvalStatus");
+        map.put("approvalStatus", approvalStatus);
+        task.setComment(comment == null?"":comment);
+        task.setVariable(map);
+        //执行流程
+        ProcessTaskDTO processTaskDTO = workFlowService.complete(basicGridAuditing.getNextTaskId(), task);
+        List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
+        WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+        BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
+        basicGridAuditingDto.setPeasantHouseholdId(basicGridAuditing.getPeasantHouseholdId());
+        basicGridAuditingDto.setPromoter(basicGridAuditing.getPromoter());
+        basicGridAuditingDto.setStatus(approvalStatus);
+        if (null == basicGridAuditingDto.getInstanceId()) {
+            basicGridAuditingDto.setInstanceId(basicGridAuditing.getInstanceId());
+        }
+        acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
+    }
+
+//
+//
+//
+//    public void completeAdminAudit(Map<String,String> kv) {
+//        String instanceId = kv.get("instanceId");
+//        String sequenceNbr = kv.get("sequenceNbr");
+//        String comment = kv.get("comment");
+//        String approvalStatus = kv.get("approvalStatus");
+//
+//        BasicGridRecord basicGridRecord = this.getBaseMapper().selectById(sequenceNbr);
+//        //执行工作流
+//        this.wofkflowExcute(instanceId, approvalStatus , comment);
+//        //修改并网数据状态
+//        basicGridRecord.setGridStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode());
+//        basicGridRecord.setBasicGridNode("bw-area");
+//        basicGridRecordService.updateById(basicGridRecord);
+//    }
+//
+//
+//
+//
+//    public void completeAudit(Map<String,String> kv) {
+//        String instanceId = kv.get("instanceId");
+//        String sequenceNbr = kv.get("sequenceNbr");
+//        String comment = kv.get("comment");
+//        String status = kv.get("status");
+//        String approvalStatus = kv.get("approvalStatus");
+//
+//        BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectById(sequenceNbr);
+//        LambdaUpdateWrapper<BasicGridRecord> up = new LambdaUpdateWrapper<>();
+//        switch (status){
+//            case "bw-area":
+//                up.set(BasicGridRecord::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
+//                up.set(BasicGridRecord::getBasicGridNode,"bw-design,bw-engineering");
+//                up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ROLESDSH.getCode());
+//                this.wofkflowExcute(instanceId, approvalStatus , comment  );
+//                break;
+//            case "bw-design":
+//                up.set(BasicGridRecord::getPowerStationDesignStatus,approvalStatus.equals("0")?"通过":"驳回");
+//                if (basicGridRecord.getPowerStationEngineeringStatus() != null && basicGridRecord.getPowerStationEngineeringStatus().equals("通过")&&approvalStatus.equals("0") ){
+//                    up.set(BasicGridRecord::getGridStatus,GridStatusEnum.YWC.getCode());
+//
+//                    this.wofkflowExcute(instanceId, approvalStatus , comment  );
+//                    up.set(BasicGridRecord::getBasicGridNode,"all");
+//                }else if( null == basicGridRecord.getPowerStationEngineeringStatus() &&approvalStatus.equals("0") ) {
+//                    up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
+//                    up.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
+//                }else if (null != basicGridRecord.getPowerStationEngineeringStatus() && basicGridRecord.getPowerStationEngineeringStatus().equals("驳回")){
+//                    throw new BadRequest("该流程已被工程人员审核驳回，请刷新列表");
+//                }else {
+//                    this.wofkflowExcute(instanceId, approvalStatus , comment  );
+//                }
+//                break;
+//            default:
+//                up.set(BasicGridRecord::getPowerStationEngineeringStatus,approvalStatus.equals("0")?"通过":"驳回");
+//                if (basicGridRecord.getPowerStationDesignStatus() != null && basicGridRecord.getPowerStationDesignStatus().equals("通过")&&approvalStatus.equals("0") ){
+//                    up.set(BasicGridRecord::getGridStatus,GridStatusEnum.YWC.getCode());
+//                    this.wofkflowExcute(instanceId, approvalStatus , comment  );
+//                    up.set(BasicGridRecord::getBasicGridNode,"all");
+//                }else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0")  ) {
+//                    up.set(BasicGridRecord::getBasicGridNode,"bw-design");
+//                    up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
+//                }else if (null != basicGridRecord.getPowerStationDesignStatus() && basicGridRecord.getPowerStationDesignStatus().equals("驳回")){
+//                    throw new BadRequest("该流程已被设计人员审核驳回，请刷新列表");
+//                }else {
+//                    this.wofkflowExcute(instanceId, approvalStatus , comment  );
+//                }
+//                break;
+//        }
+//        if (approvalStatus.equals("1") ){
+//            up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
+//            up.set(BasicGridRecord::getBasicGridNode,null);
+//            up.set(BasicGridRecord::getGridStatus,GridStatusEnum.WTG.getCode());
+//            basicGridRecordService.getBaseMapper().update(null,up);
+//        }
+//        //修改并网数据状态
+//        if (StringUtils.isNotEmpty(sequenceNbr)){
+//            up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
+//            basicGridRecordService.getBaseMapper().update(null,up);
+//        }
+//    }
+//
+//
+//
+//
+//    public void addRectification(HygfRectificationOrder hygfRectificationOrder) {
+//
+//        //查询当前并网数据
+//        LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+//        BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
+//        if (!Objects.isNull(basicGridRecord)&&!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
+//            throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
+//        }
+//
+//        String addorSubmit = hygfRectificationOrder.getAddorSubmit();;
+//        LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
+//        if (!Objects.isNull(basicGridRecord) && null !=  basicGridRecord.getRectificationStatus() && !basicGridRecord.getRectificationStatus().contains(hygfRectificationOrder.getRectificationSource())){
+//            qu.set(BasicGridRecord::getRectificationStatus,basicGridRecord.getRectificationStatus()+","+hygfRectificationOrder.getRectificationSource());
+//        }else if (null ==  basicGridRecord.getRectificationStatus() ) {
+//            qu.set(BasicGridRecord::getRectificationStatus,hygfRectificationOrder.getRectificationSource());
+//        }
+//        //修改状态
+//        if (addorSubmit.equals("0")){
+//            qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+//        }
+//        rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
+//        qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+//        basicGridRecordService.update(null,qu);
+//
+//    }
+//
+//
+//    public void nextTaskExcute(HygfRectificationOrder hygfRectificationOrder) {
+//        //查询当前并网数据
+//        LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+//        BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
+//        if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
+//            hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
+//            rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
+//            throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
+//        }
+//
+//        if (hygfRectificationOrder.getAddorSubmit().equals("0")  ) {
+//
+//            LambdaUpdateWrapper<BasicGridRecord> up = new LambdaUpdateWrapper<>();
+//            up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
+//            up.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+//            basicGridRecordService.update(null,up);
+//            hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.待审核.getCode());
+//        }else {
+//            hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.整改中.getCode());
+//        }
+//        rectificationOrderAuditingService.nextTaskExcute(hygfRectificationOrder);
+//    }
+//
+//    public void nextTaskAduit(HygfRectificationOrder hygfRectificationOrder) {
+//        String auditResult = hygfRectificationOrder.getAuditResult();
+//
+//        //查询当前并网数据
+//        LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+//        BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
+//
+//        if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
+//            throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
+//        }
+//
+//        //修改整改单状态
+//        hygfRectificationOrder.setRectificationStatus(auditResult.equals("通过")?WorkOrderEnum.已完成.getCode():WorkOrderEnum.待整改.getCode());
+//        rectificationOrderAuditingService.nextTaskAduit(hygfRectificationOrder);
+//        //查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
+//        LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
+//        wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
+//        wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待提交","已作废","已完成"));
+//        wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
+//        List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
+//
+//        //修改并网状态
+//        //片区不存在并行 无需复杂判断  工程与设计并行 需要做额外逻辑判断
+//        if (auditResult.equals("通过")){
+//            if (hygfRectificationOrder.getRectificationStatus().equals("bw-area")){
+//                LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
+//                qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+//                qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.PQYYDSH.getCode());
+//                qu.set(BasicGridRecord::getRectificationStatus,null);
+//                basicGridRecordService.update(null,qu);
+//            }else {
+//                LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
+//                qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+//                List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
+//                status.remove(hygfRectificationOrder.getRectificationSource());
+//                if(status.size()<1){
+//                    qu.set(BasicGridRecord::getRectificationStatus,null);
+//                    basicGridRecord.setRectificationStatus(null);
+//                }else {
+//                    qu.set(BasicGridRecord::getRectificationStatus,String.join(",",status));
+//                }
+//                if (CollectionUtil.isEmpty(list)) {
+//                    //若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
+//                    if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() )
+//                            && Objects.isNull(basicGridRecord.getPowerStationEngineeringStatus())){
+//                        basicGridRecord.setGridStatus(GridStatusEnum.ROLESDSH.getCode());
+//                    }else if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() ) ){
+//                        basicGridRecord.setGridStatus(GridStatusEnum.SJDSH.getCode());
+//                    }else {
+//                        basicGridRecord.setGridStatus(GridStatusEnum.GCDSH.getCode());
+//                    }
+//                }else {
+//                    List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
+//                    qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
+//                }
+//                basicGridRecordService.update(null,qu);
+//            }
+//        }else {
+//            //驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
+//            LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
+//            qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+//            if (CollectionUtil.isEmpty(list)) {
+//                List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
+//                qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
+//            }else {
+//                qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+//            }
+//            basicGridRecordService.update(null,qu);
+//        }
+//
+//    }
+//
+//    public void rollback(Long sequenceNbr) {
+//        HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectById(sequenceNbr);
+//        //查询当前并网数据
+//        LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
+//        BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
+//        if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
+//            throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
+//        }
+//        if (hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待提交.getCode()) ||
+//                hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待整改.getCode())){
+//            rectificationOrderAuditingService.rollback(sequenceNbr);
+//            LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
+//            qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+//
+//            List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
+//            status.remove(hygfRectificationOrder.getRectificationSource());
+//            if(status.size()<1){
+//                qu.set(BasicGridRecord::getRectificationStatus,null);
+//                basicGridRecord.setRectificationStatus(null);
+//            }else {
+//                qu.set(BasicGridRecord::getRectificationStatus,String.join(",",status));
+//            }
+//            basicGridRecordService.getBaseMapper().update(null,qu);
+//
+//        }else {
+//            throw new BadRequest("仅单据状态为待提交或待整改时方可作废");
+//        }
+//
+//
+//
+//        if (hygfRectificationOrder.getRectificationSource().equals("bw-area")){
+//            basicGridRecord.setGridStatus(GridStatusEnum.PQYYDSH.getCode());
+//        }else {
+//
+//            //查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
+//            LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
+//            wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());
+//            wr.notIn(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待提交","已作废","已完成"));
+//            wr.ne(BaseEntity::getSequenceNbr,hygfRectificationOrder.getSequenceNbr());
+//            List<HygfRectificationOrder> list = rectificationOrderService.getBaseMapper().selectList(wr);
+//
+//            if (CollectionUtil.isEmpty(list)) {
+//                //若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
+//                if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() )
+//                        && Objects.isNull(basicGridRecord.getPowerStationEngineeringStatus())){
+//                    basicGridRecord.setGridStatus(GridStatusEnum.ROLESDSH.getCode());
+//                }else if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() ) ){
+//                    basicGridRecord.setGridStatus(GridStatusEnum.SJDSH.getCode());
+//                }else {
+//                    basicGridRecord.setGridStatus(GridStatusEnum.GCDSH.getCode());
+//                }
+//            }else {
+//                List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
+//                LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
+//                qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+//                qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
+//                basicGridRecordService.update(null,qu);
+//            }
+//        }
+//        basicGridRecordService.updateById(basicGridRecord);
+//    }
+
 }
\ 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/BasicGridAcceptanceServiceImpl.java

@@ -78,7 +78,7 @@ public class BasicGridAcceptanceServiceImpl
 	private final String OK = "0";
 	private final String PASS = "5";
 
-	public Page<BasicGridAcceptanceDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
+	public Page<BasicGridRecordDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
 												   String projectAddress, String powerStationCode, String ownersName, String gridStatus,
 												   String gridConnectionTime, String formType) throws Exception {
 		PageHelper.startPage(current, size);
@@ -95,9 +95,9 @@ public class BasicGridAcceptanceServiceImpl
 		map.put("formType", formType);
 		map.put("regionCompanyId", regionCompanyId);
 		map.put("amosDealerId", amosDealerId);
-		List<BasicGridAcceptanceDto> list = basicGridAcceptanceMapper.selectPageList(map);
-		PageInfo<BasicGridAcceptanceDto> page = new PageInfo(list);
-		Page<BasicGridAcceptanceDto> pageNew = new Page<>();
+		List<BasicGridRecordDto> list = basicGridAcceptanceMapper.selectPageList(map);
+		PageInfo<BasicGridRecordDto> page = new PageInfo(list);
+		Page<BasicGridRecordDto> pageNew = new Page<>();
 		pageNew.setCurrent(current);
 		pageNew.setTotal(page.getTotal());
 		pageNew.setSize(size);
@@ -126,21 +126,23 @@ public class BasicGridAcceptanceServiceImpl
 		params.add(dto);
 		actWorkflowBatchDTO.setProcess(params);
 		List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
-		List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
+		List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfos(processTaskDTOS);
 
+		workflowResultDtos.forEach(e->{
+			BasicGridAuditingDto basicGridAuditingDto = new BasicGridAuditingDto();
+			BeanUtils.copyProperties(e, basicGridAuditingDto);
+			basicGridAuditingDto.setPeasantHouseholdId(20248001107L);
+			basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
+			basicGridAuditingService.createWithModel(basicGridAuditingDto);
+		});
 
-		WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
-		BasicGridAuditingDto basicGridAuditingDto = new BasicGridAuditingDto();
-		BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
-		basicGridAuditingDto.setPeasantHouseholdId(20248001107L);
-		basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
-		basicGridAuditingService.createWithModel(basicGridAuditingDto);
 	}
 
 
 	public void zhixing(String approvalStatus,String comment){
 		LambdaQueryWrapper<BasicGridAuditing> query = new LambdaQueryWrapper<>();
 		query.eq(BasicGridAuditing::getPeasantHouseholdId, 20248001107L);
+		query.eq(BasicGridAuditing::getNextNodeKey,"gongchengshenhe");
 		query.orderByDesc(BaseEntity::getRecDate);
 		query.last("limit 1");
 		BasicGridAuditing basicGridAuditing = basicGridAuditingService.getBaseMapper().selectOne(query);
@@ -173,17 +175,20 @@ public class BasicGridAcceptanceServiceImpl
 	@Transactional
 	public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
 
-		BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper
-				.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>()
-						.eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
-		basicGridAcceptance.setGridStatus(GridStatusEnum.JXSGLYDSH.getCode());
+		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper()
+				.selectOne(new LambdaQueryWrapper<BasicGridRecord>()
+						.eq(BasicGridRecord::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
+
 
+		LambdaUpdateWrapper<BasicGridRecord> update = new LambdaUpdateWrapper<>();
+		update.set(BasicGridRecord::getGridStatus,GridStatusEnum.JXSGLYDSH.getCode());
+		update.set(BasicGridRecord::getBasicGridNode,"jxsAdmin");
 		if (grid.getType() != null && "1".equals(grid.getType())) {
 			// 执行工作流
-			StandardDto standardDto = new StandardDto();
-			standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
-			workflow.standard(basicGridAcceptance, standardDto, userId);
-
+		    this.wofkflowExcute(basicGridRecord.getInstanceId(),"0","重新登记");
+			update.set(BasicGridRecord::getPowerStationAreaStatus,null);
+			update.set(BasicGridRecord::getPowerStationDesignStatus,null);
+			update.set(BasicGridRecord::getPowerStationEngineeringStatus,null);
 		} else {
 			//开启工作流 并执行一步
 			ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
@@ -206,14 +211,14 @@ public class BasicGridAcceptanceServiceImpl
 			basicGridAuditingDto.setPeasantHouseholdId(grid.getPeasantHouseholdId());
 			basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
 			basicGridAuditingService.createWithModel(basicGridAuditingDto);
+			update.set(BasicGridRecord::getInstanceId,basicGridAuditingDto.getInstanceId());
 
 			// 线上验收
 			LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
 			up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网中.getCode());
-			long idsk = basicGridAcceptance.getPeasantHouseholdId();
+			long idsk = basicGridRecord.getPeasantHouseholdId();
 			up.eq(PeasantHousehold::getSequenceNbr, idsk);
 			peasantHouseholdMapper.update(null, up);
-
 		}
 
 		//防止重复提交
@@ -226,11 +231,8 @@ public class BasicGridAcceptanceServiceImpl
 		hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
 		hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
 
-		basicGridAcceptanceMapper.updateById(basicGridAcceptance);
-		BasicGridRecord basicGridRecord = new BasicGridRecord();
-		BeanUtils.copyProperties(basicGridAcceptance,basicGridRecord);
-		basicGridRecord.setBasicGridNode("jxsAdmin");
-		basicGridRecordService.saveOrUpdate(basicGridRecord);
+		update.eq(BaseEntity::getSequenceNbr,basicGridRecord.getSequenceNbr());
+		basicGridRecordService.update(null,update);
 		//发起待办
 //		commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
 		return grid;
@@ -468,9 +470,9 @@ public class BasicGridAcceptanceServiceImpl
 
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectById(sequenceNbr);
 				//执行工作流
-		this.wofkflowExcute(instanceId, approvalStatus , comment  );
+		this.wofkflowExcute(instanceId, approvalStatus , comment);
 		//修改并网数据状态
-		basicGridRecord.setGridStatus(GridStatusEnum.PQYYDSH.getCode());
+		basicGridRecord.setGridStatus(approvalStatus.equals("0")?GridStatusEnum.PQYYDSH.getCode():GridStatusEnum.WTG.getCode());
 		basicGridRecord.setBasicGridNode("bw-area");
 		basicGridRecordService.updateById(basicGridRecord);
 	}
@@ -498,26 +500,60 @@ public class BasicGridAcceptanceServiceImpl
 				up.set(BasicGridRecord::getPowerStationDesignStatus,approvalStatus.equals("0")?"通过":"驳回");
 				if (basicGridRecord.getPowerStationEngineeringStatus() != null && basicGridRecord.getPowerStationEngineeringStatus().equals("通过")&&approvalStatus.equals("0") ){
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.YWC.getCode());
+
 					this.wofkflowExcute(instanceId, approvalStatus , comment  );
 					up.set(BasicGridRecord::getBasicGridNode,"all");
-				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() &&approvalStatus.equals("0") ) {
+				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && !basicGridRecord.getRectificationStatus() .contains("bw-engineering") ) {
 					up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.GCDSH.getCode());
-				}else if (basicGridRecord.getPowerStationEngineeringStatus().equals("驳回")){
+				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("bw-engineering") ) {
+					up.set(BasicGridRecord::getBasicGridNode,"bw-engineering");
+					LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
+					query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
+					query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","整改待审核","待提交"));
+					query.eq(HygfRectificationOrder::getRectificationSource,"bw-engineering");
+					HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query);
+					if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
+						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
+					}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
+						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+					}else {
+						up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
+					}
+				}
+				else if (null != basicGridRecord.getPowerStationEngineeringStatus() && basicGridRecord.getPowerStationEngineeringStatus().equals("驳回")){
 					throw new BadRequest("该流程已被工程人员审核驳回，请刷新列表");
+				}else {
+					this.wofkflowExcute(instanceId, approvalStatus , comment  );
 				}
 				break;
 			default:
 				up.set(BasicGridRecord::getPowerStationEngineeringStatus,approvalStatus.equals("0")?"通过":"驳回");
-				if (basicGridRecord.getPowerStationDesignStatus() != null && basicGridRecord.getPowerStationEngineeringStatus().equals("通过")&&approvalStatus.equals("0") ){
+				if (basicGridRecord.getPowerStationDesignStatus() != null && basicGridRecord.getPowerStationDesignStatus().equals("通过")&&approvalStatus.equals("0") ){
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.YWC.getCode());
 					this.wofkflowExcute(instanceId, approvalStatus , comment  );
 					up.set(BasicGridRecord::getBasicGridNode,"all");
-				}else if( null == basicGridRecord.getPowerStationEngineeringStatus() &&approvalStatus.equals("0")  ) {
+				}else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") && !basicGridRecord.getRectificationStatus().contains("bw-bw-design") ) {
 					up.set(BasicGridRecord::getBasicGridNode,"bw-design");
 					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
-				}else if (basicGridRecord.getPowerStationEngineeringStatus().equals("驳回")){
+				}else if( null == basicGridRecord.getPowerStationDesignStatus() &&approvalStatus.equals("0") && basicGridRecord.getRectificationStatus().contains("bw-bw-design") ) {
+					up.set(BasicGridRecord::getBasicGridNode,"bw-design");
+				LambdaQueryWrapper<HygfRectificationOrder> query = new LambdaQueryWrapper<>();
+				query.eq(HygfRectificationOrder::getPeasantHouseholeId,basicGridRecord.getPeasantHouseholdId());
+				query.in(HygfRectificationOrder::getRectificationStatus,Arrays.asList("待整改","整改待审核","待提交"));
+				query.eq(HygfRectificationOrder::getRectificationSource,"bw-design");
+				HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query);
+				if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
+					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.SJDSH.getCode());
+				}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
+					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
+				}else {
+					up.set(BasicGridRecord::getGridStatus,GridStatusEnum.ZGDSH.getCode());
+				}
+				} else if (null != basicGridRecord.getPowerStationDesignStatus() && basicGridRecord.getPowerStationDesignStatus().equals("驳回")){
 					throw new BadRequest("该流程已被设计人员审核驳回，请刷新列表");
+				}else {
+					this.wofkflowExcute(instanceId, approvalStatus , comment  );
 				}
 				break;
 		}
@@ -543,26 +579,22 @@ public class BasicGridAcceptanceServiceImpl
 		LambdaQueryWrapper<BasicGridRecord> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(BasicGridRecord::getPeasantHouseholdId,hygfRectificationOrder.getPeasantHouseholeId());
 		BasicGridRecord basicGridRecord = basicGridRecordService.getBaseMapper().selectOne(wrapper);
-		if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
-			hygfRectificationOrder.setRectificationStatus(WorkOrderEnum.待提交.getCode());
-			rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
+		if (!Objects.isNull(basicGridRecord)&&!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
 			throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
 		}
 
-
-
-
 		String addorSubmit = hygfRectificationOrder.getAddorSubmit();;
 		LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
-		if (basicGridRecord.getRectificationStatus() != null){
+		if (!Objects.isNull(basicGridRecord) && null !=  basicGridRecord.getRectificationStatus() && !basicGridRecord.getRectificationStatus().contains(hygfRectificationOrder.getRectificationSource())){
 			qu.set(BasicGridRecord::getRectificationStatus,basicGridRecord.getRectificationStatus()+","+hygfRectificationOrder.getRectificationSource());
-		}else {
+		}else if (null ==  basicGridRecord.getRectificationStatus() ) {
 			qu.set(BasicGridRecord::getRectificationStatus,hygfRectificationOrder.getRectificationSource());
 		}
 		//修改状态
 		if (addorSubmit.equals("0")){
 			qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.DZG.getCode());
 		}
+		rectificationOrderAuditingService.addRectification(hygfRectificationOrder);
 		qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 		basicGridRecordService.update(null,qu);
 
@@ -618,12 +650,23 @@ public class BasicGridAcceptanceServiceImpl
 		//修改并网状态
 		//片区不存在并行 无需复杂判断  工程与设计并行 需要做额外逻辑判断
 		if (auditResult.equals("通过")){
-			if (hygfRectificationOrder.getRectificationStatus().equals("bw_area")){
+			if (hygfRectificationOrder.getRectificationSource().equals("bw-area")){
 				LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 				qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 				qu.set(BasicGridRecord::getGridStatus,GridStatusEnum.PQYYDSH.getCode());
+				qu.set(BasicGridRecord::getRectificationStatus,null);
 				basicGridRecordService.update(null,qu);
 			}else {
+				LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
+				qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+				List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
+				status.remove(hygfRectificationOrder.getRectificationSource());
+				if(status.size()<1){
+					qu.set(BasicGridRecord::getRectificationStatus,null);
+					basicGridRecord.setRectificationStatus(null);
+				}else {
+					qu.set(BasicGridRecord::getRectificationStatus,String.join(",",status));
+				}
 				if (CollectionUtil.isEmpty(list)) {
 					//若两者状态都为空 说明均为审核 若某一审核状态为空 则审核状态修改为为空审核节点
 						if (Objects.isNull(basicGridRecord.getPowerStationDesignStatus() )
@@ -636,11 +679,9 @@ public class BasicGridAcceptanceServiceImpl
 						}
 				}else {
 					List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
-					LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
-					qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
 					qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.整改待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
-					basicGridRecordService.update(null,qu);
 				}
+				basicGridRecordService.update(null,qu);
 			}
 		}else {
 			//驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
@@ -666,16 +707,30 @@ public class BasicGridAcceptanceServiceImpl
 		if (!basicGridRecord.getBasicGridNode().contains(hygfRectificationOrder.getRectificationSource())){
 			throw new BadRequest("当前流程发生变化，暂时无法操作，请刷新再试");
 		}
-
 		if (hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待提交.getCode()) ||
 				hygfRectificationOrder.getRectificationStatus().equals(WorkOrderEnum.待整改.getCode())){
 			rectificationOrderAuditingService.rollback(sequenceNbr);
+			LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
+			qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
+
+			List<String> status = new ArrayList<>(Arrays.asList(basicGridRecord.getRectificationStatus().split(",")));
+			status.remove(hygfRectificationOrder.getRectificationSource());
+			if(status.size()<1){
+				qu.set(BasicGridRecord::getRectificationStatus,null);
+				basicGridRecord.setRectificationStatus(null);
+			}else {
+				qu.set(BasicGridRecord::getRectificationStatus,String.join(",",status));
+			}
+			basicGridRecordService.getBaseMapper().update(null,qu);
+
 		}else {
 			throw new BadRequest("仅单据状态为待提交或待整改时方可作废");
 		}
 
-		if (hygfRectificationOrder.getRectificationSource().equals("bw_area")){
-			basicGridRecord.setBasicGridNode(GridStatusEnum.PQYYDSH.getCode());
+
+
+		if (hygfRectificationOrder.getRectificationSource().equals("bw-area")){
+			basicGridRecord.setGridStatus(GridStatusEnum.PQYYDSH.getCode());
 		}else {
 
 			//查询是否还有其它类型待整改的整改单存在 若存在后置节点为当前并网状态
@@ -704,7 +759,6 @@ public class BasicGridAcceptanceServiceImpl
 			}
 		}
 		basicGridRecordService.updateById(basicGridRecord);
-
 	}
 
 }

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

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

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

@@ -107,9 +107,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	@Autowired
 	ConstructionRecordsMapper constructionRecordsMapper;
 	@Autowired
-	BasicGridAcceptanceMapper basicGridAcceptanceMapper;
+	BasicGridRecordMapper basicGridRecordMapper;
     @Autowired
-	BasicGridAcceptanceServiceImpl basicGridAcceptanceService;
+	BasicGridRecordServiceImpl basicGridRecordService;
 	@Autowired
 	WorkflowFeignClient workflowFeignClient;
 
@@ -864,9 +864,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		data.setConstructionRecordsList(li);
 		surveyInfoAllDto.setConstructionRecords(data);
 
-		LambdaQueryWrapper<BasicGridAcceptance> quv = new LambdaQueryWrapper();
-		quv.eq(BasicGridAcceptance::getPeasantHouseholdId, peasantHouseholdId);
-		BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(quv);
+		LambdaQueryWrapper<BasicGridRecord> quv = new LambdaQueryWrapper();
+		quv.eq(BasicGridRecord::getPeasantHouseholdId, peasantHouseholdId);
+		BasicGridRecord basicGridAcceptance = basicGridRecordMapper.selectOne(quv);
 
 		// 审核意见
 		if (Objects.nonNull(basicGridAcceptance) && !StringUtils.isEmpty(basicGridAcceptance.getInstanceId())) {
@@ -1218,7 +1218,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			upq1.set(PowerStationEngineeringInfo::getCompletionDate, new Date());
 			powerStationEngineeringInfoMapper.update(null, upq1);
 
-			BasicGridAcceptance dat = new BasicGridAcceptance();
+			BasicGridRecord dat = new BasicGridRecord();
 			dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
 			dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
 			dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
@@ -1232,7 +1232,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 //				if (b == null) {
 //					basicGridAcceptanceMapper.insert(dat);
 //				}
-			basicGridAcceptanceService.saveOrUpdate(dat,new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getPeasantHouseholdId,workOrderPowerStation.getPeasantHouseholdId()));
+			basicGridRecordService.saveOrUpdate(dat,new LambdaQueryWrapper<BasicGridRecord>().eq(BasicGridRecord::getPeasantHouseholdId,workOrderPowerStation.getPeasantHouseholdId()));
 			// 修改派工单状态
 			LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
 			qu1.eq(WorkOrderPowerStation::getWorkOrderId, workOrderPowerStation.getWorkOrderId());

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

@@ -76,6 +76,8 @@ admin.engineering.roleId=1702512052154687489
 admin.area.roleId=1822904567478620161
 admin.design.roleId=1702511991735738370
 admin.deveEngineering.roleId=1702550832882413570
+admin.delerAdmin.roleId=1702512164058718210
+admin.delerKaId.roleId=1702551022574006274