改造变更登记撤回修改

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

@@ -167,6 +167,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
         String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
         jgChangeRegistrationReform.setEquipListName(equipListName);
+        jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
+        jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
+        jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
         jgRegistrationHistory.setStatus("new");
         if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
             jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
@@ -210,9 +213,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 // 如果是新启动的流程开启自动访问
                 jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
                 jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
-                jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
-                jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
-                jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
                 ProcessTaskDTO processTaskDTO = startByVariable(jgChangeRegistrationReform);
                 updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
                 List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
@@ -365,9 +365,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
     public void withdraw(String instanceId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
-        LambdaQueryWrapper<JgChangeRegistrationReform> lambda = new QueryWrapper<JgChangeRegistrationReform>().lambda();
-        lambda.eq(JgChangeRegistrationReform::getInstanceId, instanceId);
+        JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(new QueryWrapper<JgChangeRegistrationReform>().eq("instance_id",instanceId));
         ArrayList<String> roleList = new ArrayList<>();
         ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(instanceId);
         WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
@@ -381,7 +379,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgChangeRegistrationReform.setNextTaskId(workflowResultDto.getNextTaskId());
         jgChangeRegistrationReform.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
         jgChangeRegistrationReform.setNextExecutorIds(role);
-        this.update(jgChangeRegistrationReform, lambda);
+        this.getBaseMapper().updateById(jgChangeRegistrationReform);
 //        commonServiceImpl.deleteTaskModel(instanceId);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform));
         jsonObject.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getAuditStatus()));
@@ -389,9 +387,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jsonObject.put("nextTaskId", jgChangeRegistrationReform.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgChangeRegistrationReform.getNextExecutorIds());
         jsonObject.put("taskType",BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
+        jsonObject.put("taskCode",taskCode);
+        jsonObject.put("instanceId",instanceId);
         jsonObject.put("pageType","look");
         //如果创建人等于当前人则打开编辑页面
-        if(jgChangeRegistrationReform.getCreateUserId().equals(reginParams.getUserModel().getUserId())){
+        if(taskCode.equals(WorkFlowStatusEnum.CHANGE_SUBMIT.getCode())){
             jsonObject.put("pageType","edit");
         }
         jsonObject.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));