fix(jg):管道作废列表显示bug处理

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -271,7 +271,7 @@ public class XiAnDataDockServiceImpl {
 
         // 基本信息
         checkNotBlank(data.getEquList(), "设备种类不能为空；", rowError);
-        checkNotBlank(data.getEquCategory(), "设备类别不能为空；", rowError);
+        //checkNotBlank(data.getEquCategory(), "设备类别不能为空；", rowError);
         //checkNotBlank(data.getUseInnerCode(), "单位内编号不能为空；", rowError);
         //if (useInnerCodeList.contains(data.getUseInnerCode())) {
         //    rowError.append("单位内编号不能重复；");
@@ -358,8 +358,8 @@ public class XiAnDataDockServiceImpl {
             }
         }
         // 使用信息
-        checkNotBlank(data.getUseUnitCode(), "使用单位统一社会信用代码不能为空；", rowError);
-        Optional.ofNullable(data.getUseUnitCode()).ifPresent(v -> checkCreditCode(v, "使用单位统一社会信用代码格式不正确；", rowError));
+        //checkNotBlank(data.getUseUnitCode(), "使用单位统一社会信用代码不能为空；", rowError);
+        //Optional.ofNullable(data.getUseUnitCode()).ifPresent(v -> checkCreditCode(v, "使用单位统一社会信用代码格式不正确；", rowError));
         checkNotBlank(data.getUseUnit(), "使用单位名称不能为空；", rowError);
         // 设计信息
         //checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);

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

@@ -388,11 +388,6 @@
                  WHERE c.project_contraption_id = #{projectContraptionId}
                    AND a.is_delete = 0
                    AND a.notice_status != '6617'
-                 UNION ALL
-                 SELECT COUNT(*) AS inUseNumber
-                 FROM tz_jyjc_inspection_application a
-                 WHERE a.project_contraption_id = #{projectContraptionId}
-                   AND a.status != '6617'
              ) AS subquery
     </select>
 
@@ -551,6 +546,17 @@
                    AND a.is_delete = 0
                    AND ( a.notice_status != '6617')
                  GROUP BY c.project_contraption_id
+                 UNION
+                 SELECT
+                     a.project_contraption_id,
+                     COUNT(1) AS inUseNumber
+                 FROM tz_jyjc_inspection_application a
+                 WHERE a.project_contraption_id in
+                    <foreach collection="projectContraptionIdList" item="projectContraptionId" index='index' open="(" close= ")" separator=",">
+                        #{projectContraptionId}
+                    </foreach>
+                   AND ( a.status != '6617')
+                 GROUP BY a.project_contraption_id
              ) GROUP BY project_contraption_id
     </select>
 </mapper>