feat(jg): 添加装置报废查询功能并修复流程状态判断逻辑

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -151,4 +151,6 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     List<JgUseRegistrationEq> selectListForInstallNoticeDiscard(@Param("records") List<String> records);
 
     List<JgUseRegistrationEq> selectListForSelfDiscard(@Param("records") List<String> records);
+
+    List<String> selectAllScrapedProIds(Set<String> proIds);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -2135,4 +2135,17 @@
             and (a.notice_status <![CDATA[ <> ]]> '6617')
             and a.is_delete = 0
     </select>
+
+    <select id="selectAllScrapedProIds" resultType="java.lang.String">
+        SELECT
+            ui."PROJECT_CONTRAPTION_ID" as projectContractionId
+        FROM idx_biz_jg_use_info ui
+                 INNER JOIN idx_biz_jg_project_contraption pc
+                            ON ui."PROJECT_CONTRAPTION_ID" = pc.sequence_nbr
+        WHERE pc.use_unit_credit_code = #{useUnitCreditCode}
+          AND (pc.use_registration_code IS NOT NULL OR pc.is_first_merge = true)
+        GROUP BY ui."PROJECT_CONTRAPTION_ID"
+        HAVING COUNT(*) = SUM(CASE WHEN ui."EQU_STATE" = '3' THEN 1 ELSE 0 END)
+           AND COUNT(*) > 0
+    </select>
 </mapper>

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

@@ -5011,7 +5011,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 查询流程中的装置
         List<JgUseRegistration> flowIngPros = this.list(new LambdaQueryWrapper<JgUseRegistration>().notIn(JgUseRegistration::getStatus, NOT_FLOWING_STATE).select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraptionId));
         Set<String> proIds = flowIngPros.stream().map(JgUseRegistration::getProjectContraptionId).collect(toSet());
-        if (ValidationUtil.isEmpty(proIds)) {
+        if (!ValidationUtil.isEmpty(proIds)) {
             proIds.remove(null);
             proIds.remove("");
         }
@@ -5052,7 +5052,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 .collect(toSet());
         if (!ValidationUtil.isEmpty(proIds)) {
             // 同时需排除所有管道都已报废的装置id
-            List<String> allScrapedProIds = Lists.newArrayList();
+            List<String> allScrapedProIds = this.baseMapper.selectAllScrapedProIds(proIds);
             proIds.addAll(allScrapedProIds);
             proIds.remove(null);
             proIds.remove("");