From 98f8d438a976d73e7c4f6434efc8867ebe2a07a5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 17:35:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 ee3d86d..5a6fba4 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -1428,7 +1428,7 @@
A.stats,
j.dept_name AS jurname
FROM
- ( SELECT jurisdiction, departmentid,enterpriseName,stats FROM sys_information ) A
+ ( SELECT jurisdiction, departmentid,enterpriseName,stats,create_time FROM sys_information ) A
LEFT JOIN (
SELECT
COUNT( * ) AS num,
@@ -1550,6 +1550,12 @@
</if>
<if test="stats!=null and stats!=''">
and A.stats =#{stats}
+ </if>
+ <if test="startTime!=null and startTime!=''">
+ and A.create_time >= #{startTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and A.create_time <= #{endTime}
</if>
</select>
@@ -1776,7 +1782,8 @@
i.departmentid,
i.stats,
i.jurisdiction,
- j.dept_name
+ j.dept_name,
+ i.create_time
FROM
sys_information i
LEFT JOIN sys_jurisdiction j ON i.jurisdiction = j.id
@@ -1834,6 +1841,12 @@
<if test="stats!=null and stats!=''">
and A.stats=#{stats}
</if>
+ <if test="startTime!=null and startTime!=''">
+ and A.create_time >= #{startTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and A.create_time <= #{endTime}
+ </if>
</select>
<!--保安人员详情-->
--
Gitblit v1.9.3