解决状态显示错误问题.更新业务model为taskMessageModel

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jg.api.dto.TaskMessageDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
@@ -298,12 +299,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 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());
+                taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
                 commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
             }
         } else {
@@ -321,7 +317,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             map.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
             map.put("relationId", jgChangeRegistrationReform.getInstanceId());
             jgChangeRegistrationReform.setNextExecuteUserIds("");
-            map.put("model",jgChangeRegistrationReform);
+            map.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));
             commonServiceImpl.updateTaskModel(map);
         }
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
@@ -417,6 +413,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
             originalData.remove("sequenceNbr");
             originalDataOther.remove("sequenceNbr");
+            originalDataOther.remove("status");
             if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
                 detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
             }
@@ -707,7 +704,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         taskModelDto.setNextExecuteUser(jgChangeRegistrationReform.getNextExecutorIds());
         //跳转路径
 //        taskModelDto.setRoutePath();
-        taskModelDto.setModel(jgChangeRegistrationReform);
+        taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
         return taskModelDto;
     }
 
@@ -726,4 +723,19 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         return workflowResultDto;
     }
 
+    /**
+     * 将jgChangeRegistrationReform转换成TaskModelDto
+     * @param jgChangeRegistrationReform
+     * @return
+     */
+   public TaskMessageDto conveterTaskMessageDTO(JgChangeRegistrationReform jgChangeRegistrationReform) {
+       TaskMessageDto taskMessageDto = new TaskMessageDto();
+       taskMessageDto.setInstanceId(jgChangeRegistrationReform.getInstanceId());
+       taskMessageDto.setStatus(jgChangeRegistrationReform.getStatus());
+       taskMessageDto.setPromoter(jgChangeRegistrationReform.getPromoter());
+       taskMessageDto.setNextExecuteUserIds(jgChangeRegistrationReform.getNextExecuteUserIds());
+       taskMessageDto.setSequenceNbr(jgChangeRegistrationReform.getSequenceNbr());
+       taskMessageDto.setNextExecuteIds(jgChangeRegistrationReform.getNextExecutorIds());
+       return taskMessageDto;
+   }
 }
\ No newline at end of file