fix(jg):管道使用登记功能监管码生成规则修改

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

@@ -964,6 +964,7 @@ public class DataHandlerServiceImpl {
         List<JgUseRegistration> useRegistrations = useRegistrationService.list(
                 new LambdaQueryWrapper<JgUseRegistration>()
                         .isNotNull(JgUseRegistration::getProjectContraptionId)
+                        .isNull(JgUseRegistration::getOriginProjectContraptionIds)
                         .select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraptionId)
         );
 

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

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
@@ -108,6 +110,8 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
     private IdxBizJgConstructionInfoServiceImpl idxBizJgConstructionInfoService;
     @Autowired
     private ESEquipmentCategory esEquipmentCategory;
+    @Autowired
+    private DataDictionaryServiceImpl dataDictionaryServiceImpl;
 
     @Override
     public boolean saveOrUpdateData(IdxBizJgProjectContraption projectContraption) {
@@ -598,13 +602,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
     }
 
     public Map<String, Object> getNewInspectionDetailByRecord(String record) {
-        // 检验检测【一对多，暂时只取最新一条数据】
-        IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = detectionInfoService.queryNewestDetailByRecord(record);
-        Map<String, Object> inspectionDetectionInfoMap = Collections.emptyMap();
-        if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
-                inspectionDetectionInfoMap = Bean.BeantoMap(inspectionDetectionInfo);
-                inspectionDetectionInfoMap.put("inspectReport", JSON.parseArray(inspectionDetectionInfo.getInspectReport()));
-        }
-        return inspectionDetectionInfoMap;
+        IdxBizJgInspectionDetectionInfo info = detectionInfoService.queryNewestDetailByRecord(record);
+        if (info == null) return Collections.emptyMap();
+        Map<String, Object> result = new HashMap<>(Bean.BeantoMap(info));
+        result.put("inspectReport", JSON.parseArray(info.getInspectReport()));
+        result.put("inspectConclusionCode", info.getInspectConclusion());
+        result.put("inspectConclusion", Optional.ofNullable(dataDictionaryServiceImpl.getByCode(info.getInspectConclusion(), "JYJL"))
+                .map(DataDictionary::getName).orElse(""));
+        return result;
     }
 }
\ No newline at end of file