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 | 145 +++++++++++++++++++++++++++++++++---------------
1 files changed, 99 insertions(+), 46 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 3a739a2..a07d0bd 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 is_deleted = 0 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 is_deleted = 0 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 is_deleted = 0 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=='' and jurisdiction!='1123598813738675201'">
+ 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=='' and jurisdiction!='1123598813738675201'">
+ 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">
@@ -182,32 +198,55 @@
</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>
<!--查询培训单位信息(可以报名)-->
<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 +263,19 @@
</if>
</select>
-
+ <!--查询本年所有月份h合同开始时间的客户数量-->
+ <select id="queryYearKh" resultType="java.util.HashMap">
+ SELECT
+ start_time,
+ end_time
+ FROM
+ `sys_dispatcher_unit`
+ WHERE YEAR (end_time) >='2021'
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and jurisdiction =#{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid!=''">
+ and dept_id =#{deptid}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3