修改单位变更扩展字段赋值

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

@@ -12,10 +12,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.ByteArrayMultipartFile;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
-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.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
@@ -530,7 +527,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             for (JgChangeRegistrationUnit obj : list) {
                 TaskModelDto dto = new TaskModelDto();
-                dto.setModel(obj);
+
+                TaskMessageDto ta = new TaskMessageDto();
+                ta.setInstanceId(obj.getInstanceId());
+                ta.setStatus(obj.getStatus());
+                ta.setPromoter(obj.getPromoter());
+                ta.setNextExecuteUserIds(obj.getNextExecuteUserIds());
+                ta.setSequenceNbr(obj.getSequenceNbr());
+                dto.setModel(ta);
+               // dto.setModel(obj);
                 dto.setFlowCreateDate(new Date());
                 dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
                 dto.setFlowCode(obj.getNextTaskId());
@@ -553,10 +558,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }else {
             for (JgChangeRegistrationUnit obj : list) {
                 TaskModelDto dto = new TaskModelDto();
+                //行数据
                 dto.setModel(obj);
+                //摘要 按原有规则组装
                 dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
+                //申请单号
                 dto.setTaskCode(obj.getApplyNo());
+                //业务类型枚举code值
                 dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
+                ////业务主键
                 dto.setRelationId(obj.getSequenceNbr()+"");
                 modelDtos.add(dto);
             }
@@ -995,7 +1005,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
             taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
             taskModelDto.setStartDate(dto.getCreateDate());
-            taskModelDto.setModel(dto);
+            TaskMessageDto obj = new TaskMessageDto();
+            obj.setInstanceId(dto.getInstanceId());
+            obj.setStatus(dto.getStatus());
+            obj.setPromoter(dto.getPromoter());
+            obj.setNextExecuteUserIds(dto.getNextExecuteUserIds());
+            obj.setSequenceNbr(dto.getSequenceNbr());
+            taskModelDto.setModel(obj);
             commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
         }
     }
@@ -1062,7 +1078,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model, modelDto);
         modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
-        modelDto.setModel(jgChangeRegistrationName);
+        TaskMessageDto obj = new TaskMessageDto();
+        obj.setInstanceId(jgChangeRegistrationName.getInstanceId());
+        obj.setStatus(jgChangeRegistrationName.getStatus());
+        obj.setPromoter(jgChangeRegistrationName.getPromoter());
+        obj.setNextExecuteUserIds(jgChangeRegistrationName.getNextExecuteUserIds());
+        obj.setSequenceNbr(jgChangeRegistrationName.getSequenceNbr());
+        modelDto.setModel(obj);
         // 再插入新代办、数据待定
         commonServiceImpl.buildTaskModel(Collections.singletonList(modelDto));
     }