1.压力管道批量模式，使用登记开发提交

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

@@ -6,7 +6,6 @@ import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -360,7 +358,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 更新使用信息
         useInfoMapper.update(useInfo, lambda);
         // 更新检验检测信息
-        this.updateOrCreateInspectionDetection(map);
+        this.updateOrCreateInspectionDetection(map, jgUseRegistration, registerInfo);
         // 更新注册登记信息表
         LambdaUpdateWrapper<IdxBizJgRegisterInfo> IdxBizJgRegLambda = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
         IdxBizJgRegLambda.eq(IdxBizJgRegisterInfo::getRecord, map.get("equipId"))
@@ -387,9 +385,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
     }
 
-    private void updateOrCreateInspectionDetection(JSONObject map) {
+    private void updateOrCreateInspectionDetection(JSONObject map, JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo) {
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
         BeanUtil.copyProperties(map, inspectionDetectionInfo);
+        String record = map.get("equipId").toString();
+
+        if("unit".equals(jgUseRegistration.getManageType()) && registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())){
+            // 压力管道逻辑，根据设备record + 检验报告编号判定唯一一条检验流水，有进行更新，无则进行插入
+            saveEquipOfPieLineInspectData(record, inspectionDetectionInfo);
+        } else {
+            // 其他逻辑
             if (map.get("jySeq") != null) {
                 // 更新逻辑
                 InspectionDetectionInfo inspectionDetectionInfoDb = inspectionDetectionInfoMapper.selectById(map.get("jySeq").toString());
@@ -398,10 +403,32 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             } else {
                 // 插入逻辑
                 if (inspectionDetectionInfo.getInspectType() != null && inspectionDetectionInfo.getInspectConclusion() != null) {
-                inspectionDetectionInfo.setRecord(map.get("equipId").toString());
+                    inspectionDetectionInfo.setRecord(record);
+                    inspectionDetectionInfo.setRecDate(new Date());
+                    inspectionDetectionInfo.setSequenceNbr(sequence.nextId() + "");
+                    inspectionDetectionInfoMapper.insert(inspectionDetectionInfo);
+                }
+            }
+        }
+    }
+
+    private void saveEquipOfPieLineInspectData(String record, InspectionDetectionInfo inspectionDetectionInfo) {
+        // 检验机构 + 设备+ 检验报告编号时 ， 是唯一的为了防止老数据有重复的，程序健壮，故使用list进行处理
+        LambdaQueryWrapper<InspectionDetectionInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AbstractEquipBaseEntity::getRecord, record)
+                .eq(!StringUtils.isEmpty(inspectionDetectionInfo.getInspectReportNo()), InspectionDetectionInfo::getInspectReportNo, inspectionDetectionInfo.getInspectReportNo())
+                .eq(InspectionDetectionInfo::getInspectOrgCode, inspectionDetectionInfo.getInspectOrgCode());
+        List<InspectionDetectionInfo> inspectionDetectionInfos = inspectionDetectionInfoMapper.selectList(wrapper);
+        if(inspectionDetectionInfos.isEmpty()){
+            inspectionDetectionInfo.setRecord(record);
             inspectionDetectionInfo.setRecDate(new Date());
             inspectionDetectionInfo.setSequenceNbr(sequence.nextId() + "");
             inspectionDetectionInfoMapper.insert(inspectionDetectionInfo);
+        } else {
+            for (InspectionDetectionInfo inspectionDetectionInfo1 : inspectionDetectionInfos) {
+                Bean.copyExistPropertis(inspectionDetectionInfo, inspectionDetectionInfo1);
+                inspectionDetectionInfo1.setRecDate(new Date());
+                inspectionDetectionInfoMapper.updateById(inspectionDetectionInfo1);
             }
         }
     }
@@ -1011,12 +1038,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     certificateChangeRecordEqService.save(changeRecordEq);
                 }
             }
-
             // 取第一条设备的注册消息--用来获取这一批设备的设备种类/类别/品种
             LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
             lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(mapData.get("equipId")));
             IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
-
+            // 单位办理的压力管道，在完成审批时，将检验信息写入到装置检验信息表
+            savePieLineProjectInspectData(jgUseRegistration, registerInfo, mapData);
             // 生成证书管理表
             generateRegistrationManage(jgUseRegistration, registerInfo, flag, useRegistrationManageSeq);
 
@@ -1027,6 +1054,25 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration));
     }
 
+    private void savePieLineProjectInspectData(JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, JSONObject mapData) {
+        // 单位办理的压力管道，在完成审批时，将检验信息写入到装置检验信息表
+        if("unit".equals(jgUseRegistration.getManageType()) && registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())){
+            IdxBizJgProjectInspection inspectionDetectionInfo = new IdxBizJgProjectInspection();
+            BeanUtil.copyProperties(mapData, inspectionDetectionInfo);
+            if (mapData.get("jySeq") != null) {
+                // 更新逻辑
+                IdxBizJgProjectInspection inspectionDetectionInfoDb = projectInspectionMapper.selectById(mapData.get("jySeq").toString());
+                Bean.copyExistPropertis(inspectionDetectionInfo, inspectionDetectionInfoDb);
+                projectInspectionMapper.updateById(inspectionDetectionInfo);
+            } else {
+                inspectionDetectionInfo.setProjectContraptionId(jgUseRegistration.getProjectContraptionId());
+                inspectionDetectionInfo.setRecDate(new Date());
+                inspectionDetectionInfo.setSequenceNbr(sequence.nextId() + "");
+                projectInspectionMapper.insert(inspectionDetectionInfo);
+            }
+        }
+    }
+
     /**
      * 生成使用登记证变更记录
      *