From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 15
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 381 +++++++++++++++++++++++++++--------------
src/main/java/org/springblade/modules/information/service/IInformationService.java | 8
src/main/java/org/springblade/modules/information/controller/InformationController.java | 82 +++++++--
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 2
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 10 +
6 files changed, 340 insertions(+), 158 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 0eafeaa..282f6c8 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -762,24 +762,24 @@
// }
- /**
- * 派遣數量統計
- */
- @PostMapping("/selectPCount")
- public R selectPCount(String jurisdiction, String deptid) {
- Map<String, Object> map = new HashMap<String, Object>();
- List<Map<String, Object>> lists = new ArrayList<>();
- Map map1 = informationService.selectPcount(jurisdiction, deptid);
- String pnum = map1.get("pnum").toString();
- Integer a = Integer.valueOf(pnum);
- Map map2 = informationService.selectWPcount(jurisdiction, deptid);
- String wpnum = map2.get("wpnum").toString();
- Integer b = Integer.valueOf(wpnum);
- map.put("PCount", a);
- map.put("WPCount", b);
- lists.add(map);
- return R.data(lists);
- }
+// /**
+// * 派遣數量統計
+// */
+// @PostMapping("/selectPCount")
+// public R selectPCount(String jurisdiction, String deptid) {
+// Map<String, Object> map = new HashMap<String, Object>();
+// List<Map<String, Object>> lists = new ArrayList<>();
+// Map map1 = informationService.selectPcount(jurisdiction, deptid);
+// String pnum = map1.get("pnum").toString();
+// Integer a = Integer.valueOf(pnum);
+// Map map2 = informationService.selectWPcount(jurisdiction, deptid);
+// String wpnum = map2.get("wpnum").toString();
+// Integer b = Integer.valueOf(wpnum);
+// map.put("PCount", a);
+// map.put("WPCount", b);
+// lists.add(map);
+// return R.data(lists);
+// }
// /**
// * 单位列表
@@ -1551,4 +1551,50 @@
}
}
+ @PostMapping("/selectPCount")
+ public R selectPCount(String jurisdiction, String deptid) {
+ Map<String, Object> map = new HashMap<String, Object>();
+ List<Map<String, Object>> lists = new ArrayList<>();
+ String childer = informationService.selJurchilder(jurisdiction);
+ String[] split = childer.split(",");
+ String strArrays = "";
+ for (int j = 0; j < split.length; j++) {
+ strArrays += "'" + split[j] + "',";
+ }
+ Integer pnums = 0;
+ Integer wpnums = 0;
+ if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
+ List<Map<String, Object>> list = informationService.seleP(jurisdiction, deptid);
+ for (int i = 0; i < list.size(); i++) {
+ String pnum = list.get(i).get("pnum").toString();
+ Integer a = Integer.parseInt(pnum);
+ pnums += a;
+ String wpnum = list.get(i).get("wpnum").toString();
+ Integer b = Integer.parseInt(wpnum);
+ wpnums += b;
+ }
+ } else {
+ String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
+ List<Map<String, Object>> list = informationService.seleP(jurisdictiond, deptid);
+ for (int i = 0; i < list.size(); i++) {
+ String pnum = list.get(i).get("pnum").toString();
+ Integer a = Integer.parseInt(pnum);
+ pnums += a;
+ String wpnum = list.get(i).get("wpnum").toString();
+ Integer b = Integer.parseInt(wpnum);
+ wpnums += b;
+ }
+ }
+// Map map1 = informationService.selectPcount(jurisdiction, deptid);
+// String pnum = map1.get("pnum").toString();
+// Integer a = Integer.valueOf(pnum);
+// Map map2 = informationService.selectWPcount(jurisdiction, deptid);
+// String wpnum = map2.get("wpnum").toString();
+// Integer b = Integer.valueOf(wpnum);
+ map.put("PCount", pnums);
+ map.put("WPCount", wpnums);
+ lists.add(map);
+ return R.data(lists);
+ }
+
}
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 a42e507..3100f3e 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -64,6 +64,7 @@
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 selectUIn(IPage page,String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
List<Map<Object,Object>> selectJur();
@@ -72,6 +73,7 @@
List<Map<Object,Object>> selectCf(String jurisdiction);
List<Map<Object,Object>> selectCl(String jurisdiction);
List<Map<Object,Object>> selectBx(String jurisdiction,String deptid,String type);
+ List<Map<Object,Object>> selectBxs(String jurisdiction);
List<Map<Object,Object>> seCountI(String jurisdiction,String deptid);
List<Map<Object,Object>> selectAge(String jurisdiction,String deptid);
String seCountUm(String jurisdiction,String deptid);
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 885cbaa..6e41400 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -137,43 +137,43 @@
</select>
<!--通过辖区查询机构id，然后通过机构id查询当前机构交社保的人数（numj单位已交社保数量;numz单位人员总数）-->
-<!-- <select id="selectCs" resultType="java.util.HashMap">-->
-<!-- SELECT A.numj,-->
-<!-- B.numz,-->
-<!-- d.dept_name as deptname-->
-<!-- FROM (-->
-<!-- SELECT COUNT-->
-<!-- (*) AS numj,-->
-<!-- deptid-->
-<!-- FROM sys_socil-->
-<!-- WHERE deptid 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!='1372091709474910209'">-->
-<!-- and i.jurisdiction in(${jurisdiction})-->
-<!-- </if>-->
-<!-- GROUP BY i.departmentid)-->
-<!-- GROUP BY deptid-->
-<!-- ) A-->
-<!-- left JOIN (-->
-<!-- SELECT COUNT-->
-<!-- (*) AS numz,-->
-<!-- dept_id-->
-<!-- FROM blade_user-->
-<!-- WHERE 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!='1372091709474910209'">-->
-<!-- and i.jurisdiction in(${jurisdiction})-->
-<!-- </if>-->
-<!-- GROUP BY i.departmentid)-->
-<!-- GROUP BY dept_id-->
-<!-- ) B ON A.deptid = B.dept_id-->
-<!-- LEFT JOIN (SELECT id, dept_name FROM blade_dept) d ON d.id = A.deptid where 1=1-->
-<!-- <if test="deptid!=null and deptid!=''">-->
-<!-- and A.deptid =#{deptid}-->
-<!-- </if>-->
-<!-- </select>-->
+ <!-- <select id="selectCs" resultType="java.util.HashMap">-->
+ <!-- SELECT A.numj,-->
+ <!-- B.numz,-->
+ <!-- d.dept_name as deptname-->
+ <!-- FROM (-->
+ <!-- SELECT COUNT-->
+ <!-- (*) AS numj,-->
+ <!-- deptid-->
+ <!-- FROM sys_socil-->
+ <!-- WHERE deptid 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!='1372091709474910209'">-->
+ <!-- and i.jurisdiction in(${jurisdiction})-->
+ <!-- </if>-->
+ <!-- GROUP BY i.departmentid)-->
+ <!-- GROUP BY deptid-->
+ <!-- ) A-->
+ <!-- left JOIN (-->
+ <!-- SELECT COUNT-->
+ <!-- (*) AS numz,-->
+ <!-- dept_id-->
+ <!-- FROM blade_user-->
+ <!-- WHERE 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!='1372091709474910209'">-->
+ <!-- and i.jurisdiction in(${jurisdiction})-->
+ <!-- </if>-->
+ <!-- GROUP BY i.departmentid)-->
+ <!-- GROUP BY dept_id-->
+ <!-- ) B ON A.deptid = B.dept_id-->
+ <!-- LEFT JOIN (SELECT id, dept_name FROM blade_dept) d ON d.id = A.deptid where 1=1-->
+ <!-- <if test="deptid!=null and deptid!=''">-->
+ <!-- and A.deptid =#{deptid}-->
+ <!-- </if>-->
+ <!-- </select>-->
<select id="selectCs" resultType="java.util.HashMap">
SELECT COUNT(*) as numj,jurisdiction
FROM blade_user
@@ -540,57 +540,90 @@
<!--总保安数量-->
+<!-- <select id="queryCountB" resultType="java.util.HashMap">-->
+<!-- SELECT-->
+<!-- C.thisnum,-->
+<!-- C.lastnum,-->
+<!-- d.dept_name AS deptname,-->
+<!-- j.dept_name AS jurname-->
+<!-- FROM-->
+<!-- (-->
+<!-- SELECT-->
+<!-- IFNULL( A.thisnum, 0 ) AS thisnum,-->
+<!-- IFNULL( B.lastnum, 0 ) AS lastnum,-->
+<!-- A.dept_id,-->
+<!-- A.jurisdiction-->
+<!-- FROM-->
+<!-- (-->
+<!-- SELECT-->
+<!-- COUNT( * ) AS thisnum,-->
+<!-- dept_id,-->
+<!-- jurisdiction-->
+<!-- FROM-->
+<!-- blade_user-->
+<!-- WHERE-->
+<!-- role_id = '1412226235153731586' and status=1 and is_deleted=0-->
+<!-- AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )-->
+<!-- GROUP BY-->
+<!-- dept_id,-->
+<!-- jurisdiction-->
+<!-- ) A-->
+<!-- LEFT JOIN (-->
+<!-- SELECT-->
+<!-- COUNT( * ) AS lastnum,-->
+<!-- dept_id,-->
+<!-- jurisdiction-->
+<!-- FROM-->
+<!-- blade_user-->
+<!-- WHERE-->
+<!-- role_id = '1412226235153731586' and status=1 and is_deleted=0-->
+<!-- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1-->
+<!-- GROUP BY-->
+<!-- dept_id,-->
+<!-- jurisdiction-->
+<!-- ) B ON A.dept_id = B.dept_id-->
+<!-- ) C-->
+<!-- LEFT JOIN blade_dept d ON C.dept_id = d.id-->
+<!-- LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction-->
+<!-- WHERE 1 =1-->
+<!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
+<!-- and C.jurisdiction =#{jurisdiction}-->
+<!-- </if>-->
+<!-- <if test="deptid!=null and deptid!=''">-->
+<!-- and C.dept_id =#{deptid}-->
+<!-- </if>-->
+<!-- </select>-->
<select id="queryCountB" resultType="java.util.HashMap">
- SELECT
- C.thisnum,
- C.lastnum,
- d.dept_name AS deptname,
- j.dept_name AS jurname
- FROM
- (
- SELECT
- IFNULL( A.thisnum, 0 ) AS thisnum,
- IFNULL( B.lastnum, 0 ) AS lastnum,
- A.dept_id,
- A.jurisdiction
- FROM
- (
- SELECT
- COUNT( * ) AS thisnum,
- dept_id,
- jurisdiction
- FROM
- blade_user
- WHERE
- role_id = '1412226235153731586' and status=1 and is_deleted=0
- AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
- GROUP BY
- dept_id,
- jurisdiction
- ) A
+ SELECT IFNULL(A.thisnum, 0) AS thisnum,
+ IFNULL(B.lastnum, 0) AS lastnum,
+ H.departmentid,
+ H.jurisdiction
+ FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
LEFT JOIN (
- SELECT
- COUNT( * ) AS lastnum,
- dept_id,
- jurisdiction
- FROM
- blade_user
- WHERE
- role_id = '1412226235153731586' and status=1 and is_deleted=0
- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
- GROUP BY
- dept_id,
- jurisdiction
- ) B ON A.dept_id = B.dept_id
- ) C
- LEFT JOIN blade_dept d ON C.dept_id = d.id
- LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction
- WHERE 1 =1
+ SELECT COUNT(*) AS thisnum,
+ dept_id
+ FROM blade_user
+ WHERE role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ GROUP BY dept_id
+ ) A ON A.dept_id = H.departmentid
+ LEFT JOIN (
+ SELECT COUNT(*) AS lastnum,
+ dept_id
+ FROM blade_user
+ WHERE role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(create_time, '%Y%m')) = 1
+ GROUP BY dept_id
+ ) B ON B.dept_id = H.departmentid where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and C.jurisdiction =#{jurisdiction}
+ and H.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
- and C.dept_id =#{deptid}
+ and H.departmentid =#{deptid}
</if>
</select>
@@ -771,40 +804,66 @@
<!--保安派遣数量-->
<select id="queryCountPq" resultType="java.util.HashMap">
- SELECT C.thisnum,
- C.lastnum,
- d.dept_name as deptname,
- j.dept_name as jurname
- FROM (
- SELECT IFNULL(A.thisnum, 0) AS thisnum,
- IFNULL(B.lastnum, 0) AS lastnum,
- A.dept_id,
- A.jurisdiction
- FROM (
+ SELECT IFNULL(G.thisnum, 0) AS thisnum,
+ IFNULL(J.lastnum, 0) AS lastnum
+ FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
+ LEFT JOIN (
SELECT SUM(num) AS thisnum,
- dept_id,
- jurisdiction
+ dept_id
FROM sys_dispatcher
- WHERE DATE_FORMAT( dispatcherTime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
- GROUP BY dept_id, jurisdiction
- ) A
- left JOIN (
+ WHERE DATE_FORMAT(dispatcherTime, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ GROUP BY dept_id
+ ) G ON G.dept_id = H.departmentid
+ LEFT JOIN (
SELECT SUM(num) AS lastnum,
- dept_id,
- jurisdiction
+ dept_id
FROM sys_dispatcher
- WHERE PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( dispatcherTime, '%Y%m' ) ) = 1
- GROUP BY dept_id, jurisdiction
- ) B ON A.dept_id = B.dept_id) C
- LEFT JOIN blade_dept d ON C.dept_id = d.id
- LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
+ WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(dispatcherTime, '%Y%m')) = 1
+ GROUP BY dept_id
+ ) J ON J.dept_id = H.departmentid
+ WHERE 1 = 1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and C.jurisdiction =#{jurisdiction}
+ and H.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
- and C.dept_id =#{deptid}
+ and H.departmentid =#{deptid}
</if>
</select>
+<!-- <select id="queryCountPq" resultType="java.util.HashMap">-->
+<!-- SELECT C.thisnum,-->
+<!-- C.lastnum,-->
+<!-- d.dept_name as deptname,-->
+<!-- j.dept_name as jurname-->
+<!-- FROM (-->
+<!-- SELECT IFNULL(A.thisnum, 0) AS thisnum,-->
+<!-- IFNULL(B.lastnum, 0) AS lastnum,-->
+<!-- A.dept_id,-->
+<!-- A.jurisdiction-->
+<!-- FROM (-->
+<!-- SELECT SUM(num) AS thisnum,-->
+<!-- dept_id,-->
+<!-- jurisdiction-->
+<!-- FROM sys_dispatcher-->
+<!-- WHERE DATE_FORMAT( dispatcherTime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )-->
+<!-- GROUP BY dept_id, jurisdiction-->
+<!-- ) A-->
+<!-- left JOIN (-->
+<!-- SELECT SUM(num) AS lastnum,-->
+<!-- dept_id,-->
+<!-- jurisdiction-->
+<!-- FROM sys_dispatcher-->
+<!-- WHERE PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( dispatcherTime, '%Y%m' ) ) = 1-->
+<!-- GROUP BY dept_id, jurisdiction-->
+<!-- ) B ON A.dept_id = B.dept_id) C-->
+<!-- LEFT JOIN blade_dept d ON C.dept_id = d.id-->
+<!-- LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1-->
+<!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
+<!-- and C.jurisdiction =#{jurisdiction}-->
+<!-- </if>-->
+<!-- <if test="deptid!=null and deptid!=''">-->
+<!-- and C.dept_id =#{deptid}-->
+<!-- </if>-->
+<!-- </select>-->
<!--查询本年所有月份的总人数-->
@@ -1020,12 +1079,41 @@
j.dept_name
</select>
-<!-- <!–查询出所有辖区信息–>-->
-<!-- <select id="selectJur" resultType="java.util.HashMap">-->
-<!-- SELECT id, dept_name-->
-<!-- FROM sys_jurisdiction-->
-<!-- WHERE id!=1372091709474910209-->
-<!-- </select> -->
+
+ <select id="selectBxs" resultType="java.util.HashMap">
+ select
+ si.jurisdiction id,
+ sj.parent_id,
+ sj.dept_name jurisdictionName,
+ si.enterprisename,
+ "表现差" detail
+ from sys_performance sp
+ left join
+ blade_user bu
+ on
+ bu.id = sp.securityId
+ left join
+ sys_information si
+ on
+ bu.dept_id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ where
+ 1=1
+ and (si.stats = 2 or si.stats =4)
+ and bu.is_deleted = 0
+ and bu.`status` = 1
+ and sp.score = 3
+ </select>
+
+ <!-- <!–查询出所有辖区信息–>-->
+ <!-- <select id="selectJur" resultType="java.util.HashMap">-->
+ <!-- SELECT id, dept_name-->
+ <!-- FROM sys_jurisdiction-->
+ <!-- WHERE id!=1372091709474910209-->
+ <!-- </select> -->
<select id="selectExtypeUser" resultType="java.lang.Integer">
SELECT COUNT(CASE WHEN (examination_mx IS NOT NULL OR examination_mx != "") THEN 1 END) AS sum
@@ -1842,16 +1930,15 @@
<!--获取保安公司信息（本市保安公司，分公司）包含经纬度-->
<select id="getSecurityUnitPositionInfo" resultType="org.springblade.modules.information.vo.InformationVO">
- select
- si.*,sj.dept_name jurisdictionName
- from
- sys_information si
- left join
- sys_jurisdiction sj
- on
- si.jurisdiction = sj.id
- where 1=1
- and (stats = 2 or stats = 4)
+ select si.*,
+ sj.dept_name jurisdictionName
+ from sys_information si
+ left join
+ sys_jurisdiction sj
+ on
+ si.jurisdiction = sj.id
+ where 1 = 1
+ and (stats = 2 or stats = 4)
</select>
<!--根据辖区查询保安公司分页信息（本市保安公司，分公司）-->
@@ -1867,20 +1954,20 @@
where 1=1
and (stats = 0 or stats = 1 or stats = 2 or stats = 4)
<if test="information.jurisdiction!=null and information.jurisdiction!=''">
- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
+ and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
</if>
</select>
<sql id="getSecurity">
- select
- dept_id,ifnull(count(*),0) count
- from blade_user bu
+ select dept_id,
+ ifnull(count(*), 0) count
+ from blade_user bu
left join blade_role br
- on bu.role_id = br.id
- where
+ on bu.role_id = br.id
+ where
role_alias = "安保人员"
- and bu.is_deleted = 0
- and bu.`status` = 1
+ and bu.is_deleted = 0
+ and bu.`status` = 1
</sql>
<!--根据辖区查询统计保安公司持证情况分页信息（本市保安公司，分公司）-->
@@ -2755,5 +2842,35 @@
</select>
+ <select id="seleP" resultType="java.util.HashMap">
+ SELECT
+ IFNULL(G.pnum, 0) AS pnum,
+ IFNULL(J.wpnum, 0) AS wpnum
+ FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
+ LEFT JOIN (
+ SELECT COUNT(*) AS pnum,
+ dept_id
+ FROM blade_user
+ WHERE dispatch = 0
+ AND STATUS = 1
+ AND is_deleted = 0
+ GROUP BY dept_id
+ ) G ON G.dept_id = H.departmentid
+ LEFT JOIN (
+ SELECT COUNT(*) AS wpnum,
+ dept_id
+ FROM blade_user
+ WHERE dispatch = 1
+ AND STATUS = 1
+ AND is_deleted = 0
+ GROUP BY dept_id
+ ) J ON J.dept_id = H.departmentid where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and H.jurisdiction =#{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid!=''">
+ and H.departmentid =#{deptid}
+ </if>
+ </select>
</mapper>
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 e5d2c7b..f753d70 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -172,6 +172,14 @@
IPage<InformationVO> getSecurityUnitInsuranceLessPage(IPage<InformationVO> page, InformationVO information);
/**
+ * 分局表现差的数量
+ * @param jurisdiction
+ * @return
+ */
+ List<Map<Object,Object>> selectBxs(String jurisdiction);
+ List<Map<String, Object>> seleP(String jurisdiction,String deptid);
+
+ /**
* 统计表现差的信息
* @return
*/
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 42231c1..127d786 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
@@ -395,6 +395,16 @@
return page.setRecords(baseMapper.getSecurityUnitLess50Page(page,4, information));
}
+ @Override
+ public List<Map<Object, Object>> selectBxs(String jurisdiction) {
+ return baseMapper.selectBxs(jurisdiction);
+ }
+
+ @Override
+ public List<Map<String, Object>> seleP(String jurisdiction, String deptid) {
+ return baseMapper.seleP(jurisdiction, deptid);
+ }
+
/**
* 统计表现差的信息
* @return
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 447099a..bac3c75 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -370,23 +370,22 @@
<select id="selectHold" resultType="java.util.HashMap">
SELECT IFNULL(B.cz, 0) as cz,
- IFNULL(C.wcz, 0) as wcz,
- A.jurisdiction
- FROM (SELECT jurisdiction FROM blade_user) A
- LEFT JOIN (SELECT COUNT(hold) as cz, jurisdiction
+ IFNULL(C.wcz, 0) as wcz
+ FROM (SELECT departmentid,jurisdiction FROM sys_information) A
+ LEFT JOIN (SELECT COUNT(hold) as cz, dept_id
FROM blade_user
WHERE hold = 1
AND role_id = '1412226235153731586'
and status = 1
- GROUP BY jurisdiction) B ON A.jurisdiction = B.jurisdiction
- LEFT JOIN (SELECT COUNT(hold) as wcz, jurisdiction
+ GROUP BY dept_id) B ON A.departmentid = B.dept_id
+ LEFT JOIN (SELECT COUNT(hold) as wcz, dept_id
FROM blade_user
WHERE hold = 2
AND role_id = '1412226235153731586'
and status = 1
- GROUP BY jurisdiction) C ON A.jurisdiction = C.jurisdiction
+ GROUP BY dept_id) C ON A.departmentid = C.dept_id
WHERE A.jurisdiction in (${deptid})
- GROUP BY cz, wcz, jurisdiction
+ GROUP BY cz, wcz
</select>
<!--查询部门下面的所有单位-->
--
Gitblit v1.9.3