From 9ef68c9682b9bb56b72031fd92d150d65edfc07c Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 17 Sep 2021 20:58:57 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 671 ++++++++++++++++++++++++--------------------
src/main/java/org/springblade/modules/information/service/IInformationService.java | 3
src/main/java/org/springblade/modules/information/controller/InformationController.java | 187 +++++++-----
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 1
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 5
5 files changed, 485 insertions(+), 382 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 5468e92..5367c8a 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -764,22 +764,23 @@
/**
* 派遣數量統計
- */
- @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);
+// }
+
// /**
// * 单位列表
@@ -803,8 +804,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, Query query) {
+ IPage list = informationService.selectLi(Condition.getPage(query), jurisdiction, deptid, stats);
return R.data(list);
}
@@ -864,8 +865,8 @@
* 保安员详情
*/
@PostMapping("/selectUIn")
- public R<IPage> selectUIn(String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil,Query query) {
- IPage list = informationService.selectUIn(Condition.getPage(query),deptid, name, hold, photo, examinationtype, dispatch, soil);
+ public R<IPage> selectUIn(String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil, Query query) {
+ IPage list = informationService.selectUIn(Condition.getPage(query), deptid, name, hold, photo, examinationtype, dispatch, soil);
return R.data(list);
}
@@ -1015,7 +1016,7 @@
if (a <= 0) {
continue;
} else if (a >= 19 && a < 35) {
- qcount ++;
+ qcount++;
} else if (a >= 36 && a < 59) {
zcount++;
} else {
@@ -1023,12 +1024,11 @@
}
}
Map map = new HashMap();
- map.put("qcount",qcount);
- map.put("zcount",zcount);
- map.put("lcount",lcount);
+ map.put("qcount", qcount);
+ map.put("zcount", zcount);
+ map.put("lcount", lcount);
return R.data(map);
}
-
/**
@@ -1041,7 +1041,7 @@
//查出所有辖区
List<Map<Object, Object>> list = informationService.selJur();
List<Map<String, Object>> lists = new ArrayList<>();
- for (int i = 0; i < list.size(); i++){
+ for (int i = 0; i < list.size(); i++) {
Map<String, Object> map = new HashMap<String, Object>();
Map<String, Object> mapc = new HashMap<String, Object>();
String id = list.get(i).get("id").toString();
@@ -1054,11 +1054,11 @@
}
String substring = strArrays.substring(0, strArrays.length() - 1);
List<Map<Object, Object>> maps = informationService.seleJuList(substring);
- mapc.put("confess",maps.get(0).get("num"));
- mapc.put("staff",maps.get(1).get("num"));
- mapc.put("security",maps.get(2).get("num"));
- mapc.put("armed",maps.get(3).get("num"));
- mapc.put("region",maps.get(4).get("num"));
+ mapc.put("confess", maps.get(0).get("num"));
+ mapc.put("staff", maps.get(1).get("num"));
+ mapc.put("security", maps.get(2).get("num"));
+ mapc.put("armed", maps.get(3).get("num"));
+ mapc.put("region", maps.get(4).get("num"));
map.put("name", list.get(i).get("deptname"));
map.put("server", mapc);
lists.add(map);
@@ -1147,19 +1147,19 @@
String deptid = strArrays.substring(0, strArrays.length() - 1);
Map<String, Object> map = new HashMap<String, Object>();
List<Map<String, Object>> objectStringMap = iDeptService.selectHold(deptid);
- if (objectStringMap.size()==0) {
+ if (objectStringMap.size() == 0) {
map.put("name", list.get(i).get("deptname"));
map.put("cz", cznumber);
map.put("wcz", wcznumber);
lists.add(map);
} else {
- for (int c=0;c<objectStringMap.size();c++){
+ for (int c = 0; c < objectStringMap.size(); c++) {
String cz = objectStringMap.get(c).get("cz").toString();
cznumber += Integer.valueOf(cz);
String wcz = objectStringMap.get(c).get("wcz").toString();
wcznumber += Integer.valueOf(wcz);
}
- map.put("name", list.get(i).get("deptname"));
+ map.put("name", list.get(i).get("deptname"));
map.put("cz", cznumber);
map.put("wcz", wcznumber);
lists.add(map);
@@ -1182,7 +1182,7 @@
Map<String, Object> map = new HashMap<String, Object>();
Integer count = 0;
List<Map<String, Object>> lists = new ArrayList<>();
- if (jurisdiction.equals("1372091709474910209")){
+ if (jurisdiction.equals("1372091709474910209")) {
List<Map<Object, Object>> maps = informationService.selectBx(jurisdiction, deptid, type);
for (int i = 0; i < maps.size(); i++) {
String num = maps.get(i).get("num").toString();
@@ -1191,8 +1191,7 @@
map.put("count", count);
map.put("list", maps);
lists.add(map);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1212,7 +1211,6 @@
return R.data(lists);
}
-
/**
@@ -1237,8 +1235,7 @@
map.put("count", count);
map.put("list", maps);
lists.add(map);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1264,10 +1261,10 @@
*/
@PostMapping("/selectWg")
public R selectWg(String jurisdiction) {
- if (jurisdiction.equals("1372091709474910209")){
+ if (jurisdiction.equals("1372091709474910209")) {
List<Map<Object, Object>> list = informationService.selectWg(jurisdiction);
List list1 = new ArrayList();
- int count=0;
+ int count = 0;
Map map = new HashMap();
for (int i = 0; i < list.size(); i++) {
//总数
@@ -1280,22 +1277,20 @@
String sbnums = list.get(i).get("sbnum").toString();
int sbnum = Integer.parseInt(sbnums);
//保安总人数为0
- if (znum==0){
+ if (znum == 0) {
continue;
- }
- else {
+ } else {
int a = znum / 2;
- if (cznum<=a || sbnum<=a){
+ if (cznum <= a || sbnum <= a) {
count++;
list1.add(list.get(i));
}
}
}
- map.put("count",count);
- map.put("list",list1);
+ map.put("count", count);
+ map.put("list", list1);
return R.data(map);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1305,7 +1300,7 @@
String jurisdictiond = strArrays.substring(0, strArrays.length() - 1);
List<Map<Object, Object>> list = informationService.selectWg(jurisdictiond);
List list1 = new ArrayList();
- int count=0;
+ int count = 0;
Map map = new HashMap();
for (int i = 0; i < list.size(); i++) {
//总数
@@ -1318,19 +1313,18 @@
String sbnums = list.get(i).get("sbnum").toString();
int sbnum = Integer.parseInt(sbnums);
//保安总人数为0
- if (znum==0){
+ if (znum == 0) {
continue;
- }
- else {
+ } else {
int a = znum / 2;
- if (cznum<=a || sbnum<=a){
+ if (cznum <= a || sbnum <= a) {
count++;
list1.add(list.get(i));
}
}
}
- map.put("count",count);
- map.put("list",list1);
+ map.put("count", count);
+ map.put("list", list1);
return R.data(map);
}
@@ -1342,7 +1336,7 @@
*/
@PostMapping("/selectJy")
public R selectJy(String jurisdiction) {
- if (jurisdiction.equals("1372091709474910209")){
+ if (jurisdiction.equals("1372091709474910209")) {
List<Map<Object, Object>> list = informationService.selectJy(jurisdiction);
List list1 = new ArrayList();
Map map = new HashMap();
@@ -1358,8 +1352,7 @@
map.put("count", count);
map.put("List", list1);
return R.data(map);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1408,8 +1401,7 @@
map.put("count", count);
map.put("List", list1);
return R.data(map);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1447,8 +1439,7 @@
List<Map<Object, Object>> maps = informationService.selectCf(jurisdiction);
map.put("count", maps.size());
return R.data(map);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1468,11 +1459,10 @@
*/
@PostMapping("/selectIn")
public R selectIn(String jurisdiction) {
- if (jurisdiction.equals("1372091709474910209")|| "".equals(jurisdiction)) {
+ if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
List<Map<Object, Object>> maps = informationService.selectIn(jurisdiction);
return R.data(maps);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1490,11 +1480,10 @@
*/
@PostMapping("/selectTb")
public R<IPage> selectTb(String jurisdiction, String enterpriseName, Query query) {
- if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)){
+ if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
IPage list = informationService.selectTb(Condition.getPage(query), jurisdiction, enterpriseName);
return R.data(list);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1513,11 +1502,10 @@
*/
@PostMapping("/selectJj")
public R<IPage> selectJj(String jurisdiction, String enterpriseName, Query query) {
- if (jurisdiction.equals("1372091709474910209")|| "".equals(jurisdiction)) {
+ if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
IPage list = informationService.selectJj(Condition.getPage(query), jurisdiction, enterpriseName);
return R.data(list);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1534,12 +1522,11 @@
* 业务统计情况
*/
@PostMapping("/selectYw")
- public R<IPage> selectYw(String jurisdiction, String deptid,String stats, Query query) {
- if (jurisdiction.equals("1372091709474910209")|| "".equals(jurisdiction)) {
+ public R<IPage> selectYw(String jurisdiction, String deptid, String stats, Query query) {
+ if (jurisdiction.equals("1372091709474910209") || "".equals(jurisdiction)) {
IPage list = informationService.selectYw(Condition.getPage(query), jurisdiction, deptid, stats);
return R.data(list);
- }
- else {
+ } else {
String childer = informationService.selJurchilder(jurisdiction);
String[] split = childer.split(",");
String strArrays = "";
@@ -1552,4 +1539,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 9f8cf4d..679b632 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -54,6 +54,7 @@
List<Map<Object,String>> selectInCount(String jurisdiction,String deptid);
List<Map<String, Object>> selectCs(String jurisdiction,String deptid);
List<Map<String, Object>> selectTo(String jurisdiction,String deptid);
+ List<Map<String, Object>> seleP(String jurisdiction,String deptid);
Map<String, String> queryYearSoil(String year,String jurisdiction,String deptid);
Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
Map<String, String> queryYearAn(String year,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 054d807..d3d5760 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -147,43 +147,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="selectTo" resultType="java.util.HashMap">-->
@@ -541,57 +541,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
- 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 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 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>
@@ -1021,12 +1054,12 @@
j.dept_name
</select>
-<!-- <!–查询出所有辖区信息–>-->
-<!-- <select id="selectJur" resultType="java.util.HashMap">-->
-<!-- SELECT id, dept_name-->
-<!-- FROM sys_jurisdiction-->
-<!-- WHERE id!=1372091709474910209-->
-<!-- </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
@@ -1148,50 +1181,50 @@
ON E.deptid = A.dept_id
LEFT JOIN
(
- SELECT
- COUNT( * ) AS wcaijnum,
- dept_id,
- jurisdiction
- FROM
- blade_user
- WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND photo=1
- GROUP BY
- dept_id,
- jurisdiction
+ SELECT
+ COUNT( * ) AS wcaijnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586' and status=1 AND is_deleted=0
+ AND photo=1
+ GROUP BY
+ dept_id,
+ jurisdiction
) F
ON F.dept_id = A.dept_id
LEFT JOIN
(
- SELECT
- COUNT( * ) AS ycaijzpnum,
- dept_id,
- jurisdiction
- FROM
- blade_user
- WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND photo=0
- GROUP BY
- dept_id,
- jurisdiction
+ SELECT
+ COUNT( * ) AS ycaijzpnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586' and status=1 AND is_deleted=0
+ AND photo=0
+ GROUP BY
+ dept_id,
+ jurisdiction
) H
ON H.dept_id = A.dept_id
LEFT JOIN
(
- SELECT
- COUNT( * ) AS ycaijzwnum,
- dept_id,
- jurisdiction
- FROM
- blade_user
- WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND fingerprint=0
- GROUP BY
- dept_id,
- jurisdiction
+ SELECT
+ COUNT( * ) AS ycaijzwnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586' and status=1 AND is_deleted=0
+ AND fingerprint=0
+ GROUP BY
+ dept_id,
+ jurisdiction
) I
ON I.dept_id = A.dept_id
LEFT JOIN (
@@ -1371,6 +1404,37 @@
J.departmentid, J.cznum, J.ghnum, J.ghnum, J.pcnum, J.sbnum, J.zcnum, J.znum, J.jurname,J.jurisdiction
</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>
+
<!--公司经济情况进入图表-->
<select id="selectJj" resultType="java.util.HashMap">
SELECT J.*
@@ -1454,17 +1518,17 @@
) A
LEFT JOIN
(
- SELECT COUNT( * ) AS num, dept_id FROM sys_dispatcher_unit
- where
- start_time <= now() and end_time > now()
- GROUP BY dept_id
+ SELECT COUNT( * ) AS num, dept_id FROM sys_dispatcher_unit
+ where
+ start_time <= now() and end_time > now()
+ GROUP BY dept_id
) B
ON A.departmentid = B.dept_id
LEFT JOIN
(
- SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586'
- and status=1
- GROUP BY dept_id
+ SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586'
+ and status=1
+ GROUP BY dept_id
) C
ON A.departmentid = C.dept_id
LEFT JOIN
@@ -1843,16 +1907,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>
<!--根据辖区查询保安公司分页信息（本市保安公司，分公司）-->
@@ -1868,50 +1931,50 @@
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>
<!--根据辖区查询统计保安公司持证情况分页信息（本市保安公司，分公司）-->
<select id="getSecurityUnitHoldInfoPage" resultType="org.springblade.modules.information.vo.InformationVO">
select
- si.*,sj.dept_name jurisdictionName,
- ifnull(a.count,0) znum,
- ifnull(b.count,0) cnum,
- ifnull(c.count,0) pnum
+ si.*,sj.dept_name jurisdictionName,
+ ifnull(a.count,0) znum,
+ ifnull(b.count,0) cnum,
+ ifnull(c.count,0) pnum
from sys_information si
left join
(
- <include refid="getSecurity"/>
- group by dept_id
+ <include refid="getSecurity"/>
+ group by dept_id
) a
on
a.dept_id = si.departmentid
left join
(
- <include refid="getSecurity"/>
- and bu.hold = 1
- group by dept_id
+ <include refid="getSecurity"/>
+ and bu.hold = 1
+ group by dept_id
) b
on
b.dept_id = si.departmentid
left join
(
- <include refid="getSecurity"/>
- and bu.hold = 2
- group by dept_id
+ <include refid="getSecurity"/>
+ and bu.hold = 2
+ group by dept_id
) c
on
c.dept_id = si.departmentid
@@ -1922,45 +1985,45 @@
where 1=1
and (si.stats = 2 or si.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>
<!--根据辖区查询统计保安公司(1:持证率低于50% 2:派遣率低于50% 3：缴纳社保率低于50% 的保安公司个数及保安公司分页信息（本市保安公司，分公司）-->
<select id="getSecurityUnitLess50Page" resultType="org.springblade.modules.information.vo.InformationVO">
select c.*,sj.dept_name jurisdictionName from (
- select
- si.*,
- ifnull(a.count,0) znum,
- ifnull(b.count,0) cnum,
- ifnull(FORMAT((b.count/a.count)*100,2),0) pnum
- from sys_information si
- left join
- (
- <include refid="getSecurity"/>
- group by dept_id
- ) a
- on
- a.dept_id = si.departmentid
- left join
- (
- <include refid="getSecurity"/>
- <if test="type==1">
- and bu.hold = 1
- </if>
- <if test="type==2">
- and bu.dispatch = 0
- </if>
- <if test="type==3">
- and bu.soil = 0
- </if>
- <if test="type==4">
- and bu.insurance = 0
- </if>
- group by dept_id
- ) b
- on
- b.dept_id = si.departmentid
+ select
+ si.*,
+ ifnull(a.count,0) znum,
+ ifnull(b.count,0) cnum,
+ ifnull(FORMAT((b.count/a.count)*100,2),0) pnum
+ from sys_information si
+ left join
+ (
+ <include refid="getSecurity"/>
+ group by dept_id
+ ) a
+ on
+ a.dept_id = si.departmentid
+ left join
+ (
+ <include refid="getSecurity"/>
+ <if test="type==1">
+ and bu.hold = 1
+ </if>
+ <if test="type==2">
+ and bu.dispatch = 0
+ </if>
+ <if test="type==3">
+ and bu.soil = 0
+ </if>
+ <if test="type==4">
+ and bu.insurance = 0
+ </if>
+ group by dept_id
+ ) b
+ on
+ b.dept_id = si.departmentid
)c
left join
sys_jurisdiction sj
@@ -1970,7 +2033,7 @@
and (c.stats = 2 or c.stats = 4)
and pnum < #{information.proportion}
<if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
+ and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
</if>
<if test="information.departmentid!=null and information.departmentid!=''">
and c.departmentid = #{information.departmentid}
@@ -1982,81 +2045,81 @@
<!--根据辖区查询统计保安公司考试通过率低于50%的保安公司个数及保安公司分页信息（本市保安公司，分公司）-->
<select id="getSecurityUnitExamLess50Page" resultType="org.springblade.modules.information.vo.InformationVO">
select d.*,sj.dept_name jurisdictionName from (
- select
- si.*,
- ifnull(a.count,0) znum,
- ifnull(b.count,0) cnum,
- ifnull(FORMAT((b.count/c.count)*100,2),0) pnum
- from sys_information si
- left join
- (
- <include refid="getSecurity"/>
- group by dept_id
- ) a
- on
- a.dept_id = si.departmentid
- left join
- (
- select b1.dept_id,ifnull(b2.count,0) count from
- (
- select
- bu.dept_id,ifnull(count(*),0) count
- from blade_user bu
- left join blade_role br
- on bu.role_id = br.id
- where
- role_alias = "安保人员"
- and bu.is_deleted = 0
- and bu.`status` = 1
- group by dept_id
- ) b1
+ select
+ si.*,
+ ifnull(a.count,0) znum,
+ ifnull(b.count,0) cnum,
+ ifnull(FORMAT((b.count/c.count)*100,2),0) pnum
+ from sys_information si
+ left join
+ (
+ <include refid="getSecurity"/>
+ group by dept_id
+ ) a
+ on
+ a.dept_id = si.departmentid
+ left join
+ (
+ select b1.dept_id,ifnull(b2.count,0) count from
+ (
+ select
+ bu.dept_id,ifnull(count(*),0) count
+ from blade_user bu
+ left join blade_role br
+ on bu.role_id = br.id
+ where
+ role_alias = "安保人员"
+ and bu.is_deleted = 0
+ and bu.`status` = 1
+ group by dept_id
+ ) b1
- left join
- (
- select count(*) count,bu.dept_id from
- exam_score es
- left join
- blade_user bu
- on
- bu.id = es.user_id
- where qualified = 0 group by bu.dept_id
- ) b2
- on
- b1.dept_id = b2.dept_id
- ) b
- on
- b.dept_id = si.departmentid
- left join
- (
- select c1.dept_id,ifnull(c2.count,0) count from
- (
- select
- bu.dept_id,ifnull(count(*),0) count
- from blade_user bu
- left join blade_role br
- on bu.role_id = br.id
- where
- role_alias = "安保人员"
- and bu.is_deleted = 0
- and bu.`status` = 1
- group by dept_id
- ) c1
+ left join
+ (
+ select count(*) count,bu.dept_id from
+ exam_score es
+ left join
+ blade_user bu
+ on
+ bu.id = es.user_id
+ where qualified = 0 group by bu.dept_id
+ ) b2
+ on
+ b1.dept_id = b2.dept_id
+ ) b
+ on
+ b.dept_id = si.departmentid
+ left join
+ (
+ select c1.dept_id,ifnull(c2.count,0) count from
+ (
+ select
+ bu.dept_id,ifnull(count(*),0) count
+ from blade_user bu
+ left join blade_role br
+ on bu.role_id = br.id
+ where
+ role_alias = "安保人员"
+ and bu.is_deleted = 0
+ and bu.`status` = 1
+ group by dept_id
+ ) c1
- left join
- (
- select count(*) count,bu.dept_id from
- exam_score es
- left join
- blade_user bu
- on
- bu.id = es.user_id
- where 1=1 group by bu.dept_id
- ) c2
- on
- c1.dept_id = c2.dept_id
- ) c
- on
- c.dept_id = si.departmentid
+ left join
+ (
+ select count(*) count,bu.dept_id from
+ exam_score es
+ left join
+ blade_user bu
+ on
+ bu.id = es.user_id
+ where 1=1 group by bu.dept_id
+ ) c2
+ on
+ c1.dept_id = c2.dept_id
+ ) c
+ on
+ c.dept_id = si.departmentid
)d
left join
sys_jurisdiction sj
@@ -2066,7 +2129,7 @@
and (d.stats = 2 or d.stats = 4)
and pnum < #{information.proportion}
<if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
+ and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
</if>
</select>
@@ -2170,39 +2233,39 @@
<select id="getSecurityUnitServerLess2Page" resultType="org.springblade.modules.information.vo.InformationVO">
select * from
(
- select
- DISTINCT
- si.id,
- si.departmentid,
- si.jurisdiction,
- si.enterprisename,
- sj.dept_name jurisdictionName,
- ifnull(a.count,0) znum,
- sdu.name dispatchUnitName,
- sdu.end_time
- from sys_information si
- left join
- sys_dispatcher_unit sdu
- on
- si.departmentid = sdu.dept_id
- left join
- sys_jurisdiction sj
- on
- sj.id = si.jurisdiction
- left join
- (
- select ifnull(count(*),0) count,dept_id from sys_dispatcher_unit
- where 1=1
- and start_time <= now()
- and end_time > now()
- GROUP BY dept_id
- ) a
- on
- a.dept_id = si.departmentid
- where 1=1
- <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
- </if>
+ select
+ DISTINCT
+ si.id,
+ si.departmentid,
+ si.jurisdiction,
+ si.enterprisename,
+ sj.dept_name jurisdictionName,
+ ifnull(a.count,0) znum,
+ sdu.name dispatchUnitName,
+ sdu.end_time
+ from sys_information si
+ left join
+ sys_dispatcher_unit sdu
+ on
+ si.departmentid = sdu.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ left join
+ (
+ select ifnull(count(*),0) count,dept_id from sys_dispatcher_unit
+ where 1=1
+ and start_time <= now()
+ and end_time > now()
+ GROUP BY dept_id
+ ) a
+ on
+ a.dept_id = si.departmentid
+ where 1=1
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})
+ </if>
) b
where b.znum < 2
<if test="information.departmentid!=null and information.departmentid!=''">
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 ec7e670..8f8e1f7 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -92,7 +92,8 @@
List<Map<Object,Object>> selJur();
String selJurchilder(String id);
List<Map<Object,Object>> seleJuList(String substring);
-
+ //派遣统计图表
+ 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 ae2ad24..b4b1c68 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
@@ -286,6 +286,11 @@
return baseMapper.seleJuList(substring);
}
+ @Override
+ public List<Map<String, Object>> seleP(String jurisdiction, String deptid) {
+ return baseMapper.seleP(jurisdiction, deptid);
+ }
+
/**
* 获取保安公司信息（本市保安公司，分公司）包含经纬度
* @return
--
Gitblit v1.9.3