提交工作台

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

@@ -14,7 +14,12 @@ public enum BusinessTypeEnum {
     HYGF_DZ_SH("hygf_10001", "电站审核"),
     HYGF_BWYS("hygf_bwys", "并网验收"),
     HYGF_DZTRRZ("StationFinancing", "电站投融资流程"),
-    HYGF_FHGL("DeliveryManagement", "发货管理");
+    HYGF_FHGL("DeliveryManagement", "发货管理"),
+    HYGF_ZGDSHLC("RectificationAudit", "整改单审核流程"),
+    HYGF_YSLC("AcceptanceCheck", "验收流程"),
+    HYGF_BWLC("GridConnected", "并网流程"),
+    HYGF_SGLCSH("ProcessEngineering", "施工流程审核"),
+    ;
     private final String code;
 
     private final String name;

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

@@ -10,10 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.BusinessWorkflowKey;
-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.Enum.*;
 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.AcceptanceCheckMapper;
@@ -69,6 +66,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     FinancingInfoServiceImpl financingInfoService;
     @Autowired
     FinancingAuditingServiceImpl financingAuditingService;
+    @Autowired
+    CommonServiceImpl commonService;
 
 
     public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
@@ -173,6 +172,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             long idsk = basicGridRecord.getPeasantHouseholdId();
             up.eq(PeasantHousehold::getSequenceNbr, idsk);
             peasantHouseholdMapper.update(null, up);
+            //发起待办
+            workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
+            commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_YSLC));
         }
 
         //防止重复提交
@@ -187,8 +189,6 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 
         update.eq(BaseEntity::getSequenceNbr,basicGridRecord.getSequenceNbr());
         this.update(null,update);
-        //发起待办
-//		commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
 
         ConstructionAcceptanceRecords da = new ConstructionAcceptanceRecords(model.get("realName").toString(), "提交验收审核",
                 new Date(), "", basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
@@ -232,8 +232,12 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             basicGridAuditingDto.setInstanceId(basicGridAuditing.getInstanceId());
         }
         acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
+        //更新待办
+        workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
+        commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_YSLC);
     }
 
+
     public void completeAdminAudit(Map<String,String> kv) {
         String instanceId = kv.get("instanceId");
         String sequenceNbr = kv.get("sequenceNbr");

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -24,11 +25,11 @@ import com.yeejoin.amos.component.robot.BadRequest;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -154,7 +155,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
             //更新待办
             WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
             workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
-            updateAcceptanceRectificationOrderTask(basicGridAcceptance, workflowResultDto);
+            commonService.updateTaskModelAndAddTask(basicGridAcceptance, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
             basicGridAcceptanceMapper.updateById(basicGridAcceptance);
             }
         } finally {
@@ -163,16 +164,5 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
         return model;
     }
 
-    private void updateAcceptanceRectificationOrderTask(BasicGridAcceptance basicGridAcceptance, WorkflowResultDto workflowResultDto) {
-        Map<String, Object> updateTaskParam = new HashMap<>();
-        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("model", basicGridAcceptance);
-        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDto, BusinessTypeEnum.HYGF_BWYS)));
-    }
 }
 

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

@@ -22,7 +22,6 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
 import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
-import io.seata.spring.annotation.GlobalTransactional;
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.component.robot.BadRequest;
 import lombok.extern.slf4j.Slf4j;
@@ -164,13 +163,6 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         } finally {
             redisLockUtil.releaseLock(lockName);
         }
-        //线上验收
-        LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
-        up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线上验收.getCode());
-        long idsk = basicGridAcceptanc.getPeasantHouseholdId();
-        up.eq(PeasantHousehold::getSequenceNbr, idsk);
-        peasantHouseholdMapper.update(null, up);
-
     }
 
     private void updateAcceptanceTask(BasicGridAcceptance basicGridAcceptance, WorkflowResultDto workflowResultDto) {

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

@@ -14,6 +14,8 @@ import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAuditingDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
 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.*;
@@ -24,7 +26,6 @@ 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 io.seata.spring.annotation.GlobalTransactional;
 import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
 import com.yeejoin.amos.component.robot.BadRequest;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
@@ -98,8 +99,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 	private final String PASS = "5";
 
 	public Page<BasicGridRecordDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
-			String projectAddress, String powerStationCode, String ownersName, String gridStatus,
-			String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province)
+											   String projectAddress, String powerStationCode, String ownersName, String gridStatus,
+											   String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province)
 			throws Exception {
 		PageHelper.startPage(current, size);
 		Map<String, Object> map = new HashMap<>();
@@ -250,6 +251,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			long idsk = basicGridRecord.getPeasantHouseholdId();
 			up.eq(PeasantHousehold::getSequenceNbr, idsk);
 			peasantHouseholdMapper.update(null, up);
+			//发起待办
+			workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
+			commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_BWLC));
 		}
 
 		// 防止重复提交
@@ -269,45 +273,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 				basicGridRecord.getSequenceNbr(), basicGridRecord.getWorkOrderPowerStationId(),
 				basicGridRecord.getPeasantHouseholdId(), "");
 		constructionGirdRecords.save(da);
-        //发起待办
-        List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-        WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
-        workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
-        commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDto, BusinessTypeEnum.HYGF_BWYS));
 
         return grid;
 	}
 
-	private List<TaskModelDto> buildBWYSTaskModel(HygfOnGrid grid, BasicGridAcceptance basicGridAcceptance) {
-		List<TaskModelDto> taskModelDtoList = new ArrayList<>();
-		TaskModelDto taskModelDto = new TaskModelDto();
-		taskModelDto.setFlowCode(basicGridAcceptance.getNextTaskId());
-		taskModelDto.setFlowCreateDate(new Date());
-		taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-		taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-		taskModelDto.setPageType(null);
-		taskModelDto.setExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
-		taskModelDto.setModel(grid);
-		taskModelDto.setRelationId(basicGridAcceptance.getInstanceId());
-		taskModelDto.setRoutePath(null);
-		taskModelDto.setStartUserId(basicGridAcceptance.getRecUserId());
-		taskModelDto.setStartUser(basicGridAcceptance.getRecUserName());
-		taskModelDto.setStartDate(basicGridAcceptance.getRecDate());
-		taskModelDto.setStartUserCompanyName(null);
-		taskModelDto.setTaskName(basicGridAcceptance.getNextNodeName());
-		taskModelDto.setTaskCode(String.valueOf(basicGridAcceptance.getWorkOrderId()));
-		taskModelDto.setTaskType(BusinessTypeEnum.HYGF_BWYS.getCode());
-		taskModelDto.setTaskTypeLabel(BusinessTypeEnum.HYGF_BWYS.getName());
-		taskModelDto.setTaskStatus(TaskStatusEnum.UNDERWAY.getValue());
-		taskModelDto.setTaskStatusLabel(TaskStatusEnum.UNDERWAY.getName());
-//        taskModelDto.setTaskDesc();
-//        taskModelDto.setTaskContent();
-		taskModelDto.setNextExecuteUser(basicGridAcceptance.getNextExecutorIds());
-		taskModelDtoList.add(taskModelDto);
-		return taskModelDtoList;
-
-	}
-
 	public HygfOnGrid modifyEntity(HygfOnGrid grid) {
 		onGridMapper.updateById(grid);
 		return grid;
@@ -455,7 +424,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
             taskResultDTO.setVariable(variableMap);
             ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptanc, taskResultDTO, userId);
 
-            if (workBasicGridAcceptance.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
+            if (basicGridAcceptanc.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
 				// 线下验收
 				LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
 				up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线下验收.getCode());
@@ -465,11 +434,11 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			}
 
 			// 验收完成
-			System.out.println("验收完成===============================" + workBasicGridAcceptance.getNextTaskId());
+			System.out.println("验收完成===============================" + basicGridAcceptanc.getNextTaskId());
 			System.out.println(
-					"验收完成888888===============================" + workBasicGridAcceptance.getAcceptanceStatus());
+					"验收完成888888===============================" + basicGridAcceptanc.getAcceptanceStatus());
 
-			if ("10".equals(workBasicGridAcceptance.getAcceptanceStatus())) {
+			if ("10".equals(basicGridAcceptanc.getAcceptanceStatus())) {
 				// 更新状态
 				LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
 				up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.验收完成.getCode());
@@ -479,7 +448,11 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 
 			}
 
-			basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
+			basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
+			//更新待办
+			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+			workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
+			commonService.updateTaskModelAndAddTask(basicGridAcceptanc,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
 		} finally {
 			redisLockUtil.releaseLock(lockName);
 		}
@@ -519,6 +492,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			basicGridAuditingDto.setInstanceId(basicGridAuditing.getInstanceId());
 		}
 		basicGridAuditingService.createWithModel(basicGridAuditingDto);
+		//更新待办
+		workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
+		commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
 	}
 
 	public void completeAdminAudit(Map<String, String> kv) {
@@ -977,13 +953,4 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		return CommonResponseNewUtil.success();
 	}
 
-    /**
-     * 此处先更新完成待办然后在新增待办
-     * @param basicGridAcceptance
-     * @param workflowResultDto
-     */
-    private void updateBasicGridAcceptanceTask(BasicGridAcceptance basicGridAcceptance, WorkflowResultDto workflowResultDto) {
-       updateBasicGridAcceptanceTaskByInstanceId(basicGridAcceptance,workflowResultDto.getInstanceId());
-        commonService.buildTaskModel((commonService.buildTaskModelDto(basicGridAcceptance, workflowResultDto, BusinessTypeEnum.HYGF_BWYS)));
-    }
 }

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

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.FlowKeyTodoEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HygfWorkOrderStationAuditing;
 import com.yeejoin.amos.boot.module.hygf.api.util.JsonUtils;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.TaskV2FeignService;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
@@ -357,4 +358,22 @@ public class CommonServiceImpl {
 
         return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : "";
     }
+
+    /**
+     * 更新并完成
+     * @param object
+     * @param workflowResultDto
+     * @param businessTypeEnum
+     */
+    public void updateTaskModelAndAddTask(Object object, WorkflowResultDto workflowResultDto, BusinessTypeEnum businessTypeEnum) {
+        Map<String, Object> updateTaskParam = new HashMap<>();
+        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        updateTaskParam.put("model", object);
+        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
+        updateTaskModel(updateTaskParam);
+        buildTaskModel((buildTaskModelDto(object, workflowResultDto, businessTypeEnum)));
+    }
 }
\ No newline at end of file

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

@@ -331,7 +331,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
 
         this.updateById(financingInfo);
-
+        //更新待办
+        workflowResultDto.setInstanceId(financingAuditing.getInstanceId());
+        commonService.updateTaskModelAndAddTask(financingInfo,workflowResultDto,BusinessTypeEnum.HYGF_DZTRRZ);
         //节点为待整改时生成整改单
         if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) {
               this.sendBack(financingInfo.getPeasantHouseholdId());
@@ -363,23 +365,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
     }
 
-    /**
-     * 此处先更新完成待办然后在新增待办
-     * @param financingInfo
-     * @param workflowResultDto
-     */
-    private void updateFinancingInfoTask(FinancingInfo financingInfo, WorkflowResultDto workflowResultDto) {
-        Map<String, Object> updateTaskParam = new HashMap<>();
-        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("model", financingInfo);
-        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(financingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ)));
-    }
-
     public List<Map<String, Object>> selectOrgList() {
         return this.getBaseMapper().selectOrgList();
 

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

@@ -21,6 +21,8 @@ import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -392,6 +394,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             powerStation.setNextExecuteUserIds(basicGridAcceptance.getNextExecuteUserIds());
             powerStation.setNextNodeName(basicGridAcceptance.getNextNodeName());
 
+			//更新待办
+			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+			workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
+			updatePowerStationTask(powerStation, workflowResultDto);
 			powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
 			if (!flag) {
 				// 更新农户状态

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

@@ -1041,7 +1041,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
         //更新待办
         workflowResultDto.setInstanceId(instanceId);
-        updatePreparationMoneyTask(model,workflowResultDto);
+        commonService.updateTaskModelAndAddTask(model,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
         BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
         preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId());
         preparationMoneyAuditpDto.setPromoter(hygfPreparationMoneyAuditing.getPromoter());
@@ -1051,19 +1051,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         hygfPreparationMoneyAuditingService.createWithModel(preparationMoneyAuditpDto);
     }
 
-    private void updatePreparationMoneyTask(Object model, WorkflowResultDto workflowResult) {
-        Map<String, Object> updateTaskParam = new HashMap<>();
-        updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        updateTaskParam.put("model", model);
-        updateTaskParam.put("relationId", workflowResult.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(model, workflowResult, BusinessTypeEnum.HYGF_FHGL)));
-
-    }
-
 
     public void replenishmentSubmit(Long preparationMoneyId) {
         LambdaQueryWrapper<HygfPreparationMoneyAuditing> lambda = new LambdaQueryWrapper();
@@ -1099,7 +1086,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
         workflowResultDto.setInstanceId(hygfPreparationMoneyAuditing.getInstanceId());
         //更新待办
-        updatePreparationMoneyTask(preparationMoney,workflowResultDto);
+        workflowResultDto.setInstanceId(preparationMoney.getInstanceId());
+        commonService.updateTaskModelAndAddTask(preparationMoney,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
         HygfPreparationMoneyAuditingDto preparationMoneyAuditpDto = new HygfPreparationMoneyAuditingDto();
         BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
         preparationMoneyAuditpDto.setPreparationMoneyId(sequenceNbr);

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

@@ -6,6 +6,8 @@ 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.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.FlowStatusEnum;
 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;
@@ -42,6 +44,8 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
 
     @Autowired
     private WorkFlowService workFlowService;
+    @Autowired
+    CommonServiceImpl commonService;
 
     private static final String PROCESSKEY = "RectificationAudit";
 
@@ -89,6 +93,8 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
             rectificationOrderAuditingDto.setRectificationOrder(hygfRectificationOrder.getSequenceNbr());
             rectificationOrderAuditingDto.setPromoter(RequestContext.getExeUserId());
             this.createWithModel(rectificationOrderAuditingDto);
+            //发起待办
+            commonService.buildTaskModel(commonService.buildTaskModelDto(rectificationOrderAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_ZGDSHLC));
 
         }
     }
@@ -123,6 +129,9 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
             rectificationOrderAuditingDto.setInstanceId(rectificationOrderAuditing.getInstanceId());
         }
         this.createWithModel(rectificationOrderAuditingDto);
+        //更新待办
+        workflowResultDto.setInstanceId(rectificationOrderAuditing.getInstanceId());
+        commonService.updateTaskModelAndAddTask(rectificationOrderAuditing,workflowResultDto,BusinessTypeEnum.HYGF_ZGDSHLC);
     }
 
 

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

@@ -137,6 +137,8 @@ public class SurveyInformationServiceImpl
 	private RedisLockUtil redisLockUtil;
     //    @Autowired
 //    WorkflowImpl workflow;
+	@Autowired
+	WorkFlowService workFlowService;
     @Autowired
     CommonServiceImpl commonService;
 	@Autowired

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -12,6 +13,7 @@ import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.DealerReviewEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.FlowStatusEnum;
 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.fegin.IdxFeginService;
@@ -134,8 +136,14 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     @Autowired
     PersonnelBusinessMapper personnelBusinessMapper;
 
+//    @Autowired
+//    WorkflowImpl workflow;
     @Autowired
-    WorkflowImpl workflow;
+    WorkFlowService workFlowService;
+    @Autowired
+    CommonServiceImpl commonService;
+    @Autowired
+    AmosRequestContext amosRequestContext;
 
     @Autowired
     UserEmpowerMapper userEmpowerMapper;

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

@@ -128,6 +128,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	BasicGridAcceptanceServiceImpl basicGridAcceptanceService;
 	@Autowired
 	AcceptanceCheckServiceImpl acceptanceCheckService;
+	@Autowired
+	CommonServiceImpl commonService;
 
 	private static final String PROCESSKEY = "ProcessEngineering";
 
@@ -377,6 +379,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 					hygfWorkOrderStationAuditingDto.setWorkOrderPowerStationId(powerStationConstructionData.getWorkOrderPowerStationId());
 					hygfWorkOrderStationAuditingDto.setPromoter(RequestContext.getExeUserId());
 					hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto);
+					//发起待办
+					commonService.buildTaskModel(commonService.buildTaskModelDto(hygfWorkOrderStationAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_SGLCSH));
 				}else {
 					this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode());
 				}
@@ -511,6 +515,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderStationAuditingDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
 		}
 		hygfWorkOrderStationAuditingService.createWithModel(workOrderStationAuditingDto);
+		//更新待办
+		workflowResultDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
+		commonService.updateTaskModelAndAddTask(hygfWorkOrderStationAuditing,workflowResultDto,BusinessTypeEnum.HYGF_SGLCSH);
 	}
 
 	public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/urlInfo.json

@@ -166,5 +166,113 @@
     "pageType": "",
     "name": "申请补货",
     "url": ""
+  },
+  {
+    "type": "Activity_0bs6t4g",
+    "pageType": "",
+    "name": "下发整改单",
+    "url": ""
+  },
+  {
+    "type": "Activity_0ku0pw4",
+    "pageType": "",
+    "name": "填写整改单",
+    "url": ""
+  },
+  {
+    "type": "Activity_0e6eabb",
+    "pageType": "",
+    "name": "整改单审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0bs6t4g",
+    "pageType": "",
+    "name": "验收提交",
+    "url": ""
+  },
+  {
+    "type": "Activity_0ojajec",
+    "pageType": "",
+    "name": "经销商管理员审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0edftmv",
+    "pageType": "",
+    "name": "片区审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_1rjn5s1",
+    "pageType": "",
+    "name": "投融/法务审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0rbc0gc",
+    "pageType": "",
+    "name": "资产审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0bs6t4g",
+    "pageType": "",
+    "name": "并网登记",
+    "url": ""
+  },
+  {
+    "type": "Activity_0r2x1es",
+    "pageType": "",
+    "name": "经销商管理审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_05nlkey",
+    "pageType": "",
+    "name": "片区审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0k4o46e",
+    "pageType": "",
+    "name": "设计审核/工程审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_0bs6t4g",
+    "pageType": "",
+    "name": "施工完成提交",
+    "url": ""
+  },
+  {
+    "type": "Activity_1spujef",
+    "pageType": "",
+    "name": "完工登记提交",
+    "url": ""
+  },
+  {
+    "type": "Activity_16r1828",
+    "pageType": "",
+    "name": "完工自审",
+    "url": ""
+  },
+  {
+    "type": "Activity_1bldcno",
+    "pageType": "",
+    "name": "完工自审-片区运营中心",
+    "url": ""
+  },
+  {
+    "type": "Activity_1yftt2k",
+    "pageType": "",
+    "name": "工程审核",
+    "url": ""
+  },
+  {
+    "type": "Activity_095if3p",
+    "pageType": "",
+    "name": "设计审核",
+    "url": ""
   }
 ]
\ No newline at end of file