1.修改赋值

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/JgChangeRegistrationNameServiceImpl.java

@@ -313,25 +313,25 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         // 先更新之前的待办
         TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName, operate);
         TaskModelDto taskModelDto = new TaskModelDto();
-        taskModelDto.setTaskDesc("");
-        taskModelDto.setTaskContent(this.buildTaskContent(jgChangeRegistrationName));
+        taskV2Model.setTaskDesc("");
+        taskV2Model.setTaskContent(this.buildTaskContent(jgChangeRegistrationName));
         taskV2Model.setTaskName(taskName);
-        taskModelDto.setTaskDesc("");
-        taskModelDto.setTaskCode(jgChangeRegistrationName.getApplyNo());
+        taskV2Model.setTaskDesc("");
+        taskV2Model.setTaskCode(jgChangeRegistrationName.getApplyNo());
         taskV2Model.setExecuteUserIds(nextUserIds);
         taskV2Model.setRelationId(jgChangeRegistrationName.getInstanceId());
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
-        taskModelDto.setTaskStatus(flowStatusEnum.getCode());
-        taskModelDto.setTaskStatusLabel(flowStatusEnum.getName());
-        taskModelDto.setFlowStatus(this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
-        taskModelDto.setFlowStatusLabel(jgChangeRegistrationName.getAuditStatus());
+        taskV2Model.setTaskStatus(flowStatusEnum.getCode());
+        taskV2Model.setTaskStatusLabel(flowStatusEnum.getName());
+        taskV2Model.setFlowStatus(this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
+        taskV2Model.setFlowStatusLabel(jgChangeRegistrationName.getAuditStatus());
         taskV2Model.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
-        taskModelDto.setStartUser(jgChangeRegistrationName.getCreateUserName());
+        taskV2Model.setStartUser(jgChangeRegistrationName.getCreateUserName());
         taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getName());
-        taskModelDto.setStartDate(jgChangeRegistrationName.getCreateDate());
-        taskModelDto.setStartUserId(jgChangeRegistrationName.getCreateUserId());
-        taskModelDto.setStartUserCompanyName(jgChangeRegistrationName.getUseUnitName());
-        taskModelDto.setExecuteUserIds(nextUserIds);
+        taskV2Model.setStartDate(jgChangeRegistrationName.getCreateDate());
+        taskV2Model.setStartUserId(jgChangeRegistrationName.getCreateUserId());
+        taskV2Model.setStartUserCompanyName(jgChangeRegistrationName.getUseUnitName());
+        taskV2Model.setExecuteUserIds(nextUserIds);
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model,modelDto);
         modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());