fix(jg):维修告知bug修改

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

@@ -42,6 +42,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -156,6 +157,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     private JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
     @Autowired
     private JgCertificateChangeRecordEqServiceImpl jgCertificateChangeRecordEqServiceImpl;
+    @Autowired
+    private IdxBizJgProjectContraptionMapper idxBizJgProjectContraptionMapper;
 
     /**
      * 根据sequenceNbr查询
@@ -183,6 +186,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         maintainInfo.put("county", ObjectUtils.isEmpty(notice.getCounty()) ? null : notice.getCounty() + "_" + notice.getCountyName());
         maintainInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCounty() + notice.getStreetName() + notice.getAddress());
         maintainInfo.put("projectContraption", notice.getProjectContraption());
+        maintainInfo.put("projectContraptionId", notice.getProjectContraptionId());
         maintainInfo.put("EQU_LIST_CODE", notice.getEquListCode());
         maintainInfo.put("EQU_CATEGORY_CODE", notice.getEquCategory());
         maintainInfo.put("QUERY_TYPE", "GZ_WX");
@@ -274,11 +278,18 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
     private void setNewEquipInfo(Long sequenceNbr, Map<String, Object> maintainInfo) {
-        List<JgMaintainNoticeEq> jgMaintainNoticeEq = jgMaintainNoticeEqMapper.selectList(new LambdaQueryWrapper<JgMaintainNoticeEq>().eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr));
-        List<String> ids = jgMaintainNoticeEq.stream().map(JgMaintainNoticeEq::getEquId).collect(Collectors.toList());
+        List<String> equIds = jgMaintainNoticeEqMapper.selectList(
+                        new LambdaQueryWrapper<JgMaintainNoticeEq>()
+                                .eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr))
+                .stream()
+                .map(JgMaintainNoticeEq::getEquId)
+                .collect(Collectors.toList());
+        String equListCode = String.valueOf(maintainInfo.get("EQU_LIST_CODE"));
+        String projectContraptionId = String.valueOf(maintainInfo.get("projectContraptionId"));
+        List<Map<String, Object>> deviceList = EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)
+                ? idxBizJgProjectContraptionMapper.selectPipelineList(projectContraptionId)
+                : getEquipListMaps(esEquipmentCategory.findAllById(equIds));
 
-        Iterable<ESEquipmentCategoryDto> esEquipmentCategoryDtos = esEquipmentCategory.findAllById(ids);
-        List<Map<String, Object>> deviceList = getEquipListMaps(esEquipmentCategoryDtos);
         maintainInfo.put("deviceList", deviceList);
     }
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgProjectContraptionMapper.java

@@ -107,4 +107,6 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
      * @return
      */
     List<Map<String, Object>> selectPipelineListPage(@Param("sequenceNbr") String sequenceNbr, @Param("current") int current, @Param("size") int size);
+
+    List<Map<String, Object>> selectPipelineList(@Param("sequenceNbr") String sequenceNbr);
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -206,39 +206,52 @@
         limit #{current},#{size}
     </select>
 
-    <select id="selectPipelineListPage" resultType="java.util.Map">
+    <sql id="Base_Column_List">
         SELECT
-            ibjpc.SEQUENCE_NBR,
-            ibjpc.SEQUENCE_NBR AS PROJECT_CONTRAPTION_ID,
-            ibjpc.PROJECT_CONTRAPTION,
-            ibjpc.EQU_LIST_NAME AS EQU_LIST,
-            ibjpc.EQU_LIST AS EQU_LIST_CODE,
-            ibjpc.EQU_CATEGORY EQU_CATEGORY_CODE,
-            ibjpc.EQU_CATEGORY_NAME EQU_CATEGORY,
-            ibjpc.EQU_DEFINE EQU_DEFINE_CODE,
-            ibjpc.EQU_DEFINE_NAME EQU_DEFINE,
-            ibjpc.DATA_SOURCE,
-            ibjpc.USC_UNIT_CREDIT_CODE,
-            ibjpc.USE_UNIT_CREDIT_CODE,
-            ibjpc.USC_UNIT_NAME,
-            ibjpc.USE_UNIT_NAME,
-            ibjpc.IS_INTO_MANAGEMENT,
-            ibjpc.SUPERVISORY_CODE,
-            ibjpc.USE_REGISTRATION_CODE USE_ORG_CODE,
-            ibjpc.ADDRESS,
-            ibjpc.REC_DATE,
-            ibjpc.ORG_CODE ORG_BRANCH_CODE,
-            ibjpc.ORG_NAME ORG_BRANCH_NAME,
-            ibjpc.EQU_CODE,
-            ibjui.EQU_STATE,
-            ibjtpp."PIPE_NAME" AS PRODUCT_NAME,
-            ibjui.record
+        ibjpc.SEQUENCE_NBR,
+        ibjpc.SEQUENCE_NBR AS PROJECT_CONTRAPTION_ID,
+        ibjpc.PROJECT_CONTRAPTION,
+        ibjpc.EQU_LIST_NAME AS EQU_LIST,
+        ibjpc.EQU_LIST AS EQU_LIST_CODE,
+        ibjpc.EQU_CATEGORY EQU_CATEGORY_CODE,
+        ibjpc.EQU_CATEGORY_NAME EQU_CATEGORY,
+        ibjpc.EQU_DEFINE EQU_DEFINE_CODE,
+        ibjpc.EQU_DEFINE_NAME EQU_DEFINE,
+        ibjpc.DATA_SOURCE,
+        ibjpc.USC_UNIT_CREDIT_CODE,
+        ibjpc.USE_UNIT_CREDIT_CODE,
+        ibjpc.USC_UNIT_NAME,
+        ibjpc.USE_UNIT_NAME,
+        ibjpc.IS_INTO_MANAGEMENT,
+        ibjpc.SUPERVISORY_CODE,
+        ibjpc.USE_REGISTRATION_CODE USE_ORG_CODE,
+        ibjpc.ADDRESS,
+        ibjpc.REC_DATE,
+        ibjpc.ORG_CODE ORG_BRANCH_CODE,
+        ibjpc.ORG_NAME ORG_BRANCH_NAME,
+        ibjpc.EQU_CODE,
+        ibjui.EQU_STATE,
+        ibjtpp."PIPE_NAME" AS PRODUCT_NAME,
+        ibjui.record
+    </sql>
+
+    <select id="selectPipelineListPage" resultType="java.util.Map">
+        <include refid="Base_Column_List" />
+        FROM IDX_BIZ_JG_PROJECT_CONTRAPTION ibjpc
+        LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.PROJECT_CONTRAPTION_ID = ibjpc.SEQUENCE_NBR
+        LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
+        WHERE ibjpc.SEQUENCE_NBR = #{sequenceNbr}
+        ORDER BY ibjtpp.REC_DATE ASC
+        LIMIT #{current}, #{size}
+    </select>
+
+    <select id="selectPipelineList" resultType="java.util.Map">
+        <include refid="Base_Column_List" />
         FROM IDX_BIZ_JG_PROJECT_CONTRAPTION ibjpc
         LEFT JOIN idx_biz_jg_use_info ibjui ON ibjui.PROJECT_CONTRAPTION_ID = ibjpc.SEQUENCE_NBR
         LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
         WHERE ibjpc.SEQUENCE_NBR = #{sequenceNbr}
         ORDER BY ibjtpp.REC_DATE ASC
-        limit #{current},#{size}
     </select>
 
     <select id="selectEquipCount" resultType="java.util.Map">