From 1766a53f27d4b51eade66fc71a5631d21cf7e836 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 31 三月 2026 16:21:53 +0800
Subject: [PATCH] 【丽水】patItem增加 sendname 排序
---
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 1877ccc..24990ba 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -371,7 +371,7 @@
</foreach>
</if>
<if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
- and visit_dept_name IN
+ and visit_dept_code IN
<foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
close="))">
#{visitDeptCode}
@@ -389,7 +389,7 @@
</foreach>
</if>
<if test=" visitDeptCodes != null and visitDeptCodes.size()>0">
- OR visit_dept_name IN
+ OR visit_dept_code IN
<foreach collection="visitDeptCodes" item="visitDeptCode" open="(" separator=","
close="))">
#{visitDeptCode}
@@ -466,6 +466,7 @@
<if test="sort != null and sort==6">order by admindate desc</if>
<if test="sort != null and sort==7">order by visit_time asc</if>
<if test="sort != null and sort==8">order by visit_time desc</if>
+ <if test="sort != null and sort==9">order by sendname asc</if>
<if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="getCompensateServiceSubtaskList" parameterType="com.smartor.domain.entity.ServiceSubtaskEntity"
@@ -1894,6 +1895,9 @@
FROM service_subtask
WHERE DATE_FORMAT(finishtime, '%Y-%m-%d') >= #{startDate}
AND DATE_FORMAT(finishtime, '%Y-%m-%d') <= #{endDate}
+ <if test="orgid != null">
+ AND orgid = #{orgid}
+ </if>
GROUP BY deptname
</select>
@@ -2236,6 +2240,9 @@
<if test="excep != null ">
AND excep = #{excep}
</if>
+ <if test="taskName != null and taskName != ''">
+ AND task_name like concat('%', #{taskName}, '%')
+ </if>
<if test="visitCount != null and visitCount == 1">
AND visit_count = 1
</if>
--
Gitblit v1.9.3