From 4577179ec2eab3ef7ddf259d703ba18eb095ff7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 10 Sep 2021 14:39:28 +0800
Subject: [PATCH] 统计接口

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 3ede2f1..2a61191 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -150,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 and role_id = '1412226235153731586'AND `status` = 1 AND is_deleted = 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 or u.examination_type is null ) and role_id = '1412226235153731586'AND `status` = 1 AND is_deleted = 0 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}
@@ -167,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
@@ -175,6 +179,8 @@
         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
@@ -189,6 +195,8 @@
         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

--
Gitblit v1.9.3