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 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 013d3cb..53ae13f 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -734,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>
@@ -752,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