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 | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 f37188e..bc35905 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -167,18 +167,20 @@
<select id="selectHold" resultType="java.util.HashMap">
SELECT
IFNULL( A.thisnum, 0 ) AS cz,
- A.real_name as czname,
- A.paper_time as cztime,
+ A.czname,
+ A.czptime,
IFNULL( B.lastnum, 0 ) AS wcz,
- B.real_name as wcname,
- B.paper_time as wcztime
+ B.wczname,
+ B.wczptime
FROM
(
SELECT departmentid,jurisdiction FROM sys_information GROUP BY departmentid,jurisdiction
) H
LEFT JOIN(
SELECT
- COUNT( * ) AS thisnum,real_name,paper_time,
+ COUNT( * ) AS thisnum,
+ group_concat(real_name) AS czname,
+ group_concat(IFNULL(paper_time,0)) AS czptime,
dept_id
FROM
blade_user
@@ -188,11 +190,13 @@
AND is_deleted = 0
AND hold = 1
GROUP BY
- dept_id,real_name,paper_time
+ dept_id
) A ON A.dept_id=H.departmentid
LEFT JOIN (
SELECT
- COUNT(*) AS lastnum,real_name,paper_time,
+ COUNT(*) AS lastnum,
+ group_concat(real_name) AS wczname,
+ group_concat(IFNULL(paper_time,0)) AS wczptime,
dept_id
FROM
blade_user
@@ -202,7 +206,7 @@
AND is_deleted = 0
AND hold = 2
GROUP BY
- dept_id,real_name,paper_time
+ dept_id
) B ON B.dept_id=H.departmentid
where 1=1
<if test="deptid!=null and deptid!=''">
@@ -294,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