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

@@ -123,9 +123,6 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     UseInfoMapper useInfoMapper;
 
     @Autowired
-    IdxBizJgInspectionDetectionInfoMapper inspectionDetectionInfoMapper;
-
-    @Autowired
     private SnowflakeIdUtil sequence;
 
     @Autowired
@@ -349,22 +346,21 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                         // 2.检验信息更新或者插入
                         IdxBizJgInspectionDetectionInfo info = new IdxBizJgInspectionDetectionInfo();
                         LambdaQueryWrapper<IdxBizJgInspectionDetectionInfo> wrapper = new LambdaQueryWrapper<>();
-                        wrapper.eq(IdxBizJgInspectionDetectionInfo::getInspectReportNo, model.getResultNo());
+                        wrapper.eq(IdxBizJgInspectionDetectionInfo::getResultSeq, model.getSequenceNbr());
                         wrapper.eq(IdxBizJgInspectionDetectionInfo::getRecord, record);
-                        wrapper.eq(IdxBizJgInspectionDetectionInfo::getInspectOrgCode, model.getInspectionUnitCode());
-                        List<IdxBizJgInspectionDetectionInfo> list = inspectionDetectionInfoMapper.selectList(wrapper);
+                        List<IdxBizJgInspectionDetectionInfo> list = idxBizJgInspectionDetectionInfoMapper.selectList(wrapper);
                         if (CollectionUtils.isEmpty(list)) {
                             // 无则插入
                             commonService.buildInspectInfo(model, info, jybgFile, record);
                             info.setSequenceNbr(sequence.nextId() + "");
-                            inspectionDetectionInfoMapper.insert(info);
+                            idxBizJgInspectionDetectionInfoMapper.insert(info);
                             // 对方不查询库 所以无事务操作
                             bizEmqPublisher.sendInspectionMsgAfterSave(info, "insert");
                         } else {
                             // 已经维护过则更新
                             info = list.get(0);
                             commonService.buildInspectInfo(model, info, jybgFile, record);
-                            inspectionDetectionInfoMapper.updateById(info);
+                            idxBizJgInspectionDetectionInfoMapper.updateById(info);
                             // 对方不查询库 所以无事务操作
                             bizEmqPublisher.sendInspectionMsgAfterSave(info, "update");
                         }
@@ -399,17 +395,17 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             IdxBizJgInspectionDetectionInfo info = new IdxBizJgInspectionDetectionInfo();
             QueryWrapper<IdxBizJgInspectionDetectionInfo> wrapper = new QueryWrapper<>();
             wrapper.lambda().eq(IdxBizJgInspectionDetectionInfo::getResultSeq, model.getSequenceNbr());
-            List<IdxBizJgInspectionDetectionInfo> list = inspectionDetectionInfoMapper.selectList(wrapper);
+            List<IdxBizJgInspectionDetectionInfo> list = idxBizJgInspectionDetectionInfoMapper.selectList(wrapper);
             if (CollectionUtils.isEmpty(list)) {
                 commonService.buildInspectInfo(model, info, jybgFile, model.getEquipUnicode());
                 info.setSequenceNbr(sequence.nextId() + "");
-                inspectionDetectionInfoMapper.insert(info);
+                idxBizJgInspectionDetectionInfoMapper.insert(info);
                 // 对方不查询库 所以无事务操作
                 bizEmqPublisher.sendInspectionMsgAfterSave(info, "insert");
             } else {
                 info = list.get(0);
                 commonService.buildInspectInfo(model, info, jybgFile, model.getEquipUnicode());
-                inspectionDetectionInfoMapper.updateById(info);
+                idxBizJgInspectionDetectionInfoMapper.updateById(info);
                 // 对方不查询库 所以无事务操作
                 bizEmqPublisher.sendInspectionMsgAfterSave(info, "update");
             }