feat(jyjc): 报检开发调整

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -683,7 +683,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             // 流程执行时，状态及权限校验
             commonService.checkForExecuteFlow(nextTaskId, instanceId);
             Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
-            JyjcInspectionApplication entity = this.getBaseMapper().selectById(sequenceNbr);
+            JyjcInspectionApplication jyjcInspectionApplication = this.getBaseMapper().selectById(sequenceNbr);
             //组装信息
             TaskResultDTO task = new TaskResultDTO();
             task.setResultCode("approvalStatus");
@@ -693,23 +693,23 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             map.put("approvalStatus", "0");
             task.setVariable(map);
             //执行流程
-            task.setNextExecuteUserCompanyCode(entity.getInspectionUnitCode());
+            task.setNextExecuteUserCompanyCode(jyjcInspectionApplication.getInspectionUnitCode());
             cmWorkflowService.complete(nextTaskId, task);
-            entity.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
+            jyjcInspectionApplication.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
             JyjcInspectionApplicationModel model = new JyjcInspectionApplicationModel();
             model.setStatusName(FlowStatusEnum.TO_BE_FINISHED.getName());
-            entity.setAcceptDate(new Date());
-            entity.setInnerPersonCode(params.getOrDefault("innerPersonCode", "").toString());
+            jyjcInspectionApplication.setAcceptDate(new Date());
+            jyjcInspectionApplication.setInnerPersonCode(params.getOrDefault("innerPersonCode", "").toString());
             String processDescription = (String) params.get("comments");
             if (StringUtils.isNotBlank(processDescription)) {
-                entity.setProcessDescription(processDescription);
-            }
-            entity.setNextExecuteUserIds("");
-            entity.setPromoter("");
-            entity.setNextExecuteIds("");
-            entity.setNextTaskId("");
-            this.updateById(entity);
-            BeanUtils.copyProperties(entity, model);
+                jyjcInspectionApplication.setProcessDescription(processDescription);
+            }
+            jyjcInspectionApplication.setNextExecuteUserIds("");
+            jyjcInspectionApplication.setPromoter("");
+            jyjcInspectionApplication.setNextExecuteIds("");
+            jyjcInspectionApplication.setNextTaskId("");
+            this.updateById(jyjcInspectionApplication);
+            BeanUtils.copyProperties(jyjcInspectionApplication, model);
             TaskV2Model taskV2Model = updateTaskModel(model);
             List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
             List<JyjcInspectionResult> resultModels = new ArrayList<>();
@@ -755,6 +755,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 resultParam.setParamType("IdxBizJgTechParamsPipeline");
                 resultParam.setRecDate(new Date());
                 jyjcInspectionResultParamServiceImpl.save(resultParam);
+                jgResumeInfoDtoList.add(JgResumeInfoDto.builder().applyNo(jyjcInspectionApplication.getApplicationNo())
+                        .businessType(resultModel.getInspectionTypeName())
+                        .businessId(String.valueOf(jyjcInspectionApplication.getSequenceNbr()))
+                        .changeContent(resultModel.getInspectionTypeName() + "业务办理")
+                        .equId(resultModel.getEquipUnicode())
+                        .approvalUnit(model.getInspectionUnitName())
+                        .approvalUnitCode(model.getInspectionUnitCode())
+                        .status("正常")
+                        .routePath(taskV2Model.getRoutePath()).build());
             } else {
                 List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size()).getResult();
                 for (int i = 0; i < applicationEquipModels.size(); i++) {
@@ -785,22 +794,27 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     resultModels.add(resultModel);
                     // TODO 暂存json,在结果录入后，将数据更新技术参数-检验详情使用 考虑兼容老数据
                     // 新增设备履历信息
-                    jgResumeInfoDtoList.add(JgResumeInfoDto.builder().applyNo(entity.getApplicationNo())
+                    jgResumeInfoDtoList.add(JgResumeInfoDto.builder().applyNo(jyjcInspectionApplication.getApplicationNo())
                             .businessType(resultModel.getInspectionTypeName())
-                            .businessId(String.valueOf(entity.getSequenceNbr()))
+                            .businessId(String.valueOf(jyjcInspectionApplication.getSequenceNbr()))
                             .changeContent(resultModel.getInspectionTypeName() + "业务办理")
-                            .equId(applicationEquipModels.get(i).getEquipUnicode()).approvalUnit(model.getInspectionUnitName()).approvalUnitCode(model.getInspectionUnitCode()).status("正常").routePath(taskV2Model.getRoutePath()).build());
+                            .equId(applicationEquipModels.get(i).getEquipUnicode())
+                            .approvalUnit(model.getInspectionUnitName())
+                            .approvalUnitCode(model.getInspectionUnitCode())
+                            .status("正常")
+                            .routePath(taskV2Model.getRoutePath()).build());
                 }
             }
             inspectionResultService.saveOrUpdateBatch(resultModels);
-            // 报检信息推送 TODO
+            // 报检信息推送
             this.pushInspectionApplication(model);
-            this.saveBatchResume(jgResumeInfoDtoList);
             this.createHisAfterReceive(model);
+            // 设备检验履历
+            this.saveBatchResume(jgResumeInfoDtoList);
             // 更新流程中的流程数据
-            commonService.saveExecuteFlowData2Redis(model.getProcessInstanceId(), this.buildInstanceRuntimeData(entity));
+            commonService.saveExecuteFlowData2Redis(model.getProcessInstanceId(), this.buildInstanceRuntimeData(jyjcInspectionApplication));
         } catch (InterruptedException e) {
-            e.printStackTrace();
+           log.error(e.getMessage(), e);
         } finally {
             if (lock.isHeldByCurrentThread()) {
                 lock.unlock();
@@ -840,7 +854,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         try {
             jgFeignClient.saveBatchResume(jgResumeInfoDtoList);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }