From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 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 15edf68..3ede2f1 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -27,7 +27,7 @@
<result column="representativecell" property="representativecell"/>
<result column="contacts" property="contacts"/>
<result column="contactscell" property="contactscell"/>
- <result column="businessLicense" property="businessLicense"/>
+ <result column="business_License" property="businessLicense"/>
<result column="licence" property="licence"/>
<result column="znum" property="znum"/>
<result column="cnum" property="cnum"/>
@@ -61,9 +61,11 @@
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
+ LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE
+ ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' ) 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
+ LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE
+ ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' ) 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
@@ -148,9 +150,9 @@
FROM
(
SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
- LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 GROUP BY u.dept_id
+ LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 and role_id = '1412226235153731586'AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
) A ON H.departmentid = A.dept_id
- LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 1 GROUP BY u.dept_id
+ LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or u.examination_type is null ) and role_id = '1412226235153731586'AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
) B ON H.departmentid = B.dept_id where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and H.jurisdiction = #{jurisdiction}
@@ -177,7 +179,7 @@
FROM
blade_user
WHERE
- ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+ role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
AND hold = 1
@@ -191,7 +193,7 @@
FROM
blade_user
WHERE
- ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+ role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
AND hold = 2
@@ -217,23 +219,44 @@
</select>
<select id="selectDisp" resultType="java.util.HashMap">
- 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
+ SELECT
+ IFNULL( A.thisnum, 0 ) AS pnum,
+ IFNULL( B.lastnum, 0 ) AS wpnum
+ FROM
+ ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+ LEFT JOIN (
+ SELECT
+ COUNT( * ) AS thisnum,
+ dept_id
+ 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 where 1=1
+ GROUP BY
+ dept_id
+ ) A ON A.dept_id = H.departmentid
+ LEFT JOIN (
+ SELECT
+ COUNT( * ) AS lastnum,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586'
+ and `status` = 1
+ AND is_deleted = 0
+ AND dispatch = 1
+ GROUP BY
+ dept_id
+ ) B ON H.departmentid = B.dept_id where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and A.jurisdiction = #{jurisdiction}
+ and H.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
- and A.dept_id = #{deptid}
+ and H.departmentid = #{deptid}
</if>
</select>
@@ -248,12 +271,12 @@
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 where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and H.jurisdiction = #{jurisdiction}
- </if>
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
</if>
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ and H.jurisdiction = #{jurisdiction}
+ </if>
</select>
<!--查询培训单位信息(可以报名)-->
--
Gitblit v1.9.3