From 4083f89a6f65502bbca1fb77f59a9b77aa52fb28 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 26 Aug 2021 16:04:35 +0800
Subject: [PATCH] 1.首页接口
---
src/main/java/org/springblade/common/config/BladeConfiguration.java | 2 +
src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml | 21 ++++++++--
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 19 ++-------
src/main/java/org/springblade/modules/information/controller/InformationController.java | 18 +++------
src/main/java/org/springblade/modules/punish/vo/PunishVO.java | 2 +
5 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index a2a7f50..df3ab3d 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -79,6 +79,8 @@
secureRegistry.excludePathPatterns("/workReport/**");
secureRegistry.excludePathPatterns("/seinspect/**");
secureRegistry.excludePathPatterns("/coinspect/**");
+ secureRegistry.excludePathPatterns("/dispatcherUnit/**");
+ secureRegistry.excludePathPatterns("/punish/**");
return secureRegistry;
}
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 0ec747e..c07baf2 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -897,14 +897,8 @@
Integer count = 0;
List<Map<String, Object>> lists = new ArrayList<>();
List<Map<Object, Object>> maps = informationService.selectCf(jurisdiction);
- for (int i = 0; i < maps.size(); i++) {
- String num = maps.get(i).get("num").toString();
- count += Integer.valueOf(num);
- }
- map.put("count", count);
- map.put("list", maps);
- lists.add(map);
- return R.data(lists);
+ map.put("count", maps.size());
+ return R.data(map);
}
/**
@@ -972,14 +966,14 @@
Map map = new HashMap();
int count = 0;
for (int i = 0; i < list.size(); i++) {
- String num = list.get(i).get("num").toString();
+ String num = list.get(i).get("fwnum").toString();
int a = Integer.parseInt(num);
if (a == 0) {
count++;
list1.add(list.get(i));
}
}
- map.put("Count", count);
+ map.put("count", count);
map.put("List", list1);
return R.data(map);
}
@@ -994,14 +988,14 @@
Map map = new HashMap();
int count = 0;
for (int i = 0; i < list.size(); i++) {
- String num = list.get(i).get("num").toString();
+ String num = list.get(i).get("znum").toString();
int a = Integer.parseInt(num);
if (a == 0) {
count++;
list1.add(list.get(i));
}
}
- map.put("Count", count);
+ map.put("count", count);
map.put("List", list1);
return R.data(map);
}
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..508a693 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -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,8 +1406,6 @@
<!--违规经营-->
<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
@@ -1458,7 +1452,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 +1511,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,
diff --git a/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml b/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
index a78ee85..285b840 100644
--- a/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
+++ b/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
@@ -3,20 +3,33 @@
<mapper namespace="org.springblade.modules.punish.mapper.PunishMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="punishResultMap" type="org.springblade.modules.punish.entity.Punish">
- <id column="id" property="id"/>
- <result column="deptid" property="deptid"/>
+ <resultMap id="punishResultMap" type="org.springblade.modules.punish.vo.PunishVO">
<result column="punishtype" property="punishtype"/>
<result column="punishreason" property="punishreason"/>
<result column="punishresult" property="punishresult"/>
<result column="punishtime" property="punishtime"/>
<result column="punisnum" property="punisnum"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="enterpriseName" property="enterpriseName"/>
+ <result column="jurname" property="jurname"/>
</resultMap>
<select id="selectPunishPage" resultMap="punishResultMap">
- select * from sys_punish
+ SELECT i.enterpriseName,
+ j.dept_name as jurname,
+ p.punishtype,
+ p.punishreason,
+ p.punishresult,
+ p.punishtime,
+ p.punisnum
+ 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
+ <if test="punish.jurisdiction!=null and punish.jurisdiction!='' and punish.jurisdiction!='1123598813738675201'">
+ and p.jurisdiction = #{punish.jurisdiction}
+ </if>
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/punish/vo/PunishVO.java b/src/main/java/org/springblade/modules/punish/vo/PunishVO.java
index 1a71651..e37c330 100644
--- a/src/main/java/org/springblade/modules/punish/vo/PunishVO.java
+++ b/src/main/java/org/springblade/modules/punish/vo/PunishVO.java
@@ -32,5 +32,7 @@
@ApiModel(value = "PunishVO对象", description = "PunishVO对象")
public class PunishVO extends Punish {
private static final long serialVersionUID = 1L;
+ private String enterpriseName;
+ private String jurname;
}
--
Gitblit v1.9.3