修改待办

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

@@ -151,7 +151,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
             //发起待办
             WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
             workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
-            updateAcceptanceTask(basicGridAcceptanc, workflowResultDto);
+            commonService.updateTaskModelAndAddTask(basicGridAcceptanc, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
             basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
 
             //线上验收
@@ -165,17 +165,4 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         }
     }
 
-    private void updateAcceptanceTask(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/CommonServiceImpl.java

@@ -256,6 +256,7 @@ public class CommonServiceImpl {
      * flowCode 任务id
      **/
     public TaskV2Model updateTaskModel(Map<String, Object> params) {
+        try {
             String exeUserId = RequestContext.getExeUserId();
             List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
             List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
@@ -309,6 +310,10 @@ public class CommonServiceImpl {
             collect.get(0).setCreateDate(new Date());
             collect.get(0).setStartDate(new Date());
             return collect.get(0);
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return null;
     }
 
 

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

@@ -425,7 +425,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			//更新待办
 			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
 			workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
-			updatePowerStationTask(powerStation, workflowResultDto);
+			commonService.updateTaskModelAndAddTask(powerStation, workflowResultDto,BusinessTypeEnum.HYGF_DZ_SH);
 			powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
 			if (!flag) {
 				// 更新农户状态
@@ -534,17 +534,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 //        return code;
 	}
 
-    private void updatePowerStationTask(PowerStation powerStation, 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", powerStation);
-        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH)));
-    }
 
 
     public WorkDto getNodeInfoCode(String flowTaskId) {

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

@@ -704,7 +704,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             //更新待办
             WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
             workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId());
-            updateUnitInfoTask(unitInfo, workflowResultDto);
+            commonService.updateTaskModelAndAddTask(unitInfo, workflowResultDto,BusinessTypeEnum.HYGF_JXS_SH);
 
 
         }catch (Exception e){
@@ -845,18 +845,6 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         return code;
     }
 
-        private void updateUnitInfoTask(UnitInfo unitInfo, 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", unitInfo);
-        updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
-        commonService.updateTaskModel(updateTaskParam);
-        commonService.buildTaskModel((commonService.buildTaskModelDto(unitInfo, workflowResultDto, BusinessTypeEnum.HYGF_JXS_SH)));
-    }
-
     @Override
     public IPage<CompanyDto> getCompanyDto(CompanyDto dto) {
         //列表数据组装