27466 发货流程添加工作台待办功能

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

@@ -13,7 +13,8 @@ public enum BusinessTypeEnum {
     HYGF_JXS_SH("JXS_SH", "经销商审核"),
     HYGF_DZ_SH("hygf_10001", "电站审核"),
     HYGF_BWYS("hygf_bwys", "并网验收"),
-    HYGF_DZTRRZ("StationFinancing", "电站投融资流程");
+    HYGF_DZTRRZ("StationFinancing", "电站投融资流程"),
+    HYGF_FHGL("DeliveryManagement", "发货管理");
     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/PreparationMoneyServiceImpl.java

@@ -89,9 +89,11 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
     private WorkFlowService workFlowService;
     @Autowired
     private HygfPreparationMoneyAuditingServiceImpl hygfPreparationMoneyAuditingService;
+    @Autowired
+    private CommonServiceImpl commonService;
 
     private static final String regionRedis = "app_region_redis";
-    private static final String PROCESSKEY = "DeliveryManagement";
+//    private static final String PROCESSKEY = "DeliveryManagement";
 
     /**
      * 分页查询
@@ -566,7 +568,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> params = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey(PROCESSKEY);
+                dto.setProcessDefinitionKey(BusinessTypeEnum.HYGF_FHGL.getCode());
                 dto.setBusinessKey(String.valueOf(new Date().getTime()));
                 dto.setCompleteFirstTask(true);
                 HashMap<String, Object> map = new HashMap<>();
@@ -576,7 +578,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 actWorkflowBatchDTO.setProcess(params);
                 List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
                 List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-
+                //发起待办
+                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
                 WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
                 HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
                 BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
@@ -645,7 +648,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> params = new ArrayList<>();
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey(PROCESSKEY);
+                dto.setProcessDefinitionKey(BusinessTypeEnum.HYGF_FHGL.getCode());
                 dto.setBusinessKey(String.valueOf(new Date().getTime()));
                 dto.setCompleteFirstTask(true);
                 HashMap<String, Object> map = new HashMap<>();
@@ -655,7 +658,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 actWorkflowBatchDTO.setProcess(params);
                 List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
                 List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
-
+                //发起待办
+                commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
                 WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
                 HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
                 BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
@@ -845,7 +849,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             preparationMoneyMapper.updateById(model);
 
             //执行工作流并保存记录 上传收货走入下一节点 表达式=0
-            this.wofkflowExcute(instanceId, "0","");
+            this.wofkflowExcute(instanceId, "0","",model);
         }
     }
 
@@ -881,11 +885,11 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         preparationMoneyMapper.updateById(model);
 
         //执行工作流并保存记录
-        this.wofkflowExcute(instanceId, kv.getOrDefault("approvalStatus", "").toString(),kv.getOrDefault("comment","").toString());
+        this.wofkflowExcute(instanceId, kv.getOrDefault("approvalStatus", "").toString(),kv.getOrDefault("comment","").toString(),model);
     }
 
 
-    public void wofkflowExcute(String instanceId, String approvalStatus,String comment) {
+    public void wofkflowExcute(String instanceId, String approvalStatus,String comment,Object model) {
         LambdaQueryWrapper<HygfPreparationMoneyAuditing> query = new LambdaQueryWrapper<>();
         query.eq(HygfPreparationMoneyAuditing::getInstanceId, instanceId);
         query.orderByDesc(BaseEntity::getRecDate);
@@ -906,6 +910,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         ProcessTaskDTO processTaskDTO = workFlowService.complete(hygfPreparationMoneyAuditing.getNextTaskId(), task);
         List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+        //更新待办
+        workflowResultDto.setInstanceId(instanceId);
+        updatePreparationMoneyTask(model,workflowResultDto);
         BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
         preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId());
         preparationMoneyAuditpDto.setPromoter(hygfPreparationMoneyAuditing.getPromoter());
@@ -915,6 +922,19 @@ 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();
@@ -926,7 +946,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         PreparationMoney preparationMoney = preparationMoneyMapper.selectById(preparationMoneyId);
         preparationMoney.setOrderStatus("申请补货");
         preparationMoneyMapper.updateById(preparationMoney);
-        this.wofkflowExcute(auditing.getInstanceId(), "1","");
+        this.wofkflowExcute(auditing.getInstanceId(), "1","",preparationMoney);
     }
 
 
@@ -948,6 +968,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         ProcessTaskDTO processTaskDTO = workFlowService.rollBackTask(hygfPreparationMoneyAuditing.getInstanceId());
         List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
         WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
+        workflowResultDto.setInstanceId(hygfPreparationMoneyAuditing.getInstanceId());
+        //更新待办
+        updatePreparationMoneyTask(preparationMoney,workflowResultDto);
         HygfPreparationMoneyAuditingDto preparationMoneyAuditpDto = new HygfPreparationMoneyAuditingDto();
         BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
         preparationMoneyAuditpDto.setPreparationMoneyId(sequenceNbr);
@@ -979,7 +1002,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         }else {
             preparationMoney.setOrderStatus(DeliveryStateeEnum.待确认.getName());
         }
-        this.wofkflowExcute(kv.get("instanceId").toString(), kv.get("approvalStatus").toString(),kv.getOrDefault("comment","").toString());
+        this.wofkflowExcute(kv.get("instanceId").toString(), kv.get("approvalStatus").toString(),kv.getOrDefault("comment","").toString(),preparationMoney);
     }
 
     public PreparationMoney  submitOrder(PreparationMoney model, String instanceId, String isSubmit){
@@ -993,7 +1016,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
             up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.待收货.getName());
             up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.待收货.getName());
-            this.wofkflowExcute(instanceId,isSubmit,"");
+            this.wofkflowExcute(instanceId,isSubmit,"",model);
         }
 
         //电站信息存储

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

@@ -142,5 +142,29 @@
     "pageType": "",
     "name": "整改单",
     "url": "/mixuap?appId=1677158789557547009&id=1747168313215053826"
+  },
+  {
+    "type": "fh_dtj",
+    "pageType": "",
+    "name": "待发货",
+    "url": ""
+  },
+  {
+    "type": "fh_dyr",
+    "pageType": "",
+    "name": "待确认",
+    "url": ""
+  },
+  {
+    "type": "fh_dsh",
+    "pageType": "",
+    "name": "待审核",
+    "url": ""
+  },
+  {
+    "type": "fh_sqbh",
+    "pageType": "",
+    "name": "申请补货",
+    "url": ""
   }
 ]
\ No newline at end of file