From 3914c50f559a4d51d39dc293564927729154c466 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 04 Nov 2021 18:59:49 +0800
Subject: [PATCH] 统计查询接口修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 170 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 94 insertions(+), 76 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 7d41cc5..e609994 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -28,6 +28,7 @@
<result column="contactscell" property="contactscell"/>
<result column="business_License" property="businessLicense"/>
<result column="licence" property="licence"/>
+ <result column="jurisdictionName" property="jurisdictionName"/>
<result column="znum" property="znum"/>
<result column="cnum" property="cnum"/>
<result column="pnum" property="pnum"/>
@@ -41,9 +42,14 @@
i.*,
IFNULL(A.znum ,0) as znum,
IFNULL(B.cnum ,0) as cnum,
- IFNULL(C.pnum ,0) as pnum
+ IFNULL(C.pnum ,0) as pnum,
+ sj.dept_name jurisdictionName
FROM
sys_information i
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = i.jurisdiction
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
@@ -1229,142 +1235,147 @@
<select id="selectLi" resultType="java.util.HashMap">
SELECT
- IFNULL( A.num, 0 ) AS num,
+ IFNULL( J.num, 0 ) AS num,
IFNULL( B.cznum, 0 ) AS cznum,
- IFNULL( C.paiqnum, 0 ) AS paiqnum,
IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
IFNULL( E.sbnum, 0 ) AS sbnum,
IFNULL( F.wcaijnum, 0 ) AS wcaijnum,
IFNULL( H.ycaijzpnum, 0 ) AS ycaijzpnum,
IFNULL( I.ycaijzwnum, 0 ) AS ycaijzwnum,
IFNULL( G.yicnum, 0 ) AS yicnum,
- A.dept_id,
- d.enterpriseName AS deptname,
- d.stats,
+ A.departmentid,
+ A.enterpriseName AS deptname,
+ A.stats,
j.dept_name AS jurname
FROM
- ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' and
- status=1 AND is_deleted=0 GROUP BY
- dept_id, jurisdiction ) A
+ ( SELECT jurisdiction, departmentid,enterpriseName,stats,create_time FROM sys_information ) A
+ LEFT JOIN (
+ SELECT
+ COUNT( * ) AS num,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ GROUP BY
+ dept_id
+ ) J ON J.dept_id = A.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS cznum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND hold=1
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND hold = 1
GROUP BY
- dept_id,
- jurisdiction
- ) B ON A.dept_id = B.dept_id
+ dept_id
+ ) B ON A.departmentid = B.dept_id
LEFT JOIN (
SELECT
COUNT( * ) AS paiqnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND dispatch=0
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND dispatch = 0
GROUP BY
- dept_id,
- jurisdiction
- ) C ON C.dept_id = A.dept_id
+ dept_id
+ ) C ON C.dept_id = A.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS wpaiqnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND dispatch=1
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND dispatch = 1
GROUP BY
- dept_id,
- jurisdiction
- ) D ON D.dept_id = A.dept_id
+ dept_id
+ ) D ON D.dept_id = A.departmentid
+ LEFT JOIN ( SELECT COUNT( * ) AS sbnum, deptid FROM sys_socil GROUP BY deptid ) E ON E.deptid = A.departmentid
LEFT JOIN (
- SELECT COUNT( * ) AS sbnum, deptid, jurisdiction FROM sys_socil GROUP BY deptid, jurisdiction
- ) E
- ON E.deptid = A.dept_id
- LEFT JOIN
- (
SELECT
COUNT( * ) AS wcaijnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND photo=1
+ 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
- (
+ dept_id
+ ) F ON F.dept_id = A.departmentid
+ LEFT JOIN (
SELECT
COUNT( * ) AS ycaijzpnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND photo=0
+ 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
- (
+ dept_id
+ ) H ON H.dept_id = A.departmentid
+ LEFT JOIN (
SELECT
COUNT( * ) AS ycaijzwnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND fingerprint=0
+ 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
+ dept_id
+ ) I ON I.dept_id = A.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS yicnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND examination_mx=1
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND examination_mx = 1
GROUP BY
- dept_id,
- jurisdiction
- ) G ON G.dept_id = A.dept_id
- LEFT JOIN sys_information d ON A.dept_id = d.departmentid
- LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction
- WHERE 1=1
+ dept_id
+ ) G ON G.dept_id = A.departmentid
+ LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction WHERE 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and A.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
- and d.enterpriseName like concat(concat('%', #{deptid}),'%')
+ and A.enterpriseName like concat(concat('%', #{deptid}),'%')
</if>
<if test="stats!=null and stats!=''">
- and d.stats =#{stats}
+ and A.stats =#{stats}
+ </if>
+ <if test="startTime!=null and startTime!=''">
+ and A.create_time >= #{startTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and A.create_time <= #{endTime}
</if>
</select>
@@ -1591,7 +1602,8 @@
i.departmentid,
i.stats,
i.jurisdiction,
- j.dept_name
+ j.dept_name,
+ i.create_time
FROM
sys_information i
LEFT JOIN sys_jurisdiction j ON i.jurisdiction = j.id
@@ -1649,6 +1661,12 @@
<if test="stats!=null and stats!=''">
and A.stats=#{stats}
</if>
+ <if test="startTime!=null and startTime!=''">
+ and A.create_time >= #{startTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and A.create_time <= #{endTime}
+ </if>
</select>
<!--保安人员详情-->
--
Gitblit v1.9.3