From f71cea3609c4c7bf0b70c77b2c9d8c571586df33 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 02 九月 2025 14:24:26 +0800
Subject: [PATCH] 二保定时任务修改

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 9e91f39..1cc5d47 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -77,6 +77,23 @@
         on e.id = ext.id
         ${ew.customSqlSegment}
     </select>
+
+    <select id="selectSecondMaintenanceEquipmentList" resultType="org.jeecg.modules.eam.entity.EamEquipment">
+        select e.*,
+               ext.latest_second_maintenance,
+               ext.next_second_maintenance,
+               ext.technology_status,
+               ext.third_maintenance_period,
+               ext.technology_check_period,
+               ext.latest_technology_check,
+               ext.next_technology_check,
+               ext.technology_generate_flag
+        from eam_equipment e
+                 left join eam_equipment_extend ext
+                           on e.id = ext.id
+            ${ew.customSqlSegment}
+    </select>
+
     <select id="echartsList" resultType="org.jeecg.modules.eam.dto.EchartsDto">
         WITH TotalCount AS (
         SELECT COUNT(a.id) AS total_count
@@ -96,7 +113,7 @@
         tc.total_count AS "total"
         FROM sys_dict c
         LEFT JOIN sys_dict_item item ON c.id = item.dict_id
-        LEFT JOIN eam_equipment_extend t ON t.technology_status = item.item_value COLLATE Chinese_PRC_CI_AS
+        LEFT JOIN eam_equipment_extend t ON t.technology_status = item.item_value
         <if test="ids != null and ids != ''">
             AND t.id IN
             <foreach collection="ids" item="id" index="index" open="(" close=")" separator=",">

--
Gitblit v1.9.3