From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 3e95114..53ae13f 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -65,7 +65,8 @@
SELECT IFNULL(B.confess, 0) AS confess,
IFNULL(C.staff, 0) AS staff,
IFNULL(D.security, 0) AS security,
- IFNULL(E.armed, 0) AS armed
+ IFNULL(E.armed, 0) AS armed,
+ IFNULL(F.region, 0) AS region
FROM (SELECT jurisdiction FROM sys_information GROUP BY jurisdiction) A
LEFT JOIN (SELECT COUNT(stats) AS confess, jurisdiction
FROM sys_information
@@ -83,6 +84,10 @@
FROM sys_information
WHERE stats = 3
GROUP BY jurisdiction) E ON A.jurisdiction = E.jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS region, jurisdiction
+ FROM sys_information
+ WHERE stats = 4
+ GROUP BY jurisdiction) F ON A.jurisdiction = E.jurisdiction
WHERE A.jurisdiction = #{departmentid}
</select>
@@ -729,6 +734,12 @@
<if test="deptid!=null and deptid!=''">
and u.dept_id =#{deptid}
</if>
+ <if test="type=1">
+ and to_days(u.update_time) = to_days(now());
+ </if>
+ <if test="type=2">
+ and DATE_FORMAT(u.update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+ </if>
GROUP BY d.dept_name,
j.dept_name
</select>
@@ -747,6 +758,12 @@
<if test="deptid!=null and deptid!=''">
and u.departmentid =#{deptid}
</if>
+ <if test="type=1">
+ and to_days(u.time) = to_days(now());
+ </if>
+ <if test="type=2">
+ and DATE_FORMAT(u.time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+ </if>
GROUP BY d.dept_name,
j.dept_name
</select>
--
Gitblit v1.9.3