From 113e622df746422955baa6d023b8ed7fd32a642a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 28 Jul 2021 15:12:47 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.java | 2
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 4 +-
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 2
src/main/java/org/springblade/modules/system/service/IDeptService.java | 2
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 8 ++--
src/main/java/org/springblade/modules/information/controller/InformationController.java | 50 ++++++++++++++++++++----
6 files changed, 50 insertions(+), 18 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 8a33284..223f3dc 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -110,12 +110,42 @@
@ApiOperation(value = "新增", notes = "传入information")
public R save(@Valid @RequestBody Information information) {
Dept dept= new Dept();
- Long i = 1413470343230877697L;
- dept.setParentId(i);
- dept.setTenantId("000000");
- dept.setDeptName(information.getEnterprisename());
- dept.setAncestors("0,1413470343230877697");
- dept.setDeptCategory(1);
+ //自招保安公司
+ if(information.getStats().equals("0")){
+ Long i = 1420222768149966850L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1420222768149966850");
+ dept.setDeptCategory(1);
+ }
+ //保安培训公司
+ if(information.getStats().equals("1")){
+ Long i = 1418458374477549569L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1418458374477549569");
+ dept.setDeptCategory(1);
+ }
+ //保安服务公司
+ if(information.getStats().equals("2")){
+ Long i = 1413470343230877697L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1413470343230877697");
+ dept.setDeptCategory(1);
+ }
+ //武装守押公司
+ if(information.getStats().equals("3")){
+ Long i = 1420222961377357825L;
+ dept.setParentId(i);
+ dept.setTenantId("000000");
+ dept.setDeptName(information.getEnterprisename());
+ dept.setAncestors("0,1420222961377357825");
+ dept.setDeptCategory(1);
+ }
if (iDeptService.submit(dept)) {
CacheUtil.clear(SYS_CACHE);
// 返回懒加载树更新节点所需字段
@@ -196,7 +226,7 @@
int wcznumber = 0;//总的未持证数量
String title = list.get(i).get("title");//部门名称
Map<String, Object> map = new HashMap<String, Object>();
- Map<Object, Integer> objectStringMap = iDeptService.selectHold(String.valueOf(list.get(i).get("jurisdiction")));
+ Map<Object, Object> objectStringMap = iDeptService.selectHold(String.valueOf(list.get(i).get("jurisdiction")));
if (objectStringMap==null) {
map.put("name", title);
map.put("cz", cznumber);
@@ -204,8 +234,10 @@
lists.add(map);
}
else {
- cznumber = objectStringMap.get("cz");
- wcznumber = objectStringMap.get("wcz");
+ String cz = objectStringMap.get("cz").toString();
+ cznumber = Integer.valueOf(cz);
+ String wcz = objectStringMap.get("wcz").toString();
+ wcznumber = Integer.valueOf(wcz);
map.put("name", title);
map.put("cz", cznumber);
map.put("wcz", wcznumber);
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 d2b7b32..34d1b09 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -64,19 +64,19 @@
IFNULL(D.security, 0) AS security,
IFNULL(E.armed, 0) AS armed
FROM (SELECT jurisdiction FROM sys_information GROUP BY jurisdiction) A
- FULL JOIN (SELECT COUNT(stats) AS confess, jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS confess, jurisdiction
FROM sys_information
WHERE stats = 0
GROUP BY jurisdiction) B ON A.jurisdiction = B.jurisdiction
- FULL JOIN (SELECT COUNT(stats) AS staff, jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS staff, jurisdiction
FROM sys_information
WHERE stats = 1
GROUP BY jurisdiction) C ON A.jurisdiction = C.jurisdiction
- FULL JOIN (SELECT COUNT(stats) AS security, jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS security, jurisdiction
FROM sys_information
WHERE stats = 2
GROUP BY jurisdiction) D ON A.jurisdiction = D.jurisdiction
- FULL JOIN (SELECT COUNT(stats) AS armed, jurisdiction
+ LEFT JOIN (SELECT COUNT(stats) AS armed, jurisdiction
FROM sys_information
WHERE stats = 3
GROUP BY jurisdiction) E ON A.jurisdiction = E.jurisdiction
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
index 798858c..00b950c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -80,7 +80,7 @@
List<String> selectIn();
List<Map<Object,String>> selectCount();
List<Map<Object,String>> selectId(String id);
- Map<Object,Integer> selectHold(String deptid);
+ Map<Object,Object> selectHold(String deptid);
/**
* 懒加载获取部门树形结构,不包含顶级管理员公安局
*/
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 61d8768..7fa1e5b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -202,8 +202,8 @@
<select id="selectHold" resultType="java.util.HashMap">
SELECT
- ISNULL(B.cz,0) as cz,
- ISNULL(C.wcz,0) as wcz
+ IFNULL(B.cz,0) as cz,
+ IFNULL(C.wcz,0) as wcz
FROM (SELECT jurisdiction FROM blade_user ) A
LEFT JOIN (SELECT COUNT(hold) as cz,jurisdiction FROM blade_user WHERE hold=0 GROUP BY jurisdiction ) B ON A.jurisdiction=B.jurisdiction
LEFT JOIN (SELECT COUNT(hold) as wcz,jurisdiction FROM blade_user WHERE hold=1 GROUP BY jurisdiction ) C ON A.jurisdiction=C.jurisdiction
diff --git a/src/main/java/org/springblade/modules/system/service/IDeptService.java b/src/main/java/org/springblade/modules/system/service/IDeptService.java
index 5cf688e..466810c 100644
--- a/src/main/java/org/springblade/modules/system/service/IDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IDeptService.java
@@ -124,7 +124,7 @@
List<DeptVO> search(String deptName, Long parentId);
List<Map<Object,String>> selectCount();
List<Map<Object,String>> selectId(String id);
- Map<Object,Integer> selectHold(String deptid);
+ Map<Object,Object> selectHold(String deptid);
List<String> selectIn();
List<DeptVO> securityLazyTree(String tenantId, Long parentId);
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 4c82775..adf630d 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -190,7 +190,7 @@
}
@Override
- public Map<Object, Integer> selectHold(String deptid) {
+ public Map<Object, Object> selectHold(String deptid) {
return baseMapper.selectHold(deptid);
}
--
Gitblit v1.9.3