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 | 7 ++++---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index c07baf2..27cc331 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -571,7 +571,7 @@
mapzc1.put("zc", mapzc);
lists.add(mapzc1);
//保安持证数量
- Map<String, String> mapcz = informationService.queryYearZc(year, jurisdiction, deptid);
+ Map<String, String> mapcz = informationService.queryYearCz(year, jurisdiction, deptid);
mapcz = (HashMap<String, String>) sortMapBykeyAsc(mapcz);//key升序
mapcz1.put("chiz", mapcz);
lists.add(mapcz1);
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 508a693..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>
@@ -1412,6 +1412,7 @@
FROM (
SELECT u.enterpriseName,
u.departmentid,
+ u.jurisdiction,
d.dept_name AS deptname,
j.dept_name AS jurname
FROM sys_information u
--
Gitblit v1.9.3