From ef905363be52c021fe5384b2a5e17600fb1d2928 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 03 三月 2025 14:43:04 +0800
Subject: [PATCH] 运营开发完成资产相关功能,开始开发工单相关内容

---
 java110-db/src/main/resources/mapper/oa/WorkPoolV1ServiceDaoImplMapper.xml |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/oa/WorkPoolV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/oa/WorkPoolV1ServiceDaoImplMapper.xml
index 28c1d84..67015c2 100644
--- a/java110-db/src/main/resources/mapper/oa/WorkPoolV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/oa/WorkPoolV1ServiceDaoImplMapper.xml
@@ -22,7 +22,7 @@
         statusCd,t.store_id,t.store_id storeId,t.work_name,t.work_name workName,t.work_id,t.work_id
         workId,t.wt_id,t.wt_id wtId,t.create_user_tel,t.create_user_tel createUserTel,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId,t.create_time createTime,
-        td.`name` stateName,wt.type_name typeName
+        td.`name` stateName,wt.type_name typeName,wt.deduction
         from work_pool t
         left join work_type wt on t.wt_id = wt.wt_id
         left join t_dict td on t.state = td.status_cd and td.table_name = 'work_pool' and td.table_columns = 'state'
@@ -230,6 +230,12 @@
         <if test="wtId !=null and wtId != ''">
             and t.wt_id= #{wtId}
         </if>
+        <if test="states != null">
+            and wtk.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
 
         <if test="queryStartTime !=null and queryStartTime !=''">
             and wtk.create_time &gt;= #{queryStartTime}
@@ -252,7 +258,7 @@
         createUserId,t.create_user_name,t.create_user_name createUserName,t.status_cd,t.status_cd
         statusCd,t.store_id storeId,t.work_name workName,t.work_id
         workId,t.wt_id wtId,t.create_user_tel createUserTel,wtk.start_time
-        startTime,wtk.end_time endTime,wtk.state,t.community_id communityId,t.create_time createTime,
+        startTime,wtk.end_time endTime,wtk.state,t.community_id communityId,wtk.create_time createTime,
         td.`name` stateName,wt.type_name typeName,wtk.staff_name curStaffName,wtk.task_id taskId
         from work_pool t
         left join work_type wt on t.wt_id = wt.wt_id
@@ -289,7 +295,12 @@
         <if test="wtId !=null and wtId != ''">
             and t.wt_id= #{wtId}
         </if>
-
+        <if test="states != null">
+            and wtk.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="queryStartTime !=null and queryStartTime !=''">
             and wtk.create_time &gt;= #{queryStartTime}
         </if>

--
Gitblit v1.8.0