From 9ef61aec5e8b218db9d60941ef3ad576a927338b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 26 四月 2024 11:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
similarity index 72%
copy from modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml
copy to modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
index 9dec2de..b2b188c 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/taskReliability/TaskDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskDao.xml
@@ -5,7 +5,8 @@
 
     <select id="getList" resultType="com.zt.life.modules.mainPart.taskReliability.model.Task">
         select a.*
-        from task a
+        FROM
+        task a
         <where>
             a.is_delete = 0
             and a.product_id=${productId}
@@ -17,5 +18,12 @@
             ORDER BY ${orderBySql}
         </if>
     </select>
+    <select id="getTaskList" resultType="com.zt.life.modules.mainPart.taskReliability.model.Task">
+        select a.id,a.task_name as name
+        from task a
+        where
+        a.is_delete = 0
+        and a.product_id=${productId}
+    </select>
 
 </mapper>

--
Gitblit v1.9.1