注释掉taskV2工作台信息

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

@@ -173,8 +173,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             up.eq(PeasantHousehold::getSequenceNbr, idsk);
             peasantHouseholdMapper.update(null, up);
             //发起待办
-            workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
-            commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_YSLC));
+//            workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
+//            commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_YSLC));
         }
 
         //防止重复提交
@@ -233,8 +233,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         }
         acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
         //更新待办
-        workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
-        commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_YSLC);
+//        workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
+//        commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_YSLC);
     }
 
 

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

@@ -153,9 +153,9 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
             taskResultDTO.setTaskId(basicGridAcceptance.getNextTaskId());
             ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, userId);
             //更新待办
-            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-            workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
-            commonService.updateTaskModelAndAddTask(basicGridAcceptance, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
+//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//            workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
+//            commonService.updateTaskModelAndAddTask(basicGridAcceptance, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
             basicGridAcceptanceMapper.updateById(basicGridAcceptance);
             }
         } finally {

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

@@ -149,9 +149,9 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
             taskResultDTO.setTaskId(basicGridAcceptanc.getNextTaskId());
             ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptanc, taskResultDTO, userId);
             //发起待办
-            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-            workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
-            commonService.updateTaskModelAndAddTask(basicGridAcceptanc, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
+//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//            workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
+//            commonService.updateTaskModelAndAddTask(basicGridAcceptanc, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
             basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
 
             //线上验收

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

@@ -252,8 +252,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 			up.eq(PeasantHousehold::getSequenceNbr, idsk);
 			peasantHouseholdMapper.update(null, up);
 			//发起待办
-			workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
-			commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_BWLC));
+//			workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
+//			commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_BWLC));
 		}
 
 		// 防止重复提交
@@ -450,9 +450,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 
 			basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
 			//更新待办
-			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-			workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
-			commonService.updateTaskModelAndAddTask(basicGridAcceptanc,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
+//			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//			workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
+//			commonService.updateTaskModelAndAddTask(basicGridAcceptanc,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
 		} finally {
 			redisLockUtil.releaseLock(lockName);
 		}
@@ -493,8 +493,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		}
 		basicGridAuditingService.createWithModel(basicGridAuditingDto);
 		//更新待办
-		workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
-		commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
+//		workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
+//		commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
 	}
 
 	public void completeAdminAudit(Map<String, String> kv) {

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

@@ -208,10 +208,10 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                     financingAuditingDto.setPromoter(RequestContext.getExeUserId());
                     financingAuditingService.createWithModel(financingAuditingDto);
                     //发起待办
-                    FinancingInfo newFinancingInfo = new FinancingInfo();
-                    BeanUtils.copyProperties(model, newFinancingInfo);
-                    newFinancingInfo.setStatus(FinancingAuditEnum.待融资审核.getName());
-                    commonService.buildTaskModel(commonService.buildTaskModelDto(newFinancingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ));
+//                    FinancingInfo newFinancingInfo = new FinancingInfo();
+//                    BeanUtils.copyProperties(model, newFinancingInfo);
+//                    newFinancingInfo.setStatus(FinancingAuditEnum.待融资审核.getName());
+//                    commonService.buildTaskModel(commonService.buildTaskModelDto(newFinancingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ));
                 }
                 //批量 兼容审核不通过及整改待推送
                 else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送")   ){
@@ -262,7 +262,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
             this.deleteBySeq(financingInfo.getSequenceNbr());
         }
         //停止流程
-        commonService.deleteTaskModel(processId);
+//        commonService.deleteTaskModel(processId);
     }
 
     @Override
@@ -340,8 +340,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
         this.updateById(financingInfo);
         //更新待办
-        workflowResultDto.setInstanceId(financingAuditing.getInstanceId());
-        commonService.updateTaskModelAndAddTask(financingInfo,workflowResultDto,BusinessTypeEnum.HYGF_DZTRRZ);
+//        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())) {
              if (params.containsKey("isHistory")){

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

@@ -424,9 +424,9 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
             
 			//更新待办
-			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-			workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
-			commonService.updateTaskModelAndAddTask(powerStation, workflowResultDto,BusinessTypeEnum.HYGF_DZ_SH);
+//			WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//			workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
+//			commonService.updateTaskModelAndAddTask(powerStation, workflowResultDto,BusinessTypeEnum.HYGF_DZ_SH);
 			if (!flag) {
 				// 更新农户状态
 				String peasantHouseholdId = powerStation.getPeasantHouseholdId();

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

@@ -667,7 +667,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
                 List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
                 //发起待办
-                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
+//                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
                 WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
                 HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
                 BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
@@ -762,7 +762,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
                 List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
                 //发起待办
-                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
+//                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
                 WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
                 HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
                 BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
@@ -1040,8 +1040,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
         //更新待办
-        workflowResultDto.setInstanceId(instanceId);
-        commonService.updateTaskModelAndAddTask(model,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
+//        workflowResultDto.setInstanceId(instanceId);
+//        commonService.updateTaskModelAndAddTask(model,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
         BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
         preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId());
         preparationMoneyAuditpDto.setPromoter(hygfPreparationMoneyAuditing.getPromoter());
@@ -1086,8 +1086,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
         workflowResultDto.setInstanceId(hygfPreparationMoneyAuditing.getInstanceId());
         //更新待办
-        workflowResultDto.setInstanceId(preparationMoney.getInstanceId());
-        commonService.updateTaskModelAndAddTask(preparationMoney,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
+//        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

@@ -94,7 +94,7 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
             rectificationOrderAuditingDto.setPromoter(RequestContext.getExeUserId());
             this.createWithModel(rectificationOrderAuditingDto);
             //发起待办
-            commonService.buildTaskModel(commonService.buildTaskModelDto(rectificationOrderAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_ZGDSHLC));
+//            commonService.buildTaskModel(commonService.buildTaskModelDto(rectificationOrderAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_ZGDSHLC));
 
         }
     }
@@ -130,8 +130,8 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
         }
         this.createWithModel(rectificationOrderAuditingDto);
         //更新待办
-        workflowResultDto.setInstanceId(rectificationOrderAuditing.getInstanceId());
-        commonService.updateTaskModelAndAddTask(rectificationOrderAuditing,workflowResultDto,BusinessTypeEnum.HYGF_ZGDSHLC);
+//        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/RepaymentServiceImpl.java

@@ -36,6 +36,8 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 还款实现层
@@ -122,7 +124,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
         updateTaskParam.put("model", sequenceNbr);
         updateTaskParam.put("relationId", sequenceNbr);
-        commonService.updateTaskModel(updateTaskParam);
+//        commonService.updateTaskModel(updateTaskParam);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -153,9 +155,9 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
                 Boolean dateSend = betweenDay == 15 || betweenDay == 5 || betweenDay == 0;
                 if (dateSend && repayment.getCronSendState() == RepaymentCronSendStateEnum.SEND.getCode()) {
                     //生成待办
-                    WorkflowResultDto workflowResultDto = new WorkflowResultDto();
-                    workflowResultDto.setInstanceId(String.valueOf(repayment.getSequenceNbr()));
-                    commonService.buildTaskModel(commonService.buildTaskModelDto(repayment, workflowResultDto, BusinessTypeEnum.HYGF_REPAY));
+//                    WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+//                    workflowResultDto.setInstanceId(String.valueOf(repayment.getSequenceNbr()));
+//                    commonService.buildTaskModel(commonService.buildTaskModelDto(repayment, workflowResultDto, BusinessTypeEnum.HYGF_REPAY));
                 }
                 if (repayment.getCronSendState() < 0) {
                     //关闭定时任务
@@ -180,13 +182,11 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
             List<List<Object>> read = reader.read(1);
             List<Repayment> repaymentList = new ArrayList<>();
             for (List<Object> objects : read) {
-                if (objects.size() != 7) {
-                    throw new BadRequest("模板列不是7个");
-                }
+                checkExcel(objects);
                 Repayment repayment = new Repayment();
-                String companyName = (String) objects.get(0);
+                String companyName = String.valueOf(objects.get(0));
                 for (DropDown dropDown : region) {
-                    if (dropDown.getName().equals(companyName)) {
+                    if (companyName.equals(dropDown.getName())) {
                         PrivilegeCompany privilegeCompany = repaymentMapper.getPrivilegeCompanyByOrgCode(dropDown.getOrgCode());
                         if (Objects.nonNull(privilegeCompany)) {
                             repayment.setRegionalCompaniesCode(dropDown.getOrgCode());
@@ -198,7 +198,6 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
                 if (StrUtil.isEmpty(repayment.getCompanyName())) {
                     throw new BadRequest(companyName + ",该用户没有权限");
                 }
-
                 String period = String.valueOf(objects.get(1));
                 String repayDate = String.valueOf(objects.get(2));
                 String rent = String.valueOf(objects.get(3));
@@ -209,11 +208,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
                 repayment.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
                 repayment.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
                 repayment.setPeriod(period);
-                Date date = DateUtils.dateParse(repayDate);
-                if (Objects.isNull(date)){
-                    throw new BadRequest("还款日期格式不对");
-                }
-                repayment.setRepayDate(date.toInstant()
+                repayment.setRepayDate(DateUtils.dateParse(repayDate).toInstant()
                         .atZone(ZoneId.systemDefault())
                         .toLocalDate());
                 repayment.setRent(Double.valueOf(rent));
@@ -233,6 +228,64 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
         }
     }
 
+    private void checkExcel(List<Object> objects) {
+        if (objects.size() != 7) {
+            throw new BadRequest("模板列不是7个");
+        }
+        String companyName = String.valueOf(objects.get(0));
+        if(StrUtil.isEmpty(companyName)){
+            throw new BadRequest("区域公司不能为空");
+        }
+
+        String period = String.valueOf(objects.get(1));
+        if(StrUtil.isEmpty(period)){
+            throw new BadRequest("期次不能为空");
+        }
+        String repayDate = String.valueOf(objects.get(2));
+        if(StrUtil.isEmpty(repayDate)){
+            throw new BadRequest("还款日期不能为空");
+        }
+        Date date = DateUtils.dateParse(repayDate);
+        if (Objects.isNull(date)){
+            throw new BadRequest("还款日期格式不对");
+        }
+        String rent = String.valueOf(objects.get(3));
+        if(StrUtil.isEmpty(rent)){
+            throw new BadRequest("租金不能为空");
+        }
+        String interest = String.valueOf(objects.get(4));
+        if(StrUtil.isEmpty(interest)){
+            throw new BadRequest("利息不能为空");
+        }
+        String principal = String.valueOf(objects.get(5));
+        if(StrUtil.isEmpty(principal)){
+            throw new BadRequest("本金不能为空");
+        }
+        checkMoney(rent,interest,principal);
+        String loanPeriod = String.valueOf(objects.get(6));
+        if(StrUtil.isEmpty(loanPeriod)){
+            throw new BadRequest("放款批次不能为空");
+        }
+    }
+
+    private void checkMoney(String rent, String interest, String principal) {
+        // 定义要匹配的正则表达式
+        String regex = "^([1-9]\\d{0,9}|0)([.]?|(\\.\\d{1,2})?)$";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher rentMatcher = pattern.matcher(rent);
+        if(!rentMatcher.find()){
+            throw new BadRequest("租金金额格式不对");
+        }
+        Matcher interestMatcher = pattern.matcher(interest);
+        if(!interestMatcher.find()){
+            throw new BadRequest("利息金额格式不对");
+        }
+        Matcher principalMatcher = pattern.matcher(principal);
+        if(!principalMatcher.find()){
+            throw new BadRequest("本金金额格式不对");
+        }
+    }
+
     public void exportRepaymentExcel(List<String> sequenceNbrList, HttpServletResponse response) {
         LambdaQueryWrapper<Repayment> wrapper = new LambdaQueryWrapper<>();
         //如果是空值导出全部

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

@@ -352,16 +352,16 @@ public class SurveyInformationServiceImpl
 		return code;
 	}
 
-    private void updateSurveyInformationTask(PowerStation powerStation, String instanceId) {
-        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", instanceId);
-        commonService.updateTaskModel(updateTaskParam);
-    }
+//    private void updateSurveyInformationTask(PowerStation powerStation, String instanceId) {
+//        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", instanceId);
+//        commonService.updateTaskModel(updateTaskParam);
+//    }
 
 	private void submitExamine(PeasantHousehold peasantHousehold) {
 
@@ -397,7 +397,7 @@ public class SurveyInformationServiceImpl
                 ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, requestContext.getUserId());
 
                 basicGridAcceptance.setInstanceId(powerStation.getProcessInstanceId());
-                updateSurveyInformationTask(powerStation, powerStation.getProcessInstanceId());
+//                updateSurveyInformationTask(powerStation, powerStation.getProcessInstanceId());
                 processTaskDTOS.add(processTaskDTO);
             } else {
                 // 第一步启动工作流
@@ -458,9 +458,9 @@ public class SurveyInformationServiceImpl
 			up.eq(PeasantHousehold::getSequenceNbr, idsk);
 			peasantHouseholdMapper.update(null, up);
             //添加待办
-            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(processTaskDTOS).get(0);
-            workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
-            commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH));
+//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(processTaskDTOS).get(0);
+//            workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
+//            commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH));
 		} catch (Exception e) {
 			e.printStackTrace();
 			log.error("submitExamine error:", e);

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

@@ -536,8 +536,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
             dealerReviewService.saveDealerReview(dealerReview, true, false, regUnitInfo.getName(), "任务明细：经销商已上传信息");
             //添加待办
-            List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-            commonService.buildTaskModel(commonService.buildTaskModelDto(dealerReview, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_JXS_SH));
+//            List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
+//            commonService.buildTaskModel(commonService.buildTaskModelDto(dealerReview, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_JXS_SH));
 
         } catch (Exception e){
             throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
@@ -702,9 +702,9 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
             this.saveOrUpdate(unitInfo);
             //更新待办
-            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
-            workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId());
-            commonService.updateTaskModelAndAddTask(unitInfo, workflowResultDto,BusinessTypeEnum.HYGF_JXS_SH);
+//            WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
+//            workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId());
+//            commonService.updateTaskModelAndAddTask(unitInfo, workflowResultDto,BusinessTypeEnum.HYGF_JXS_SH);
 
 
         }catch (Exception e){

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

@@ -381,7 +381,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 					hygfWorkOrderStationAuditingDto.setPromoter(RequestContext.getExeUserId());
 					hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto);
 					//发起待办
-					commonService.buildTaskModel(commonService.buildTaskModelDto(hygfWorkOrderStationAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_SGLCSH));
+//					commonService.buildTaskModel(commonService.buildTaskModelDto(hygfWorkOrderStationAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_SGLCSH));
 				}else {
 					this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode());
 				}
@@ -517,8 +517,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		}
 		hygfWorkOrderStationAuditingService.createWithModel(workOrderStationAuditingDto);
 		//更新待办
-		workflowResultDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
-		commonService.updateTaskModelAndAddTask(hygfWorkOrderStationAuditing,workflowResultDto,BusinessTypeEnum.HYGF_SGLCSH);
+//		workflowResultDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
+//		commonService.updateTaskModelAndAddTask(hygfWorkOrderStationAuditing,workflowResultDto,BusinessTypeEnum.HYGF_SGLCSH);
 	}
 
 	public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) {