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

@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.PipelineEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgCertificateReplenishMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgCertificateReplenishService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -30,6 +31,7 @@ import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.utils.FileExporter;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
@@ -151,7 +153,8 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
     private final JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
     private final IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
     private final JgCertificateReplenishMapper jgCertificateReplenishMapper;
-    private final  JgResumeInfoServiceImpl jgResumeInfoService;
+    private final JgResumeInfoServiceImpl jgResumeInfoService;
+    private final IdxBizJgProjectContraptionServiceImplService jgProjectContraptionServiceImplService;
 
     /**
      * 用户信息
@@ -822,7 +825,11 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         JSONArray equListsAfterAssembly = new JSONArray();
         for (int i = 0; i < equLists.size(); i++) {
             JSONObject item = equLists.getJSONObject(i);
-            equListsAfterAssembly.add(MapBuilder.<String, Object>create().put("index", i + 1).put("productName", item.getString("PRODUCT_NAME")).put("equCode", item.getString("EQU_CODE")).put("useRegistrationCode", item.getString("USE_ORG_CODE")).put("factoryNum", item.getString("FACTORY_NUM")).build());
+            equListsAfterAssembly.add(MapBuilder.<String, Object>create().put("index", i + 1)
+                    .put("productName", item.getString("PRODUCT_NAME"))
+                    .put("equCode", item.getString("EQU_CODE"))
+                    .put("useRegistrationCode", item.getString("USE_ORG_CODE"))
+                    .put("factoryNum", item.getString("FACTORY_NUM")).build());
         }
         result.put(EQU_LISTS, equListsAfterAssembly);
         result.put("handler", getSelectedOrgInfo().getUserModel().getRealName());
@@ -843,20 +850,31 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
                 .selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>()
                         .eq(JgUseRegistrationManage::getSequenceNbr, sequenceNbr)
                         .eq(JgUseRegistrationManage::getIsDelete, 0)
-                        .select(JgUseRegistrationManage::getUseRegistrationCode,JgUseRegistrationManage::getUseUnitAddress,
-                                JgUseRegistrationManage::getEquUseAddress,JgUseRegistrationManage::getManageType));
+                        .select(JgUseRegistrationManage::getUseRegistrationCode,
+                                JgUseRegistrationManage::getUseUnitAddress,
+                                JgUseRegistrationManage::getEquUseAddress,
+                                JgUseRegistrationManage::getEquListCode,
+                                JgUseRegistrationManage::getManageType));
         HashMap<String, Object> result = new HashMap<>();
         if (ValidationUtil.isEmpty(registrationManage)) {
             return result;
         }
-        List<JSONObject> list = queryEquByCert(registrationManage.getUseRegistrationCode());
-        result.put(EQU_LISTS, list);
-        result.put("whetherVehicleCylinder", list.stream().findFirst().map(j -> j.get(whetherVehicleCylinder))
-                .orElse("0"));
+        //管道查询工程装置信息
+        if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(registrationManage.getEquListCode())) {
+            List<IdxBizJgProjectContraption> projectContraptionDtoList = jgProjectContraptionServiceImplService.queryProConByCertSeq(sequenceNbr);
+            result.put(EQU_LISTS, projectContraptionDtoList);
+        }
+        //非管道信息
+        else{
+            List<JSONObject> list = queryEquByCert(registrationManage.getUseRegistrationCode());
+            result.put(EQU_LISTS, list);
+            result.put("whetherVehicleCylinder", list.stream().findFirst().map(j -> j.get(whetherVehicleCylinder))
+                    .orElse("0"));
+        }
         result.put(useRegistrationCode, registrationManage.getUseRegistrationCode());
         result.put(manageType, registrationManage.getManageType());
         result.put(equUseAddress, "unit".equals(registrationManage.getManageType())
-                        ? registrationManage.getUseUnitAddress() : registrationManage.getEquUseAddress());
+                ? registrationManage.getUseUnitAddress() : registrationManage.getEquUseAddress());
         return result;
     }