From 2dd4b51cb84f9b9097fdbd4db3d75c6eb1dabd35 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 09:36:31 +0800
Subject: [PATCH] 1.处罚
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 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 2aaeb78..da0b4c6 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -739,7 +739,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1412226235153731586'
+ AND role_id='1412226235153731586' and status=1 and is_deleted=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -771,7 +771,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1412226235153731586' AND examination_type=0
+ AND role_id='1412226235153731586' AND examination_type=0 and status=1 and is_deleted=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -803,7 +803,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1412226235153731586' AND hold=1
+ AND role_id='1412226235153731586' AND hold=1 and status=1 and is_deleted=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -1379,16 +1379,12 @@
<!--单位处罚数量-->
<select id="selectCf" resultType="java.util.HashMap">
SELECT COUNT(*) AS num,
- i.enterpriseName,
- j.dept_name as jurname,
- i.departmentid
- FROM `sys_punish` p
- LEFT JOIN sys_information i ON i.departmentid = p.deptid
- LEFT JOIN sys_jurisdiction j ON j.id = p.jurisdiction where 1=1
+ deptid
+ FROM `sys_punish` where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and p.jurisdiction =#{jurisdiction}
+ and jurisdiction =#{jurisdiction}
</if>
- GROUP BY i.enterpriseName, i.departmentid, j.dept_name
+ GROUP BY deptid
</select>
<!--单位材料不全数量-->
@@ -1410,14 +1406,13 @@
<!--违规经营-->
<select id="selectWg" resultType="java.util.HashMap">
SELECT A.enterpriseName,
- A.deptname,
- A.jurname,
IFNULL(B.cznum, 0) AS cznum,
IFNULL(C.sbnum, 0) AS sbnum,
IFNULL(D.znum, 0) AS znum
FROM (
SELECT u.enterpriseName,
u.departmentid,
+ u.jurisdiction,
d.dept_name AS deptname,
j.dept_name AS jurname
FROM sys_information u
@@ -1458,7 +1453,7 @@
SELECT
i.departmentid,
i.enterpriseName,
- IFNULL( d.num, 0 ) AS num,
+ IFNULL( d.num, 0 ) AS fwnum,
IFNULL( B.cznum, 0 ) AS cznum,
IFNULL( C.painum, 0 ) AS painum,
IFNULL( D.znum, 0 ) AS znum
@@ -1517,15 +1512,12 @@
SELECT
i.departmentid,
i.enterpriseName,
- IFNULL( d.num, 0 ) AS num,
IFNULL( B.cznum, 0 ) AS cznum,
IFNULL( C.painum, 0 ) AS painum,
IFNULL( D.znum, 0 ) AS znum,
IFNULL( E.fwnum, 0 ) AS fwnum
FROM
sys_information i
- LEFT JOIN ( SELECT COUNT( * ) num, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND `status` =
- 1 AND is_deleted = 0 GROUP BY dept_id ) d ON i.departmentid = d.dept_id
LEFT JOIN (
SELECT
COUNT( * ) AS cznum,
--
Gitblit v1.9.3