diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html index f2416058..3fdce7ce 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html @@ -42,10 +42,11 @@ 月度
- 案件数量 - 执法人员 - 检查事项 - 企业类型 + 案件数量 + 执法人员 + 检查事项 + 企业类型 + 企业排序
@@ -56,10 +57,14 @@
+
+
+
+
@@ -122,6 +127,31 @@ } }); } + function queryItemAnalysis(qorm, year, quarter, month, month) { + $.ajax({ + url: prefix + '/itemAnalysis', //后台url + data: { + "qorm": qorm, + "year": year, + "quarter": quarter, + "month": month, + }, + type: "GET", + dataType: 'json', + success: function (data) { //成功，回调函数 + var datas = []; + for (var i=0; i{b} : {c} ({d}%)" @@ -257,6 +304,19 @@ myChart.resize(); window.addEventListener('resize', () => { myChart.resize(); }); } + + function line_across(targetId, dates, nums) { + var myChart = echarts.init(document.getElementById(targetId)); + var option = { + xAxis: { type: 'category', data: dates }, + yAxis: { type: 'value' }, + series: [{ type: 'line', data: nums }] + }; + // 使用刚指定的配置项和数据显示图表。 + myChart.setOption(option); + myChart.resize(); + window.addEventListener('resize', () => { myChart.resize(); }); + } diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html index aef2dfd0..05e8f671 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statistical.html @@ -2,130 +2,258 @@ - + + +
-

深圳市各类行政检查实施情况统计表

-
年度 -季度 -月度 -
-
检查事项执法人员案件数量企业类型
-
-
- ---- - - - - -
行政检查事项行政检查次数
-
-
-
- ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
生态环境检查35
商务领域检查22
财务领域检查18
水务领域检查19
卫生健康检查43
生态环境检查35
商务领域检查22
财务领域检查18
水务领域检查19
卫生健康检查43
生态环境检查35
商务领域检查22
财政领域检查18
水务领域检查19
卫生健康检查43
-
-
+

深圳市各类行政检查实施情况分析

+
+ + 年度 + 年度 + 季度 + 月度 +
+
+ 企业排序 + 案件数量 + 执法人员 + 检查事项 + 企业类型 +
-
-
-
- -
-
- -
-
+
+
+ + + + + + + + + +
企业执法数日期
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalController.java index 5b8cbc93..0cf9e005 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalController.java @@ -75,10 +75,31 @@ public class StatisticalController { return ZDResponse.success("查询成功", statisticalVos); } + @GetMapping("/itemAnalysis") + @ResponseBody + public ZDResponse itemAnalysis(StatisticalVo statisticalVo){ + List statisticalVos = statisticalService.itemAnalysis(statisticalVo); + return ZDResponse.success("查询成功", statisticalVos); + } + @GetMapping("/enterpriseAnalysis") @ResponseBody public ZDResponse enterpriseAnalysis(StatisticalVo statisticalVo){ List statisticalVos = statisticalService.enterpriseAnalysis(statisticalVo); return ZDResponse.success("查询成功", statisticalVos); } + + @GetMapping("/enterpriseSortAnalysis") + @ResponseBody + public ZDResponse enterpriseSortAnalysis(StatisticalVo statisticalVo){ + Map res = statisticalService.enterpriseSortAnalysis(statisticalVo); + return ZDResponse.success("查询成功", res); + } + + @GetMapping("/enterpriseTableAnalysis") + @ResponseBody + public ZDResponse enterpriseTableAnalysis(StatisticalVo statisticalVo){ + List statisticalVos = statisticalService.enterpriseTableAnalysis(statisticalVo); + return ZDResponse.success("查询成功", statisticalVos); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java index 9dedb66a..5e38861d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticalVo.java @@ -52,6 +52,34 @@ public class StatisticalVo extends BaseDomain { /** 月 */ private String month; + private String name; + private String value; + private String date; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + public String getQorm() { return qorm; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java index 730e530b..27feeb0b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/StatisticalMapper.java @@ -45,5 +45,8 @@ public interface StatisticalMapper { List caseAnalysis(StatisticalVo statisticalVo); List enforcerAnalysis(StatisticalVo statisticalVo); + List itemAnalysis(StatisticalVo statisticalVo); List enterpriseAnalysis(StatisticalVo statisticalVo); + List enterpriseSortAnalysis(StatisticalVo statisticalVo); + List enterpriseTableAnalysis(StatisticalVo statisticalVo); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalService.java index e3417400..4df4b7d6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalService.java @@ -25,7 +25,13 @@ public interface StatisticalService { List caseAnalysis(StatisticalVo statisticalVo); /** 统计执法人员案件数量 */ List enforcerAnalysis(StatisticalVo statisticalVo); + /** 统计案件中的检查事项 */ + List itemAnalysis(StatisticalVo statisticalVo); /** 统计案件中的企业类型 */ List enterpriseAnalysis(StatisticalVo statisticalVo); + /** 统计案件中的企业每日案件数排序 */ + Map enterpriseSortAnalysis(StatisticalVo statisticalVo); + /** 统计案件中的企业每日案件数表格 */ + List enterpriseTableAnalysis(StatisticalVo statisticalVo); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java index c7926398..adb7e594 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java @@ -6,13 +6,11 @@ import com.zdxt.code.mapper.LinkageDictMapper; import com.zdxt.code.mapper.StatisticalMapper; import com.zdxt.code.service.StatisticalService; import com.zdxt.common.annotation.DataScope; +import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Service public class StatisticalServiceImpl implements StatisticalService @@ -72,6 +70,13 @@ public class StatisticalServiceImpl implements StatisticalService return statisticalVos; } + @Override + public List itemAnalysis(StatisticalVo statisticalVo) { + this.putParams(statisticalVo); + List statisticalVos = statisticalMapper.itemAnalysis(statisticalVo); + return statisticalVos; + } + @Override public List enterpriseAnalysis(StatisticalVo statisticalVo) { this.putParams(statisticalVo); @@ -79,6 +84,29 @@ public class StatisticalServiceImpl implements StatisticalService return statisticalVos; } + @Override + public Map enterpriseSortAnalysis(StatisticalVo statisticalVo) { + this.putParams(statisticalVo); + List statisticalVos = statisticalMapper.enterpriseSortAnalysis(statisticalVo); + Map res = new HashedMap(); + List dates = new ArrayList<>(); + List nums = new ArrayList<>(); + for (StatisticalVo vo : statisticalVos) { + dates.add(vo.getDate()); + nums.add(vo.getTotal()); + } + res.put("dates", dates); + res.put("nums", nums); + return res; + } + + @Override + public List enterpriseTableAnalysis(StatisticalVo statisticalVo) { + this.putParams(statisticalVo); + List statisticalVos = statisticalMapper.enterpriseTableAnalysis(statisticalVo); + return statisticalVos; + } + private void putParams(StatisticalVo statisticalVo) { Map params = statisticalVo.getParams(); if ("q".equals(statisticalVo.getQorm())) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml index 21244ae8..0c1f9d2a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml @@ -46,12 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') - AND DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', + AND DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01' WHEN QUARTER(CURDATE()) IN (2) THEN '04' WHEN QUARTER(CURDATE()) IN (3) THEN '07' ELSE '10' END) - and DATE_FORMAT(enforcement_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', + and DATE_FORMAT(enforcement_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '03' WHEN QUARTER(CURDATE()) IN (2) THEN '06' diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 1ca63ae8..da829039 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -86,12 +86,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') - AND DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', + AND DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01' WHEN QUARTER(CURDATE()) IN (2) THEN '04' WHEN QUARTER(CURDATE()) IN (3) THEN '07' ELSE '10' END) - and DATE_FORMAT(enforcement_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', + and DATE_FORMAT(enforcement_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '03' WHEN QUARTER(CURDATE()) IN (2) THEN '06' diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml index ba7be945..31cab8db 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml @@ -72,12 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE_FORMAT(check_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') - AND DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', + AND DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01' WHEN QUARTER(CURDATE()) IN (2) THEN '04' WHEN QUARTER(CURDATE()) IN (3) THEN '07' ELSE '10' END) - and DATE_FORMAT(enforcement_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', + and DATE_FORMAT(enforcement_time, '%Y-%m') <= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '03' WHEN QUARTER(CURDATE()) IN (2) THEN '06' diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml index aa0daa51..790b2181 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalMapper.xml @@ -15,6 +15,9 @@ + + + @@ -117,13 +120,13 @@ select law_enforcement,count(1) as total from enforcement_registration - AND DATE_FORMAT(create_time, '%Y-%m') >= #{params.startDate} + AND DATE_FORMAT(enforcement_time, '%Y-%m') >= #{params.startDate} - AND DATE_FORMAT(create_time, '%Y-%m') <= #{params.endDate} + AND DATE_FORMAT(enforcement_time, '%Y-%m') <= #{params.endDate} - AND DATE_FORMAT(create_time, '%Y-%m') = #{params.yearMonth} + AND DATE_FORMAT(enforcement_time, '%Y-%m') = #{params.yearMonth} GROUP BY law_enforcement_id @@ -133,34 +136,83 @@ select law_enforcer,count(1) as total from enforcement_registration - AND DATE_FORMAT(create_time, '%Y-%m') >= #{params.startDate} + AND DATE_FORMAT(enforcement_time, '%Y-%m') >= #{params.startDate} - AND DATE_FORMAT(create_time, '%Y-%m') <= #{params.endDate} + AND DATE_FORMAT(enforcement_time, '%Y-%m') <= #{params.endDate} - AND DATE_FORMAT(create_time, '%Y-%m') = #{params.yearMonth} + AND DATE_FORMAT(enforcement_time, '%Y-%m') = #{params.yearMonth} GROUP BY law_enforcer_id + + + + + + \ No newline at end of file