From fc7a15ffb3fe3382f24d62d800dcde34cdbf724d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Sep 2021 08:47:14 +0800
Subject: [PATCH] 部门信息表，培训报名表新增字段
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 c7f23de..bc35905 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -178,7 +178,7 @@
) 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
@@ -190,11 +190,11 @@
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
@@ -206,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!=''">
@@ -298,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