From 03f42f3e256dbc2e0c4e9b7ce3cb6a85df7cf130 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 20:40:40 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 +
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 118 ++++++++++++++++++++--------
src/main/java/org/springblade/modules/information/service/IInformationService.java | 5
src/main/java/org/springblade/modules/information/controller/InformationController.java | 53 ++++++++++++-
src/main/java/org/springblade/modules/system/controller/UserController.java | 6 +
src/main/java/org/springblade/modules/information/mapper/InformationMapper.java | 5
src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java | 13 ++-
7 files changed, 157 insertions(+), 52 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 96104dd..28d0e51 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -276,8 +276,8 @@
* 统计保安员资格异常的数量
*/
@PostMapping("/selectExtype")
- public R selectExtype(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectExtype(deptid);
+ public R selectExtype(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectExtype(deptid,jurisdiction);
return R.data(lists);
}
@@ -285,8 +285,8 @@
* 统计保安员持证的数量
*/
@PostMapping("/selectHold")
- public R selectHold(String deptid) {
- List<Map<Object, Object>> lists = informationService.selectHold(deptid);
+ public R selectHold(String deptid,String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectHold(deptid,jurisdiction);
return R.data(lists);
}
@@ -341,5 +341,50 @@
return R.success("操作成功");
}
+ /**
+ * 查询本年所有月份的客户数量
+ *
+ * @return
+ */
+ @GetMapping("/queryYearKh")
+ public R queryYearKh(String jurisdiction, String deptid) {
+ Calendar cal = Calendar.getInstance();
+ String year = String.valueOf(cal.get(Calendar.YEAR));
+ Map<String, String> map = informationService.queryYearKh(year, jurisdiction, deptid);
+ map = (HashMap<String, String>) sortMapBykeyAsc(map);//key升序
+ return R.data(map);
+ }
+ //升序
+ public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
+ Map<String, String> sortedMap = new LinkedHashMap<String, String>();
+ try {
+ if (oriMap != null && !oriMap.isEmpty()) {
+ List<Map.Entry<String, String>> entryList = new ArrayList<Map.Entry<String, String>>(oriMap.entrySet());
+ Collections.sort(entryList,
+ new Comparator<Map.Entry<String, String>>() {
+ public int compare(Map.Entry<String, String> entry2,
+ Map.Entry<String, String> entry1) {
+ int value2 = 0, value1 = 0;
+ try {
+ value2 = Integer.parseInt(entry1.getKey());
+ value1 = Integer.parseInt(entry2.getKey());
+ } catch (NumberFormatException e) {
+ value2 = 0;
+ value1 = 0;
+ }
+ return value1 - value2;
+ }
+ });
+ Iterator<Map.Entry<String, String>> iter = entryList.iterator();
+ Map.Entry<String, String> tmpEntry = null;
+ while (iter.hasNext()) {
+ tmpEntry = iter.next();
+ sortedMap.put(tmpEntry.getKey(), tmpEntry.getValue());
+ }
+ }
+ } catch (Exception e) {
+ }
+ return sortedMap;
+ }
}
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 d38dfe4..54eac0d 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.java
@@ -48,8 +48,8 @@
Map selectCount(String departmentid);
List<Map<Object,String>> selectInCount();
void deleteDept(String departmentid);
- List<Map<Object,Object>> selectExtype(String deptid);
- List<Map<Object,Object>> selectHold(String deptid);
+ List<Map<Object,Object>> selectExtype(String deptid,String jurisdiction);
+ List<Map<Object,Object>> selectHold(String deptid,String jurisdiction);
List<Map<Object,Object>> selectDis(String deptid);
List<Map<Object,Object>> selectDisp(String deptid);
List<Map<Object,Object>> selectSoil(String deptid);
@@ -61,4 +61,5 @@
* @return
*/
List<InformationVO> securityPage(IPage<InformationVO> page, @Param("information") InformationVO information);
+ Map<String, String> queryYearKh(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 39c3a81..c5d8228 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -38,7 +38,9 @@
<insert id="insertIn" useGeneratedKeys="true" keyProperty="id">
- insert into sys_information(creditcode, enterprisename,representative, establishtime, registeredcapital,organizationcode, registrationnumber, identificationnumber, enterprises, address,business, region, registration, industry, departmentid, stats, jurisdiction,
+ insert into sys_information(creditcode, enterprisename, representative, establishtime, registeredcapital,
+ organizationcode, registrationnumber, identificationnumber, enterprises, address,
+ business, region, registration, industry, departmentid, stats, jurisdiction,
representativecell, contacts, contactscell)
values (#{information.creditcode}, #{information.enterprisename}, #{information.representative},
#{information.establishtime}, #{information.registeredcapital},
@@ -59,10 +61,13 @@
IFNULL(C.pnum ,0) as pnum
FROM
sys_information i
- LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND status=1 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
- LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND status=1 AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
- LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND status=1 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
- where 1=1
+ LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
+ status=1 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
+ LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
+ status=1 AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
+ LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
+ status=1 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
+ where 1=1
<if test="information.enterprisename!=null and information.enterprisename!=''">
and i.enterpriseName like concat(concat('%', #{information.enterprisename}),'%')
</if>
@@ -137,39 +142,50 @@
<!--资格审查异常数量-->
<select id="selectExtype" resultType="java.util.HashMap">
- SELECT A.num as zc,
- B.num as bzc
+ SELECT IFNULL(A.num,0) AS zc,IFNULL(B.num ,0) AS bzc
FROM (
- SELECT COUNT(*) AS num,
- u.dept_id
- FROM blade_user u
- WHERE u.examination_type = 0
- GROUP BY u.dept_id
- ) A
- LEFT JOIN (
- SELECT COUNT(*) AS num,
- u.dept_id
- FROM blade_user u
- WHERE u.examination_type = 1
- GROUP BY u.dept_id
+ SELECT COUNT(*) AS num,
+ u.dept_id,u.jurisdiction
+ FROM blade_user u
+ WHERE u.examination_type = 0
+ GROUP BY u.dept_id,u.jurisdiction
+ ) A
+ LEFT JOIN (
+ SELECT COUNT(*) AS num,
+ u.dept_id,u.jurisdiction
+ FROM blade_user u
+ WHERE u.examination_type = 1
+ GROUP BY u.dept_id,u.jurisdiction
) B ON A.dept_id = B.dept_id
- WHERE A.dept_id = #{deptid}
+ <if test="jurisdiction!=null and jurisdiction==''">
+ WHERE A.jurisdiction = #{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid==''">
+ WHERE A.dept_id = #{deptid}
+ </if>
</select>
<!--保安员持证和未持证数量-->
<select id="selectHold" resultType="java.util.HashMap">
SELECT IFNULL(A.thisnum, 0) AS cz,
- IFNULL(B.lastnum, 0) AS wcz
- FROM (SELECT COUNT(*) AS thisnum, dept_id
- FROM blade_user
- WHERE role_id = '1412226235153731586' AND hold = 1
- GROUP BY dept_id) A
- LEFT JOIN (SELECT COUNT(*) AS lastnum, dept_id
- FROM blade_user
- WHERE role_id = '1412226235153731586' AND hold = 2
- GROUP BY dept_id) B ON A.dept_id = B.dept_id
- WHERE A.dept_id =#{deptid}
+ IFNULL(B.lastnum, 0) AS wcz
+ FROM (SELECT COUNT(*) AS thisnum, dept_id,jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
+ AND hold = 1
+ 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 hold = 2
+ GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
+ <if test="jurisdiction!=null and jurisdiction==''">
+ WHERE A.jurisdiction = #{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid==''">
+ WHERE A.dept_id = #{deptid}
+ </if>
</select>
<!--派遣服务单位统计-->
<select id="selectDis" resultType="java.util.HashMap">
@@ -201,13 +217,13 @@
<!--查询培训单位信息(可以报名)-->
<select id="securityPage" resultType="org.springblade.modules.information.vo.InformationVO">
select
- si.*,bd.dept_name deptName
+ si.*,bd.dept_name deptName
from
- sys_information si
+ sys_information si
left join
- blade_dept bd
+ blade_dept bd
on
- si.departmentid = bd.id
+ si.departmentid = bd.id
where 1=1
and bd.dept_category = 3
<if test="information.deptName!=null and information.deptName!=''">
@@ -224,5 +240,37 @@
</if>
</select>
-
+ <!--查询本年所有月份的客户数量-->
+ <select id="queryYearKh" resultType="java.util.HashMap">
+ SELECT COUNT
+ (CASE WHEN MONTH (
+ s.start_time ) = 1 THEN s.id END ) AS '1', COUNT(CASE WHEN MONTH ( s.start_time ) = 2
+ THEN s.id END ) AS '2', COUNT(CASE WHEN MONTH ( s.start_time ) = 3 THEN s.id
+ END ) AS '3', COUNT(CASE WHEN MONTH ( s.start_time ) = 4 THEN s.id END ) AS '4', COUNT(CASE
+ WHEN MONTH ( s.start_time ) = 5 THEN s.id END ) AS '5', COUNT(CASE WHEN MONTH (
+ s.start_time ) = 6 THEN s.id END ) AS '6', COUNT(CASE WHEN MONTH ( s.start_time ) = 7
+ THEN s.id END ) AS '7', COUNT(CASE WHEN MONTH ( s.start_time ) = 8 THEN s.id
+ END ) AS '8', COUNT(CASE WHEN MONTH ( s.start_time ) = 9 THEN s.id END ) AS '9', COUNT(CASE
+ WHEN MONTH ( s.start_time ) = 10 THEN s.id END ) AS '10', COUNT(CASE WHEN MONTH (
+ s.start_time ) = 11 THEN s.id END ) AS '11', COUNT(CASE WHEN MONTH ( s.start_time ) = 12
+ THEN s.id END ) AS '12'
+ FROM sys_dispatcher_unit AS s
+ WHERE
+ YEAR ( s.start_time ) =#{year}
+ 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'">
+ and i.jurisdiction =#{jurisdiction}
+ </if>
+ GROUP BY
+ i.departmentid
+ )
+ <if test="deptid!=null and deptid!=''">
+ and dept_id =#{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 394130f..78f2d5e 100644
--- a/src/main/java/org/springblade/modules/information/service/IInformationService.java
+++ b/src/main/java/org/springblade/modules/information/service/IInformationService.java
@@ -49,11 +49,12 @@
Map selectCount(String departmentid);
List<Map<Object,String>> selectInCount();
void deleteDept(String departmentid);
- List<Map<Object,Object>> selectExtype(String deptid);
- List<Map<Object,Object>> selectHold(String deptid);
+ List<Map<Object,Object>> selectExtype(String deptid,String jurisdiction);
+ List<Map<Object,Object>> selectHold(String deptid,String jurisdiction);
List<Map<Object,Object>> selectDis(String deptid);
List<Map<Object,Object>> selectDisp(String deptid);
List<Map<Object,Object>> selectSoil(String deptid);
+ Map<String, String> queryYearKh(String year,String jurisdiction,String deptid);
/**
* 查询培训单位信息(可以报名)
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 2f332d5..ef75c0b 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
@@ -98,13 +98,13 @@
}
@Override
- public List<Map<Object, Object>> selectExtype(String deptid) {
- return baseMapper.selectExtype(deptid);
+ public List<Map<Object, Object>> selectExtype(String deptid,String jurisdiction) {
+ return baseMapper.selectExtype(deptid,jurisdiction);
}
@Override
- public List<Map<Object, Object>> selectHold(String deptid) {
- return baseMapper.selectHold(deptid);
+ public List<Map<Object, Object>> selectHold(String deptid,String jurisdiction) {
+ return baseMapper.selectHold(deptid,jurisdiction);
}
@Override
@@ -122,6 +122,11 @@
return baseMapper.selectSoil(deptid);
}
+ @Override
+ public Map<String, String> queryYearKh(String year, String jurisdiction, String deptid) {
+ return baseMapper.queryYearKh(year, jurisdiction, deptid);
+ }
+
/**
* 查询培训单位信息(可以报名)
* @param page
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 7a102cb..16a2330 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -652,8 +652,10 @@
/**
- * 保安员信息
- * @param user
+ *
+ * @param type 1:保安 2:公安
+ * @param deptid
+ * @param jurisdiction
* @return
*/
@GetMapping("/seleL")
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 9461e96..e40c8c8 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -398,11 +398,14 @@
*
FROM
blade_user where 1=1
- <if test="type!=null and type=='1'.toString()">
+ <if test="type!=null and type=='2'.toString()">
and role_id='1414840172333842433' and `status`=1 AND is_deleted=0
</if>
- <if test="type!=null and type=='2'.toString()">
- and role_id='1412226235153731586' and `status`=1 AND is_deleted=0
+ <if test="type!=null and type=='1'.toString()">
+ AND ( role_id = '1412226235153731586'
+ OR role_id = '1416733602219110402') AND `status` = 1
+ AND is_deleted = 0
+ AND dept_id = '1425665656887545857'
</if>
<if test="deptid!=null and deptid!=''">
and dept_id=#{deptid}
--
Gitblit v1.9.3