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

@@ -285,9 +285,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 .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)
+                ? idxBizJgProjectContraptionMapper.selectPipelineList(equIds)
                 : getEquipListMaps(esEquipmentCategory.findAllById(equIds));
 
         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

@@ -108,5 +108,5 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
      */
     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);
+    List<Map<String, Object>> selectPipelineList(@Param("equIds") List<String> equIds);
 }
\ 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

@@ -246,10 +246,13 @@
 
     <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
+        FROM idx_biz_jg_use_info ibjui
+        LEFT JOIN IDX_BIZ_JG_PROJECT_CONTRAPTION ibjpc 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}
+        WHERE ibjui.record in
+        <foreach collection ='equIds' item='equId' index='index' open="(" close= ")" separator=",">
+            #{equId}
+        </foreach>
         ORDER BY ibjtpp.REC_DATE ASC
     </select>