新增待办逻辑

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

@@ -18,21 +18,16 @@ import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
-import com.yeejoin.amos.boot.module.jg.api.service.IJgRegistrationHistoryService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
-import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
-import com.yeejoin.amos.boot.module.jg.biz.utils.JsonUtils;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -58,8 +53,6 @@ import java.util.stream.Collectors;
 @Service
 public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeRegistrationReformDto, JgChangeRegistrationReform, JgChangeRegistrationReformMapper> implements IJgChangeRegistrationReformService {
     @Autowired
-    WorkFlowFeignService workFlowFeginService;
-    @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
     RedisUtils redisUtils;
@@ -212,7 +205,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 ProcessTaskDTO processTaskDTO = startByVariable();
                 updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
                 List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
-//                commonServiceImpl.buildTaskModel(taskModelDtoList);
+                commonServiceImpl.buildTaskModel(taskModelDtoList);
             }
 
 
@@ -246,6 +239,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     }
 
     public void updateExecuteIds(String instanceId, JgChangeRegistrationReform jgChangeRegistrationReform, String operate, ProcessTaskDTO processTaskDTO) {
+        Boolean updateTodoAndCreate = Boolean.TRUE;
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
         String nextTaskid = Optional.ofNullable(workflowResultDto.getNextTaskId()).orElse("");
@@ -258,6 +252,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             role =Optional.ofNullable(workflowResultDto.getExecutorRoleIds()).orElse("")+","+Optional.ofNullable(workflowResultDto.getNextExecutorRoleIds()).orElse("");
             operate = "0";
             instanceId =workflowResultDto.getInstanceId();
+            updateTodoAndCreate = Boolean.FALSE;
         }
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
             jgChangeRegistrationReform.setNextTaskId(nextTaskid);
@@ -279,6 +274,24 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 jgChangeRegistrationReform.setPromoter(null);
             }
+            if(updateTodoAndCreate) {
+                // 上个代办改为已办
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("taskStatus", commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getStatus()));
+                map.put("taskStatusLabel", jgChangeRegistrationReform.getStatus());
+                map.put("relationId", jgChangeRegistrationReform.getInstanceId());
+                TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
+                TaskModelDto taskModelDto = new TaskModelDto();
+                BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                // 创建新的代办
+                taskModelDto.setModel(jgChangeRegistrationReform);
+                taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
+            }
         } else {
             jgChangeRegistrationReform.setAuditPassDate(new Date());
             jgChangeRegistrationReform.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
@@ -287,6 +300,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             String newUseRegistrationCertificateNumber = getCode(jgChangeRegistrationReform.getSupervisoryCode());
             jgChangeRegistrationReform.setUseRegistrationCode(newUseRegistrationCertificateNumber);
             updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), newUseRegistrationCertificateNumber, jgChangeRegistrationReform.getApplyNo());
+
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+            map.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+            map.put("relationId", jgChangeRegistrationReform.getInstanceId());
+            TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
@@ -337,6 +356,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setPromoter(reginParams.getUserModel().getUserId());
         jgChangeRegistrationReform.setNextExecutorIds(role);
         this.update(jgChangeRegistrationReform, lambda);
+        commonServiceImpl.deleteTaskModel(instanceId);
+        commonServiceImpl.rollbackTask(instanceId);
     }
 
     public void deleteBatch(List<Long> ids) {
@@ -595,7 +616,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
         String result = "来自%s【%s】的业务办理，【申请单号：%s】";
-        return String.format("电梯", jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
+        return String.format(result,"电梯", jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
     }
 
     public TaskModelDto getTaskModelDtoList(JgChangeRegistrationReform jgChangeRegistrationReform, ProcessTaskDTO processTaskDTO) {
@@ -616,7 +637,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         //任务类型
         taskModelDto.setTaskType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
         //任务类型名称
-        taskModelDto.setTaskType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName());
+        taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName());
         //工作流实例id
         taskModelDto.setRelationId(jgChangeRegistrationReform.getInstanceId());
         //执行人id
@@ -633,8 +654,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         taskModelDto.setStartUserCompanyName(jgChangeRegistrationReform.getCreateUserCompanyName());
         //任务发起人发起时间
         taskModelDto.setStartDate(new Date());
+        taskModelDto.setNextExecuteUser(jgChangeRegistrationReform.getNextExecutorIds());
         //跳转路径
 //        taskModelDto.setRoutePath();
+        taskModelDto.setModel(jgChangeRegistrationReform);
         return taskModelDto;
     }