From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 98b7c58..bc35905 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}
@@ -165,7 +167,11 @@
<select id="selectHold" resultType="java.util.HashMap">
SELECT
IFNULL( A.thisnum, 0 ) AS cz,
- IFNULL( B.lastnum, 0 ) AS wcz
+ A.czname,
+ A.czptime,
+ IFNULL( B.lastnum, 0 ) AS wcz,
+ B.wczname,
+ B.wczptime
FROM
(
SELECT departmentid,jurisdiction FROM sys_information GROUP BY departmentid,jurisdiction
@@ -173,11 +179,13 @@
LEFT JOIN(
SELECT
COUNT( * ) AS thisnum,
+ group_concat(real_name) AS czname,
+ group_concat(IFNULL(paper_time,0)) AS czptime,
dept_id
FROM
blade_user
WHERE
- ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+ role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
AND hold = 1
@@ -187,11 +195,13 @@
LEFT JOIN (
SELECT
COUNT(*) AS lastnum,
+ group_concat(real_name) AS wczname,
+ group_concat(IFNULL(paper_time,0)) AS wczptime,
dept_id
FROM
blade_user
WHERE
- ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+ role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
AND hold = 2
@@ -229,7 +239,8 @@
FROM
blade_user
WHERE
- `status` = 1
+ role_id = '1412226235153731586'
+ and `status` = 1
AND is_deleted = 0
AND dispatch = 0
GROUP BY
@@ -242,7 +253,8 @@
FROM
blade_user
WHERE
- `status` = 1
+ role_id = '1412226235153731586'
+ and `status` = 1
AND is_deleted = 0
AND dispatch = 1
GROUP BY
@@ -286,7 +298,7 @@
on
si.departmentid = bd.id
where 1=1
- and bd.dept_category = 3
+ and si.stats = 1
<if test="information.deptName!=null and information.deptName!=''">
and bd.dept_name like concat(concat('%', #{information.deptName}),'%')
</if>
--
Gitblit v1.9.3