From 5a094a318e6f4543dee18a12345ca0edb26041ca Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 28 Aug 2021 17:07:03 +0800
Subject: [PATCH] 1.首页接口调整
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 31 +++++++++++++++++++++++++++++--
src/main/java/org/springblade/modules/information/service/IInformationService.java | 4 ++--
src/main/java/org/springblade/modules/information/controller/InformationController.java | 8 ++++----
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 4 ++--
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 8 ++++----
5 files changed, 41 insertions(+), 14 deletions(-)
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 27cc331..ac3a543 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -803,8 +803,8 @@
* 保安员统计
*/
@PostMapping("/selectLi")
- public R<IPage> selectLi(String jurisdiction, String deptid, Query query) {
- IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid);
+ public R<IPage> selectLi(String jurisdiction, String deptid,String stats, Query query) {
+ IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid,stats);
return R.data(list);
}
@@ -855,8 +855,8 @@
* 业务统计情况
*/
@PostMapping("/selectYw")
- public R<IPage> selectYw(String jurisdiction, String deptid, Query query) {
- IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid);
+ public R<IPage> selectYw(String jurisdiction, String deptid,String stats, Query query) {
+ IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid,stats);
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 db8cd97..d2bbbd9 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -54,13 +54,13 @@
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);
+ List selectLi(IPage page, String jurisdiction, String deptid,String stats);
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 selectYw(IPage page,String jurisdiction,String deptid);
+ List selectYw(IPage page,String jurisdiction,String deptid,String stats);
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 a01bafc..f476ca9 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -463,6 +463,8 @@
WHERE
YEAR ( s.update_time ) =#{year}
AND dispatch = 0
+ AND `status`=1
+ AND is_deleted=0
AND dept_id IN ( SELECT i.departmentid FROM sys_information i LEFT JOIN sys_jurisdiction j ON j.id =
i.jurisdiction where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
@@ -1080,6 +1082,7 @@
IFNULL( G.yicnum, 0 ) AS yicnum,
A.dept_id,
d.enterpriseName AS deptname,
+ d.stats,
j.dept_name AS jurname
FROM
( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' and
@@ -1166,6 +1169,9 @@
</if>
<if test="deptid!=null and deptid!=''">
and d.dept_name like concat(concat('%', #{deptid}),'%')
+ </if>
+ <if test="stats!=null and stats!=''">
+ and d.stats =#{stats}
</if>
</select>
@@ -1377,6 +1383,7 @@
SELECT
A.enterpriseName,
A.departmentid,
+ A.stats,
A.jurisdiction,
A.dept_name as jurname,
IFNULL( B.num, 0 ) AS fwnum,
@@ -1386,6 +1393,7 @@
SELECT
i.enterpriseName,
i.departmentid,
+ i.stats,
i.jurisdiction,
j.dept_name
FROM
@@ -1406,12 +1414,31 @@
<if test="deptid!=null and deptid!=''">
and A.enterpriseName like concat('%', #{deptid},'%')
</if>
+ <if test="stats!=null and stats!=''">
+ and A.stats=#{stats}
+ </if>
</select>
<!--保安人员详情-->
<select id="selectUIn" resultType="java.util.HashMap">
- SELECT real_name,securitynumber,cardid,phone,hold,soil,photo,examination_type,dispatch FROM blade_user WHERE
- role_id='1412226235153731586' AND is_deleted=0 AND `status`=1
+ SELECT
+ u.real_name,
+ u.securitynumber,
+ u.cardid,
+ u.phone,
+ u.hold,
+ u.soil,
+ u.photo,
+ u.examination_type,
+ u.dispatch,
+ i.enterpriseName
+ FROM
+ blade_user u
+ LEFT JOIN sys_information i ON i.departmentid = u.dept_id
+ WHERE
+ u.role_id = '1412226235153731586'
+ AND u.is_deleted = 0
+ AND u.`status` =1
<if test="deptid!=null and deptid!=''">
and dept_id=#{deptid}
</if>
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 ad59b29..aa4c452 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -71,14 +71,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);
+ IPage selectLi(IPage<List> page,String jurisdiction, String deptid,String stats);
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);
+ IPage selectYw(IPage<List> page,String jurisdiction,String deptid,String stats);
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 b7833bc..185bf7e 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
@@ -187,8 +187,8 @@
}
@Override
- public IPage selectLi(IPage page,String jurisdiction, String deptid) {
- return page.setRecords(baseMapper.selectLi(page,jurisdiction, deptid));
+ public IPage selectLi(IPage page,String jurisdiction, String deptid,String stats) {
+ return page.setRecords(baseMapper.selectLi(page,jurisdiction, deptid,stats));
}
@Override
@@ -222,8 +222,8 @@
}
@Override
- public IPage selectYw(IPage page,String jurisdiction, String deptid) {
- return page.setRecords(baseMapper.selectYw(page,jurisdiction, deptid));
+ public IPage selectYw(IPage page,String jurisdiction, String deptid,String stats) {
+ return page.setRecords(baseMapper.selectYw(page,jurisdiction, deptid,stats));
}
@Override
--
Gitblit v1.9.3