1.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

@@ -550,7 +550,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
             }
             // 流程执行时，状态及权限校验
-            commonService.checkForExecuteFlow(nextTaskId, instanceId);
+//            commonService.checkForExecuteFlow(nextTaskId, instanceId);
             Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
             JyjcInspectionApplication entity = this.getBaseMapper().selectById(sequenceNbr);
             //组装信息
@@ -623,7 +623,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             inspectionResultService.saveOrUpdateBatch(resultModels);
             // 报检信息推送
             this.pushInspectionApplication(model);
-            jgFeignClient.saveBatchResume(jgResumeInfoDtoList);
+            this.saveBatchResume(jgResumeInfoDtoList);
             // 更新流程中的流程数据
             commonService.saveExecuteFlowData2Redis(model.getInstanceId(), this.buildInstanceRuntimeData(entity));
         } catch (InterruptedException e) {
@@ -635,6 +635,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
     }
 
+
+    private void saveBatchResume( List<JgResumeInfoDto> jgResumeInfoDtoList){
+        try {
+            jgFeignClient.saveBatchResume(jgResumeInfoDtoList);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     private void setResultTypeByBizType(JyjcInspectionResult resultModel, String bizType) {
         // 由于一个检验检测单位可以申请开通检验、检测两个申请，即确定一个 开通申请的维度为：单位编码 + 开通业务类型
         // 但是表里面放的使用单位的公司编码，导致无法匹配到正确的开通申请,故按照单位编码+ 开通类型 + 状态查询开通申请