新增流程字段相关代码

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java

@@ -278,8 +278,15 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             if(updateTodoAndCreate) {
                 // 上个代办改为已办
                 HashMap<String, Object> map = new HashMap<>();
-                map.put("taskStatus", commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getStatus()));
-                map.put("taskStatusLabel", jgChangeRegistrationReform.getStatus());
+                if("0".equals(operate)){
+                    map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+                    map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+                }else {
+                    map.put("taskStatus", FlowStatusEnum.REJECTED.getCode());
+                    map.put("taskStatusLabel", FlowStatusEnum.REJECTED.getName());
+                }
+                map.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getStatus()));
+                map.put("flowStatusLabel", jgChangeRegistrationReform.getStatus());
                 map.put("relationId", jgChangeRegistrationReform.getInstanceId());
                 TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
                 TaskModelDto taskModelDto = new TaskModelDto();
@@ -304,6 +311,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             HashMap<String, Object> map = new HashMap<>();
             map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
             map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+            map.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+            map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationReform.getInstanceId());
             TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
         }
@@ -619,6 +628,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         return String.format(result,jgChangeRegistrationReform.getEquipListName(), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
     }
 
+    /**
+     * 构建工作台待办实体类
+     * @param jgChangeRegistrationReform
+     * @param processTaskDTO
+     * @return
+     */
     public TaskModelDto getTaskModelDtoList(JgChangeRegistrationReform jgChangeRegistrationReform, ProcessTaskDTO processTaskDTO) {
 
         List<WorkflowResultDto> workflowResultDtoList = commonServiceImpl.buildWorkFlowInfo(Arrays.asList(processTaskDTO));
@@ -675,4 +690,5 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
         return workflowResultDto;
     }
+
 }
\ No newline at end of file