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

@@ -231,7 +231,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             dto.setProcessDefinitionKey("renovationRegistrationReviewNew");
             dto.setBusinessKey("submit");
             dto.setCompleteFirstTask(Boolean.TRUE);
-            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
+//            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             List<ActWorkflowStartDTO> actWorkflowStartDTOList = Arrays.asList(dto);
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             actWorkflowBatchDTO.setProcess(actWorkflowStartDTOList);
@@ -346,7 +346,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
-            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
+//            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             //执行流程
             processTaskDTO = iCmWorkflowService.complete(taskId, dto);
         } catch (Exception e) {
@@ -410,16 +410,21 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
         Map<String, Object> detail = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationReform), Map.class);
         Map<String, Object> originalData = new HashMap<>();
+        Map<String, Object> originalDataOther = new HashMap<>();
 
         if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
             originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
+            originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
             originalData.remove("sequenceNbr");
+            originalDataOther.remove("sequenceNbr");
             if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
                 detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
             }
             if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
                 detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
             }
+            detail.putAll(originalDataOther);
+            detail.put("techInfo",originalData);
         } else {
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                     .eq("equ_id", equipId)
@@ -427,8 +432,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                     .eq("registration_class", "改造登记"));
             originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
             originalData.remove("sequenceNbr");
+            detail.putAll(originalData);
         }
-        detail.putAll(originalData);
         return detail;
     }
 

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

@@ -297,6 +297,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 bean.setPromoter(RequestContext.getExeUserId());
                 bean.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
                 executeOneStep(bean, taskName1, nextUserIds, op);
+                bean.setNextExecuteUserIds(nextUserIds);
                 JgChangeRegistrationUnitMapper.updateById(bean);
         }
         } else {
@@ -690,12 +691,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(noticeDto.getInstanceId());
         String nextTaskId = processTaskDTO.getNextTask().get(0).getId();
         this.buildRoleList(Collections.singletonList(processTaskDTO), roleListNext, roleListAll);
+        List<WorkflowResultDto> workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
+
         // 待调整
         taskCode = processTaskDTO.getNextTask().get(0).getKey();
         JgChangeRegistrationUnit JgChangeRegistrationUnit = this.baseMapper.selectById(noticeDto.getSequenceNbr());
         JgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
         JgChangeRegistrationUnit.setPromoter("");
         JgChangeRegistrationUnit.setNextTaskId(nextTaskId);
+        JgChangeRegistrationUnit.setNextExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
         JgChangeRegistrationUnit.setNextExecutorIds(String.join(",", roleListNext));
         JgChangeRegistrationUnitMapper.updateById(JgChangeRegistrationUnit);
         JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(JgChangeRegistrationUnit));
@@ -807,6 +811,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                         jgChangeRegistrationUnit.setInstanceStatus(String.join(",", roleList));
                     }
                     jgChangeRegistrationUnit.setPromoter(userId);
+                    jgChangeRegistrationUnit.setNextExecuteUserIds(nextUserIds);
                     jgChangeRegistrationUnit.setNextTaskId(nextTaskId);
                     jgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
                     executeOneStep(jgChangeRegistrationUnit, taskName1, nextUserIds, op);                }
@@ -814,6 +819,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 jgChangeRegistrationUnit.setPromoter("");
                 jgChangeRegistrationUnit.setNextExecutorIds(String.join(",", roleList));
                 jgChangeRegistrationUnit.setNextTaskId(nextTaskId);
+                jgChangeRegistrationUnit.setNextExecuteUserIds(nextUserIds);
                 jgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
                 executeOneStep(jgChangeRegistrationUnit, taskName1, nextUserIds, op);
             }

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

@@ -429,6 +429,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 dto.setNextExecuteIds(workflowResultDtoList.get(i).getNextExecutorRoleIds());
                 dto.setInstanceStatus(workflowResultDtoList.get(i).getNextExecutorRoleIds() + "," + workflowResultDtoList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
+                dto.setNextExecuteUserIds(workflowResultDtoList.get(i).getNextExecutorUserIds());
             }
             dto.setEquList(obj.get("EQU_LIST").toString());
             dto.setSupervisoryCode(obj.get("SUPERVISORY_CODE").toString());