fix(jg):特殊登记代码修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -1250,7 +1250,7 @@
         <foreach collection="projectContraptionSeqList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        AND ui.IS_INTO_MANAGEMENT = true
+        --AND ui.IS_INTO_MANAGEMENT = true
         ORDER BY ui.REC_DATE DESC
         )
     </select>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -363,13 +363,14 @@ public class JgUseRegistrationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/jgProjectContraptionPage")
     @ApiOperation(value = "查询指定使用单位下的可用装置，已纳管且使用登记证编号为空或者null", notes = "不包括流程中的")
-    public ResponseModel<IPage<IdxBizJgProjectContraption>> getJgProjectContraptionPage(@RequestParam String useUnitCreditCode,
+    public ResponseModel<IPage<IdxBizJgProjectContraption>> getJgProjectContraptionPage(@RequestParam(value = "useUnitCreditCode") String useUnitCreditCode,
+                                                                                        @RequestParam(value = "dataSource") String dataSource,
                                                                                         @RequestParam(value = "current") int current,
                                                                                         @RequestParam(value = "size") int size) {
         Page<IdxBizJgProjectContraption> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        IPage<IdxBizJgProjectContraption> re = jgUseRegistrationServiceImpl.getJgProjectContraptionPage(useUnitCreditCode, page);
+        IPage<IdxBizJgProjectContraption> re = jgUseRegistrationServiceImpl.getJgProjectContraptionPage(useUnitCreditCode, dataSource, page);
         return ResponseHelper.buildResponse(re);
     }
 

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

@@ -412,10 +412,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         if("unit".equals(jgUseRegistration.getManageType())){
             if (registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())){
+                if(inspectionDetectionInfo.getInspectReportNo() != null && inspectionDetectionInfo.getInspectReport() != null) {
                 // 压力管道逻辑，根据设备record + 检验报告编号判定唯一一条检验流水，有进行更新，无则进行插入
                 String record = equipment.get("record").toString();
                 inspectionDetectionInfo.setInspectConclusion((String) equipment.get("inspectConclusionCode"));
                 saveEquipOfPieLineInspectData(record, inspectionDetectionInfo);
+                }
             }
         } else {
             // 其他逻辑
@@ -1371,7 +1373,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
         LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
-                .eq(JgUseRegistrationManage::getIsDelete, 0);
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .ne(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIZHUXIAO.getName());
         JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.getBaseMapper().selectOne(queryWrapper);
 
         if (!ValidationUtil.isEmpty(jgUseRegistrationManage)) {
@@ -4218,7 +4221,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         this.applicationContext = applicationContext;
     }
 
-    public IPage<IdxBizJgProjectContraption> getJgProjectContraptionPage(String useUnitCreditCode, Page<IdxBizJgProjectContraption> page) {
+    public IPage<IdxBizJgProjectContraption> getJgProjectContraptionPage(String useUnitCreditCode, String dataSource, Page<IdxBizJgProjectContraption> page) {
         // 兼容个人业务
         if(useUnitCreditCode.contains("_")){
             useUnitCreditCode = useUnitCreditCode.split("_")[1];
@@ -4231,7 +4234,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 查询已纳管且使用登记证编号不为空且非流程中的装置
         LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode,useUnitCreditCode);
-        wrapper.eq(IdxBizJgProjectContraption::getIsIntoManagement, true);
+        if (Optional.ofNullable(dataSource).map(ds -> ds.contains("black")).orElse(false)) {
+            wrapper.eq(IdxBizJgProjectContraption::getDataSource, dataSource);
+        } else {
+            wrapper.eq(IdxBizJgProjectContraption::getIsIntoManagement, true);
+        }
         wrapper.eq(IdxBizJgProjectContraption::getEquCategory, "8300");
         wrapper.eq(IdxBizJgProjectContraption::getIsFirstMerge, false);
         wrapper.notIn(!proIds.isEmpty(), BaseEntity::getSequenceNbr, proIds);