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/auth/endpoint/BladeTokenEndPoint.java | 1 +
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 4 ++--
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 17 +++++++++++++++--
src/main/java/org/springblade/modules/information/service/IInformationService.java | 4 ++--
src/main/java/org/springblade/modules/information/controller/InformationController.java | 10 +++++-----
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 4 ++--
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 8 ++++----
7 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
index 227b74d..92a093d 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -98,6 +98,7 @@
@GetMapping("/oauth/logout")
+ @ApiLog("用户登出")
@ApiOperation(value = "退出登录")
public Kv logout() {
BladeUser user = AuthUtil.getUser();
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index d99d5a3..eecf6ea 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -55,10 +55,10 @@
and es.qualified = #{examScore.qualified}
</if>
<if test="examScore.startTime!=null and examScore.startTime!=''">
- and es.exam_time >= #{examScore.startTime}
+ and bu.paper_time >= #{examScore.startTime}
</if>
<if test="examScore.endTime!=null and examScore.endTime!=''">
- and es.exam_time <= #{examScore.endTime}
+ and bu.paper_time <= #{examScore.endTime}
</if>
order by es.id desc
</select>
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index f8c65b5..0efc721 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -855,8 +855,8 @@
* 保安员统计
*/
@PostMapping("/selectLi")
- public R<IPage> selectLi(String jurisdiction, String deptid, String stats, Query query) {
- IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid, stats);
+ public R<IPage> selectLi(String jurisdiction, String deptid, String stats,String startTime,String endTime, Query query) {
+ IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid, stats,startTime,endTime);
return R.data(list);
}
@@ -1567,9 +1567,9 @@
* 业务统计情况
*/
@PostMapping("/selectYw")
- public R<IPage> selectYw(String jurisdiction, String deptid, String stats, Query query) {
+ public R<IPage> selectYw(String jurisdiction, String deptid, String stats,String startTime,String endTime,Query query) {
if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
- IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats);
+ IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats,startTime,endTime);
return R.data(list);
} else {
String childer = informationService.selJurchilder(jurisdiction);
@@ -1579,7 +1579,7 @@
strArrays += "'" + split[j] + "',";
}
String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
- IPage list = informationService.selectYw(Condition.getPage(query), jurisdictiond, deptid, stats);
+ IPage list = informationService.selectYw(Condition.getPage(query), jurisdictiond, deptid, stats,startTime,endTime);
return R.data(list);
}
}
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
index 65f256c..77d9bfd 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -58,14 +58,14 @@
Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
Map<String, String> queryYearAn(String year,String jurisdiction,String deptid);
List<Map<Object,Object>> queryCountB(String jurisdiction,String deptid);
- List selectLi(IPage page, String jurisdiction, String deptid,String stats);
+ List selectLi(IPage page, String jurisdiction, String deptid,String stats,String startTime,String endTime);
List<Map<Object,Object>> queryCountZc(String jurisdiction,String deptid);
List<Map<Object,Object>> queryCountCz(String jurisdiction,String deptid);
List<Map<Object,Object>> queryCountSb(String jurisdiction,String deptid);
List<Map<Object,Object>> queryCountKh(String jurisdiction,String deptid);
List<Map<Object,Object>> queryCountPq(String jurisdiction,String deptid);
List<Map<String, Object>> seleP(String jurisdiction,String deptid);
- List selectYw(IPage page,String jurisdiction,String deptid,String stats);
+ List selectYw(IPage page,String jurisdiction,String deptid,String stats,String startTime,String endTime);
List selectUIn(IPage page,String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
List<Map<Object,Object>> selectJur();
int selectExtypeUser();
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>
<!--保安人员详情-->
diff --git a/src/main/java/org/springblade/modules/information/service/IInformationService.java b/src/main/java/org/springblade/modules/information/service/IInformationService.java
index 5b1ca57..b848b49 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -72,14 +72,14 @@
Map selectWPcount(String jurisdiction,String deptid);
List<Map<Object,Object>> selectIn(String jurisdiction);
void deleteDept(String ids);
- IPage selectLi(IPage<List> page,String jurisdiction, String deptid,String stats);
+ IPage selectLi(IPage<List> page,String jurisdiction, String deptid,String stats,String startTime,String endTime);
List<Map<Object,Object>> seCountI(String jurisdiction,String deptid);
String seCountUm(String jurisdiction,String deptid);
String seCountUg(String jurisdiction,String deptid);
Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
IPage selectTb(IPage<List> page,String jurisdiction,String enterpriseName);
IPage selectJj(IPage<List> page,String jurisdiction,String enterpriseName);
- IPage selectYw(IPage<List> page,String jurisdiction,String deptid,String stats);
+ IPage selectYw(IPage<List> page,String jurisdiction,String deptid,String stats,String startTime,String endTime);
IPage selectUIn(IPage<List> page,String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
IPage selectDis(IPage<List> page,String jurisdiction,String deptid,String fid);
List<Map<Object,Object>> selectFw();
diff --git a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
index 207f1ca..43cddd3 100644
--- a/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java
@@ -188,8 +188,8 @@
}
@Override
- public IPage selectLi(IPage page,String jurisdiction, String deptid,String stats) {
- return page.setRecords(baseMapper.selectLi(page,jurisdiction, deptid,stats));
+ public IPage selectLi(IPage page,String jurisdiction, String deptid,String stats,String startTime,String endTime) {
+ return page.setRecords(baseMapper.selectLi(page,jurisdiction, deptid,stats,startTime,endTime));
}
@Override
@@ -223,8 +223,8 @@
}
@Override
- public IPage selectYw(IPage page,String jurisdiction, String deptid,String stats) {
- return page.setRecords(baseMapper.selectYw(page,jurisdiction, deptid,stats));
+ public IPage selectYw(IPage page,String jurisdiction, String deptid,String stats,String startTime,String endTime) {
+ return page.setRecords(baseMapper.selectYw(page,jurisdiction, deptid,stats,startTime,endTime));
}
@Override
--
Gitblit v1.9.3