From 94b5684557d4987add639a94d1ad41c32b5d00c0 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 03 九月 2024 10:32:29 +0800
Subject: [PATCH] 审批人修改

---
 project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
index 1eb759b..56c5291 100644
--- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -84,7 +84,7 @@
                     #{applyDeptId}
                 </foreach>
             </if>
-
+        order by apply_time desc
     </select>
 
     <select id="selectCheckedList"
@@ -100,7 +100,7 @@
         <if test="enforceReason != null and enforceReason != '' ">
             AND t2.enforce_reason like concat('%', #{enforceReason}, '%')
         </if>
-
+        order by t2.apply_time desc
     </select>
 
 
@@ -113,6 +113,19 @@
             and t2.order_status=2
             AND t1.peer_id = #{userId}
             AND t2.company_code = #{companyCode}
+        order by t2.apply_time asc
+    </select>
 
+
+    <select id="selectDistinctCheckDeptIdAndCompanyId"
+            resultType="com.project.enforce.domain.vo.EnforceDistinctVo">
+        select t.* from
+            (
+                SELECT company_id, check_dept_id, SUBSTR(apply_time,1,10) as apply_time_str, count( 1 ) AS apply_num
+                FROM enforce_order WHERE warn_status=0
+                GROUP BY company_id, check_dept_id,apply_time_str
+            ) t
+        WHERE
+            t.apply_num > 1
     </select>
 </mapper>

--
Gitblit v1.9.1