From b1e06c1738fd57dddef668872e03c381aa3965c0 Mon Sep 17 00:00:00 2001
From: laishajiang <12977614+laishajiang@user.noreply.gitee.com>
Date: Fri, 29 Mar 2024 18:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E4=BB=B6=E5=88=86=E7=B1=BB=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1=E5=A4=A7=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/mapper/DataMapper.xml | 31 ++++++++++++-------
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/mailbox-lan/src/main/resources/mapper/DataMapper.xml b/mailbox-lan/src/main/resources/mapper/DataMapper.xml
index 369079f..690cd24 100644
--- a/mailbox-lan/src/main/resources/mapper/DataMapper.xml
+++ b/mailbox-lan/src/main/resources/mapper/DataMapper.xml
@@ -20,6 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where a.level = '2'
+
+ and a.id = #{deptId}
+
group by a.name,a.sort
order by crateNumber desc
@@ -36,7 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where a.level = '2'
-
+
+ and a.id = #{deptId}
+
group by a.name) t order by rateNumber desc
) t2 on t1.cname = t2.rname
@@ -55,7 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where a.level = '2'
-
+
+ and a.id = #{deptId}
+
group by a.name
order by srateNumber desc
) t4 on t3.cname = t4.sname ORDER BY score desc ,sort
@@ -75,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
COUNT(1) AS cSum,
(SELECT COUNT(*) FROM mail_mark b where 1=1
- AND b.completion_time BETWEEN #{searchStartTime} AND (to_date(#{searchEndTime}) + interval '1 D')
+ AND b.completion_time BETWEEN #{searchStartTime} AND #{searchEndTime}
) AS total
from mail_mark b left join dept a on a.id=b.second_dept_id where 1=1
@@ -85,9 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) t1
join
- (
- select CONCAT(ROUND(sum(COALESCE(b.resolved, 0))*100/SUM(CASE WHEN b.completed = '1' THEN 1 ELSE 0 END),0),'%') Rate,
- SUM(COALESCE(b.resolved, 0)) resolved,SUM(CASE WHEN b.completed = '1' THEN 1 ELSE 0 END) rSum,
+ (
+ select CONCAT(ROUND(sum(COALESCE(b.resolved, 0))*100/SUM(CASE WHEN b.completed = '1' THEN 1 ELSE 0 END),0),'%') Rate,
+ SUM(COALESCE(b.resolved, 0)) resolved,SUM(CASE WHEN b.completed = '1' THEN 1 ELSE 0 END) rSum,
(SELECT COUNT(*) FROM mail_mark b where 1=1
AND b.completion_time BETWEEN #{searchStartTime} AND #{searchEndTime}
@@ -129,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CONCAT(crateNumber,'%') crate,
SUM(COALESCE(b.completed, 0)) completed,count(1) csum
- from dept a left join mail_mark b on a.id = b.second_dept_id
+ from dept a left join mail_mark b on a.id = b.three_dept_id
AND b.completion_time BETWEEN #{searchStartTime} AND #{searchEndTime}
@@ -137,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where a.level = '3'
- and a.pid = #{deptId} or a.id = #{deptId}
+ and a.pid = #{deptId}
group by a.name,a.sort
order by crateNumber desc
@@ -148,14 +155,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from
(select a.name, SUM(COALESCE(b.resolved, 0)) resolved,
SUM(CASE WHEN b.completed = '1' THEN 1 ELSE 0 END) sum
- from dept a left join mail_mark b on a.id = b.second_dept_id
+ from dept a left join mail_mark b on a.id = b.three_dept_id
AND b.completion_time BETWEEN #{searchStartTime} AND #{searchEndTime}
where a.level = '3'
- and a.pid = #{deptId} or a.id = #{deptId}
+ and a.pid = #{deptId}
group by a.name) t order by rateNumber desc
@@ -169,14 +176,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SUM(CASE WHEN b.completed = '1' THEN 1 ELSE 0 END) sum,
CASE WHEN sum = 0 THEN 0 ELSE ROUND(sum(COALESCE(b.satisfied, 0))*100/sum,0) END srateNumber,
CONCAT(srateNumber,'%') srate
- from dept a left join mail_mark b on a.id = b.second_dept_id
+ from dept a left join mail_mark b on a.id = b.three_dept_id
AND b.completion_time BETWEEN #{searchStartTime} AND #{searchEndTime}
where a.level = '3'
- and a.pid = #{deptId} or a.id = #{deptId}
+ and a.pid = #{deptId}
group by a.name
order by srateNumber desc