Bladeren bron

refactor(equippipescheduling): 简化管道调度查询中的日期字段逻辑

- 移除 NEXT_LEGAL_CHECK_DATE 和 NEXT_YEAR_CHECK_DATE 字段的复杂 CASE WHEN 逻辑
- 直接使用原始日期字段替代 MIN 聚合函数和条件判断
- 删除与日期范围过滤相关的动态 SQL 条件判断
- 保持查询结果的一致性同时提高代码可读性
xuzhancheng 1 maand geleden
bovenliggende
commit
4a2f713109

+ 2 - 12
tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equippipescheduling/EquipPipeSchedulingMapper.xml

@@ -327,18 +327,8 @@
         select eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.UNIT_CODE,eb.UNIT_NAME
         ,eb.PIPE_ADDRESS,eb.CONTACT,eb.CONTACT_PHONE,eb.UNIT_ID,eb.id
         ,eb.PROJECT_NO,eb.PROJECT_NAME,eb.HAS_LEGAL_SCHEDULING,eb.HAS_YEAR_SCHEDULING,eb.PIPE_CATEGORY
-        ,MIN(CASE WHEN eb.NEXT_LEGAL_CHECK_DATE IS NOT NULL
-        <if test="nextDate != null and nextDate.size()>= 2">
-            AND eb.NEXT_LEGAL_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
-        </if>
-        THEN eb.NEXT_LEGAL_CHECK_DATE ELSE NULL END
-        ) AS NEXT_LEGAL_CHECK_DATE
-        ,MIN(CASE WHEN eb.NEXT_YEAR_CHECK_DATE IS NOT NULL
-        <if test="nextDate != null and nextDate.size()>= 2">
-            AND eb.NEXT_YEAR_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
-        </if>
-        THEN eb.NEXT_YEAR_CHECK_DATE ELSE NULL END
-        ) AS NEXT_YEAR_CHECK_DATE
+        ,eb.NEXT_LEGAL_CHECK_DATE
+        ,eb.NEXT_YEAR_CHECK_DATE
         ,scheduling_info.plan_legal_checkdate
         ,scheduling_info.plan_year_checkdate
         from PRESSURE2_EQUIP_PIPE eb