Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -630,7 +630,7 @@ public class CommonServiceImpl implements ICommonService {
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
         if (result.size() >0 ){
             List<Long> idList= result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
-            String ids = String.join(",",idList.stream().map(x->x.toString()).collect(Collectors.toList()));
+            String ids = idList.stream().map(Object::toString).collect(Collectors.joining(","));
             Systemctl.taskV2Client.delete(ids);
         }
     }

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

@@ -217,6 +217,9 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         // 提交创建待办逻辑
         if ("1".equals(submitType)) {
+            //提交时先删除之前的暂存待办数据
+            commonService.deleteTaskModel(dto.getSequenceNbr()+"");
+            // 创建待办
             TaskModelDto taskModelDto = new TaskModelDto();
             taskModelDto.setFlowCreateDate(dto.getApplyDate());
             taskModelDto.setTaskName(taskName);

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

@@ -389,7 +389,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         JgChangeRegistrationTransfer jgTransfer = new JgChangeRegistrationTransfer();
         LambdaQueryWrapper<JgChangeRegistrationTransfer> lambda = new QueryWrapper<JgChangeRegistrationTransfer>().lambda();
         lambda.eq(JgChangeRegistrationTransfer::getInstanceId, instanceId);
-
+        jgTransfer = this.getOne(lambda);
         ProcessTaskDTO processTask = icmWorkflowService.rollBack(instanceId);
         WorkflowResultDto workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(processTask)).get(0);
         String taskCode = "";
@@ -407,7 +407,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         }
         jgTransfer.setPromoter(reginParams.getUserModel().getUserId());
         jgTransfer.setNextExecutorIds(role);
-        this.update(jgTransfer, lambda);
+        this.updateById(jgTransfer);
         //待办 撤回
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgTransfer));
         jsonObject.put("flowStatus", commonService.getDictionaryCodeByName(jgTransfer.getAuditStatus()));