From cff62ae0836df0799651abd462feabeb4644b742 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 22 Nov 2021 08:48:57 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 14 +++++++++-----
1 files changed, 9 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 d8a5c81..d1b2299 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -498,9 +498,10 @@
SELECT IFNULL(A.thisnum, 0) AS thisnum,
IFNULL(B.lastnum, 0) AS lastnum,
IFNULL( C.num, 0 ) AS num,
+ IFNULL( C.fznum, 0 ) AS fznum,
H.departmentid,
H.jurisdiction
- FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
+ FROM (SELECT departmentid, jurisdiction FROM sys_information WHERE stats!=1 GROUP BY departmentid, jurisdiction) H
LEFT JOIN (
SELECT COUNT(*) AS thisnum,
dept_id
@@ -523,6 +524,7 @@
) B ON B.dept_id = H.departmentid
LEFT JOIN (
SELECT
+ J.fznum,
J.znum+J.fznum as num,
J.dept_id
FROM
@@ -1015,7 +1017,7 @@
i.departmentid
FROM
sys_information i
- LEFT JOIN sys_jurisdiction j ON j.id= i.jurisdiction where 1=1
+ LEFT JOIN sys_jurisdiction j ON j.id= i.jurisdiction where 1=1 and s.status=0
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
@@ -1073,7 +1075,7 @@
u.dept_id
FROM
sys_performance p
- INNER JOIN blade_user u ON p.securityId = u.id WHERE 1=1
+ INNER JOIN blade_user u ON p.cardid = u.cardid WHERE 1=1
<if test="type!=null and type=='1'.toString()">
and to_days(p.time) = to_days(now())
</if>
@@ -1083,9 +1085,11 @@
GROUP BY
dept_id
) J ON J.dept_id = H.departmentid
- WHERE 1 = 1
+ LEFT JOIN blade_dept d ON H.departmentid = d.id
+ LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
+ WHERE 1 =1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- AND H.jurisdiction in(${jurisdiction})
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
AND H.departmentid = #{deptid}
--
Gitblit v1.9.3