1.合并刘林安全追溯逻辑代码代码

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

@@ -180,7 +180,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 model.setPromoter(RequestContext.getExeUserId());
                 model.setNextExecuteUserIds(nextUserIds);
                 model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
-                commonService.saveExecuteFlowData2Redis(model.getInstanceId(),this.buildInstanceRuntimeData(model));
+                commonService.saveExecuteFlowData2Redis(model.getInstanceId(), this.buildInstanceRuntimeData(model));
             } else if (model.getOperationType().equals("1")) {  //  工作台暂存、详情保存逻辑
                 String[] inspectionUnit = model.getInspectionUnitCode().split("_");
                 if (inspectionUnit.length == 2) {
@@ -369,7 +369,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             model.setNextExecuteIds(executorRoleIds);
             model.setNextExecuteUserIds(nextUserIds);
             executeOneStep(model, taskName1, nextUserIds);
-            commonService.saveExecuteFlowData2Redis(model.getInstanceId(),this.buildInstanceRuntimeData(model));
+            commonService.saveExecuteFlowData2Redis(model.getInstanceId(), this.buildInstanceRuntimeData(model));
             this.updateWithModel(model);
         }
         return this.buildRedundancyField(model);
@@ -579,11 +579,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             entity.setNextTaskId("");
             this.updateById(entity);
             BeanUtils.copyProperties(entity, model);
-            updateTaskModel(model);
+            TaskV2Model taskV2Model = updateTaskModel(model);
             List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
             List<JyjcInspectionResult> resultModels = new ArrayList<>();
             List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size()).getResult();
-
+            List<JgResumeInfoDto> jgResumeInfoDtoList = new ArrayList<>();
             for (int i = 0; i < applicationEquipModels.size(); i++) {
                 JyjcInspectionResult resultModel = new JyjcInspectionResult();
                 resultModel.setInspectionUnitCode(model.getInspectionUnitCode());
@@ -608,10 +608,22 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 resultModel.setIsExistNc(false);
                 this.setResultTypeByBizType(resultModel, model.getBizType());
                 resultModels.add(resultModel);
+                // 新增设备履历信息
+                jgResumeInfoDtoList.add(JgResumeInfoDto.builder()
+                        .applyNo(entity.getApplicationNo())
+                        .businessType(resultModel.getInspectionTypeName())
+                        .businessId(String.valueOf(entity.getSequenceNbr()))
+                        .equId(applicationEquipModels.get(i).getEquipUnicode())
+                        .approvalUnit(model.getInspectionUnitName())
+                        .approvalUnitCode(model.getInspectionUnitCode())
+                        .status("正常")
+                        .routePath(taskV2Model.getRoutePath())
+                        .build());
             }
             inspectionResultService.saveOrUpdateBatch(resultModels);
             // 报检信息推送
             this.pushInspectionApplication(model);
+            jgFeignClient.saveBatchResume(jgResumeInfoDtoList);
             // 更新流程中的流程数据
             commonService.saveExecuteFlowData2Redis(model.getInstanceId(), this.buildInstanceRuntimeData(entity));
         } catch (InterruptedException e) {
@@ -938,10 +950,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         queryWrapper.ne(JyjcInspectionApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getCode());
         queryWrapper.ne(JyjcInspectionApplication::getStatus, FlowStatusEnum.TO_BE_DISCARD.getCode());
         queryWrapper.isNotNull(JyjcInspectionApplication::getProcessInstanceId);
-        queryWrapper.select(JyjcInspectionApplication::getProcessInstanceId,JyjcInspectionApplication::getNextTaskId,JyjcInspectionApplication::getPromoter,JyjcInspectionApplication::getNextExecuteUserIds);
+        queryWrapper.select(JyjcInspectionApplication::getProcessInstanceId, JyjcInspectionApplication::getNextTaskId, JyjcInspectionApplication::getPromoter, JyjcInspectionApplication::getNextExecuteUserIds);
         List<JyjcInspectionApplication> jyjcInspectionApplicationsInFlowing = this.list(queryWrapper);
         jyjcInspectionApplicationsInFlowing.forEach(inspectionApplication -> {
-            commonService.saveExecuteFlowData2Redis(inspectionApplication.getProcessInstanceId(),this.buildInstanceRuntimeData(inspectionApplication));
+            commonService.saveExecuteFlowData2Redis(inspectionApplication.getProcessInstanceId(), this.buildInstanceRuntimeData(inspectionApplication));
         });
     }
 }
\ No newline at end of file