From 7327c2b113573bccaeef5b3fc5c82011abc00cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:58:03 +0800
Subject: [PATCH] 设备，车辆接口修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 83 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 39 deletions(-)
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 c5d8228..a07d0bd 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -157,10 +157,10 @@
WHERE u.examination_type = 1
GROUP BY u.dept_id,u.jurisdiction
) B ON A.dept_id = B.dept_id
- <if test="jurisdiction!=null and jurisdiction==''">
+ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
WHERE A.jurisdiction = #{jurisdiction}
</if>
- <if test="deptid!=null and deptid==''">
+ <if test="deptid!=null and deptid!=''">
WHERE A.dept_id = #{deptid}
</if>
</select>
@@ -180,10 +180,10 @@
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==''">
+ <if test="jurisdiction!=null and jurisdiction=='' and jurisdiction!='1123598813738675201'">
WHERE A.jurisdiction = #{jurisdiction}
</if>
- <if test="deptid!=null and deptid==''">
+ <if test="deptid!=null and deptid!=''">
WHERE A.dept_id = #{deptid}
</if>
</select>
@@ -198,20 +198,43 @@
</select>
<select id="selectDisp" resultType="java.util.HashMap">
- SELECT COUNT(d.NAME) AS num,
- u.real_name
- FROM sys_dispatcher d
- LEFT JOIN blade_user u ON u.cardid = d.cardid
- WHERE d.dept_id = #{deptid}
- GROUP BY u.real_name
+ SELECT IFNULL(A.thisnum, 0) AS pnum,
+ IFNULL(B.lastnum, 0) AS wpnum
+ FROM (SELECT COUNT(*) AS thisnum, dept_id,jurisdiction
+ FROM blade_user
+ WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
+ AND dispatch = 0
+ 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 dispatch = 0
+ GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ WHERE A.jurisdiction = #{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid!=''">
+ WHERE A.dept_id = #{deptid}
+ </if>
</select>
<select id="selectSoil" resultType="java.util.HashMap">
- SELECT A.numj,
- B.numz
- FROM (SELECT COUNT(*) AS numj, deptid FROM sys_socil GROUP BY deptid) A
- LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user GROUP BY dept_id) B ON A.deptid = B.dept_id
- WHERE A.deptid = #{deptid}
+ SELECT IFNULL(A.numj, 0) as numj,
+ IFNULL(B.numz, 0) as numz
+ FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
+ LEFT JOIN (SELECT COUNT(*) AS numj, dept_id
+ FROM blade_user
+ WHERE soil = 0 AND `status` = 1 AND is_deleted = 0
+ GROUP BY dept_id) A ON A.dept_id = H.departmentid
+ LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user WHERE `status` = 1 AND is_deleted = 0 GROUP BY
+ dept_id) B
+ ON H.departmentid = B.dept_id
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ WHERE H.jurisdiction = #{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid!=''">
+ WHERE H.departmentid = #{deptid}
+ </if>
</select>
<!--查询培训单位信息(可以报名)-->
@@ -240,35 +263,17 @@
</if>
</select>
- <!--查询本年所有月份的客户数量-->
+ <!--查询本年所有月份h合同开始时间的客户数量-->
<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
+ start_time,
+ end_time
FROM
- sys_information i
- LEFT JOIN sys_jurisdiction j ON j.id= i.jurisdiction where 1=1
+ `sys_dispatcher_unit`
+ WHERE YEAR (end_time) >='2021'
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and i.jurisdiction =#{jurisdiction}
+ and jurisdiction =#{jurisdiction}
</if>
- GROUP BY
- i.departmentid
- )
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
--
Gitblit v1.9.3