改造变更登记技术参数回显问题

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

@@ -117,6 +117,8 @@ public class CommonServiceImpl implements ICommonService {
     private static final String basic = "basic";
     // 业务通用发起——告知单详情
     private static final String notice = "notice";
+    // 业务通用发起——技术参数-改造变更登记使用
+    private static final String techInfo = "techInfo";
     // 业务通用发起——安装告知表单key
     private static final String AZGZ_FORM_ID = "1734141426742095873";
     // 业务通用发起——移装变更表单key
@@ -515,6 +517,7 @@ public class CommonServiceImpl implements ICommonService {
     public void invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
         Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
         Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
+        Map<String, Object> techInfoObj = (Map<String, Object>) map.get(techInfo);
         Map<String, Object> provideMap = new HashMap<>();
 
         String type = (String) basicObj.get("type");
@@ -559,6 +562,7 @@ public class CommonServiceImpl implements ICommonService {
                 noticeObj.put("submit", "true");
             }
             noticeObj.put("receiveCompanyCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
+            noticeObj.put("techInfo",techInfoObj);
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgChangeRegistrationReformServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.YZBG.getBusinessCode())) {

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

@@ -89,6 +89,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
 
+    @Autowired
+    private CommonMapper commonMapper;
+
     /**
      * 分页查询
      */
@@ -205,7 +208,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
                 jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
                 jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
-                ProcessTaskDTO processTaskDTO = startByVariable();
+                ProcessTaskDTO processTaskDTO = startByVariable(jgChangeRegistrationReform);
                 updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
                 List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
                 commonServiceImpl.buildTaskModel(taskModelDtoList);
@@ -220,7 +223,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
     }
 
-    public ProcessTaskDTO startByVariable() {
+    public ProcessTaskDTO startByVariable(JgChangeRegistrationReform jgChangeRegistrationReform) {
         ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
         //启动流程
         try {
@@ -228,6 +231,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             dto.setProcessDefinitionKey("renovationRegistrationReviewNew");
             dto.setBusinessKey("submit");
             dto.setCompleteFirstTask(Boolean.TRUE);
+            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             List<ActWorkflowStartDTO> actWorkflowStartDTOList = Arrays.asList(dto);
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             actWorkflowBatchDTO.setProcess(actWorkflowStartDTOList);
@@ -342,6 +346,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 map.put("approvalStatus", "提交");
             }
             dto.setVariable(map);
+            dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
             //执行流程
             processTaskDTO = iCmWorkflowService.complete(taskId, dto);
         } catch (Exception e) {
@@ -407,7 +412,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         Map<String, Object> originalData = new HashMap<>();
 
         if ((detail.get("status").equals("已完成") || detail.get("status").equals("流程结束"))) {
-            originalData = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(equipId);
+            originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
             originalData.remove("sequenceNbr");
             if (!ObjectUtils.isEmpty(detail.get("transformationQualityCertificate"))) {
                 detail.put("transformationQualityCertificate", JSONObject.parse(detail.get("transformationQualityCertificate").toString()));
@@ -464,7 +469,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             //当前数据
             String newData = jgRegistrationHistory.getChangeData();
             //将历史数据更新到技术参数表中
-            IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(newData, IdxBizJgTechParamsElevator.class);
+            JSONObject allData = JSONObject.parseObject(newData);
+            Map<String,Object> techInfo = (Map<String, Object>) allData.get("techInfo");
+            IdxBizJgTechParamsElevator idxBizJgTechParamsElevatorNew = JSONObject.parseObject(JSONObject.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
             BeanUtil.copyProperties(idxBizJgTechParamsElevatorNew, idxBizJgTechParamsElevator, "sequenceNbr", "record");
             idxBizJgTechParamsElevatorMapper.updateById(idxBizJgTechParamsElevator);
             //将历史数据回填到历史记录表中