From 4117d4038b5945f816267874c5e808e80aa190cd Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Wed, 30 Oct 2024 16:49:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=A1=B5=E9=9D=A2=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=8A=9F=E8=83=BD=E4=BB=A5=E5=8F=8A=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=20=E5=BC=80=E5=8F=91=E7=BB=BC=E5=90=88=E5=88=86=E6=9E=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/css/stat1.css | 9 +- .../code/registration/staticRegistration.html | 181 ++++++++++++++++-- .../code/statistical/staticProgram.html | 26 --- .../project/code/statistical/statistical.html | 17 +- .../code/statistical/statisticalPanel.html | 95 +++++++++ ...nforcementInspectionProgramController.java | 9 + .../EnforcementRegistrationController.java | 18 ++ .../dto/EnforcementRegistrationDto.java | 41 +++- .../mapper/EnforcementRegistrationMapper.java | 7 + .../IEnforcementRegistrationService.java | 7 + .../EnforcementRegistrationServiceImpl.java | 7 + .../EnforcementInspectionProgramMapper.xml | 48 ++--- .../mapper/EnforcementRegistrationMapper.xml | 71 ++++++- 13 files changed, 452 insertions(+), 84 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css index 14298035..4bb99706 100755 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css @@ -107,6 +107,7 @@ body { z-index: -999; width: 100%; height: 100%; + background-color: white } .tab_cont { @@ -218,10 +219,14 @@ body { } .tab_item2 { - position: absolute; - z-index: -999; + /*position: absolute;*/ + z-index: -9999; width: 100%; height: 100%; + display: flex; + flex-wrap: wrap; + align-content: space-around; + justify-content: center } .tab_item2 .echarts{ diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html index aecc5548..85786837 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html @@ -1,7 +1,53 @@ - + + +
@@ -21,6 +67,7 @@

  • 企业名称：

    +

  • 检查事项：

    @@ -28,15 +75,17 @@

  • 时段：

    - + + + + +
    • -
  • -

    检查时间：

    - +
  • +

    自定义时间：

    + - - +
  •  搜索 @@ -73,19 +122,35 @@ 下载
    • -
    -
    -
    +
    + +
    +
    x
    + + + + + + + + + + + + +
    执法部门执法人员检查事项数量
    +
    + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html index 182e135c..8cbd1de0 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html @@ -10,32 +10,6 @@
    -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    检查计划统计 检查计划排行 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 43ffc527..f6af1703 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 @@ -212,6 +212,7 @@
    + @@ -220,7 +221,7 @@ window.onload = function () { selectDate(); - } + }; function setTab(name, cursel, n) { for (i = 1; i <= n; i++) { @@ -277,12 +278,12 @@ dataY: dataY, dataSum: dataSum, dataPercent: dataPercent, - } + }; initSchedule(data); } function initSchedule(dataAll) { var _this = this; - var myColor = ['#3C83FF'] + var myColor = ['#3C83FF']; var option = { tooltip: { trigger: 'item' @@ -332,7 +333,7 @@ var traceValue; for (var i = 0; i < dataAll.dataX.length; i++) { if (data === dataAll.dataX[i]) { - traceValue = dataAll.dataY[i] + traceValue = dataAll.dataY[i]; break } } @@ -340,7 +341,7 @@ '{a|' + data + '}', '{b|' + traceValue + '}', '{c|件}' - ] + ]; return arr.join('') }, formatter: function (params) { @@ -423,14 +424,14 @@ var traceValue; for (var i = 0; i < dataAll.dataX.length; i++) { if (data.name === dataAll.dataX[i]) { - traceValue = dataAll.dataPercent[i] + traceValue = dataAll.dataPercent[i]; break } } var arr = [ '{a|' + traceValue + '}', '{b|%}' - ] + ]; return arr.join(''); }, textStyle: { @@ -468,7 +469,7 @@ ] }; echartLine.setOption(option, true); - }; + } /** 案件数量 */ function queryCaseAnalysis(qorm, year, quarter, month,industryValue) { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html new file mode 100644 index 00000000..242af6f0 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/statisticalPanel.html @@ -0,0 +1,95 @@ + + + + + + + + + + + + +
    +
    +
    +
    执法部门数量
    +
    48
    +
    + 2较上年 +
    +
    +
    +
    +
    执法人员数量
    +
    1969
    +
    + 32较上年 +
    +
    +
    +
    本单位执法人员数量
    +
    48
    +
    + 14较上年 +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java index e852be22..f94b7bc9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementInspectionProgramController.java @@ -50,6 +50,15 @@ public class EnforcementInspectionProgramController extends BaseController { return prefix2 + "/staticProgram"; } + + + @GetMapping("/statisticalPanel") + public String statisticalPanel() + { + return prefix2 + "/statisticalPanel"; + } + + /** * 查询执法检查计划列表 */ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 619b1053..39d1831c 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -100,6 +100,11 @@ public class EnforcementRegistrationController extends BaseController return getDataTable(list); } + /** + * 获取执法数据列表 + * @param enforcementRegistrationDto + * @return + */ @PostMapping("/staticEnforcementRegistration") @ResponseBody public TableDataInfo staticList(EnforcementRegistrationDto enforcementRegistrationDto){ @@ -108,6 +113,19 @@ public class EnforcementRegistrationController extends BaseController staticEnforcementRegistration(enforcementRegistrationDto); return getDataTable(enforcementRegistrationDtos); } + + /** + * 获取执法分析详细清单数据 + * @param enforcementRegistrationDto + * @return + */ + @PostMapping("/staticEnforcementRegistrationDetail") + @ResponseBody + public ZDResponse staticListDetail(EnforcementRegistrationDto enforcementRegistrationDto){ + List enforcementRegistrationDtos = enforcementRegistrationService. + staticEnforcementRegistrationDetail(enforcementRegistrationDto); + return ZDResponse.success("获取执法分析详细清单",enforcementRegistrationDtos); + } /** * 查询执法端-执法登记列表 */ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java index ff56adc8..4335986f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java @@ -1,9 +1,11 @@ package com.zdxt.code.domain.dto; +import com.zdxt.common.BaseDomain; + /** * 执法登记 统计 */ -public class EnforcementRegistrationDto { +public class EnforcementRegistrationDto extends BaseDomain { /** 被执法企业 */ private String enterpriseName; @@ -38,6 +40,19 @@ public class EnforcementRegistrationDto { */ private String bureauDeptName; + /** + * 年度 + */ + private String year; + /** + * 季度 + */ + private String quarter; + /** + * 月度 + */ + private String month; + public String getEnterpriseName() { return enterpriseName; @@ -110,4 +125,28 @@ public class EnforcementRegistrationDto { public void setBureauDeptName(String bureauDeptName) { this.bureauDeptName = bureauDeptName; } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public String getQuarter() { + return quarter; + } + + public void setQuarter(String quarter) { + this.quarter = quarter; + } + + public String getMonth() { + return month; + } + + public void setMonth(String month) { + this.month = month; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java index 314ef796..4328e686 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java @@ -100,4 +100,11 @@ public interface EnforcementRegistrationMapper * @return */ List staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto); + + /** + * 统计分析，统计分类列表 + * @param enforcementRegistrationDto + * @return + */ + List staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index 822fc167..59edb315 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -96,4 +96,11 @@ public interface IEnforcementRegistrationService */ List staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto); + /** + * 统计分析列表详细清单 + * @param enforcementRegistrationDto + * @return + */ + List staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto); + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index 38ba3dcd..c87669fe 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -541,6 +541,13 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat return enforcementRegistrationDtos; } + @Override + public List staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto) { + List enforcementRegistrationDtos = + enforcementRegistrationMapper.staticEnforcementRegistrationDetail(enforcementRegistrationDto); + return enforcementRegistrationDtos; + } + public static String getTime(Integer mouthTime){ int year = LocalDate.now().getYear(); int nowMonth = LocalDate.now().getMonth().getValue() - (mouthTime -1); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml index 6745ca29..21434d41 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml @@ -225,22 +225,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM enforcement_inspection_program - bureau_dept_name like concat('%', #{bureauDeptName}, '%') + and bureau_dept_name like concat('%', #{bureauDeptName}, '%') - = concat('%', #{beginTime}, '%') ]]> + and = concat('%', #{beginTime}, '%') ]]> - + and - YEAR(create_time) = #{year} + and YEAR(create_time) = #{year} - QUARTER(create_time) = #{quarter} + and QUARTER(create_time) = #{quarter} - DATE_FORMAT(create_time, '%Y-%m') = #{month} + and DATE_FORMAT(create_time, '%Y-%m') = #{month} AND bureau_dept_id is not null @@ -255,22 +255,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM enforcement_inspection_program - bureau_dept_name like concat('%', #{bureauDeptName}, '%') + and bureau_dept_name like concat('%', #{bureauDeptName}, '%') - = concat('%', #{beginTime}, '%') ]]> + and = concat('%', #{beginTime}, '%') ]]> - + and - YEAR(create_time) = #{year} + and YEAR(create_time) = #{year} - QUARTER(create_time) = #{quarter} + and QUARTER(create_time) = #{quarter} - DATE_FORMAT(create_time, '%Y-%m') = #{month} + and DATE_FORMAT(create_time, '%Y-%m') = #{month} AND bureau_dept_id is not null @@ -285,22 +285,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM enforcement_inspection_program - bureau_dept_name like concat('%', #{bureauDeptName}, '%') + AND bureau_dept_name like concat('%', #{bureauDeptName}, '%') - = concat('%', #{beginTime}, '%') ]]> + AND = #{beginTime} ]]> - + AND - YEAR(create_time) = #{year} + AND YEAR(create_time) = #{year} - QUARTER(create_time) = #{quarter} + AND QUARTER(create_time) = #{quarter} - DATE_FORMAT(create_time, '%Y-%m') = #{month} + AND DATE_FORMAT(create_time, '%Y-%m') = #{month} AND bureau_dept_id is not null @@ -315,22 +315,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM enforcement_inspection_program - bureau_dept_name like concat('%', #{bureauDeptName}, '%') + AND bureau_dept_name like concat('%', #{bureauDeptName}, '%') - = concat('%', #{beginTime}, '%') ]]> + AND = concat('%', #{beginTime}, '%') ]]> - + AND - YEAR(create_time) = #{year} + AND YEAR(create_time) = #{year} - QUARTER(create_time) = #{quarter} + AND QUARTER(create_time) = #{quarter} - DATE_FORMAT(create_time, '%Y-%m') = #{month} + AND DATE_FORMAT(create_time, '%Y-%m') = #{month} AND bureau_dept_id is not null diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 3400cc5f..c38bc454 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -542,23 +542,86 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( SELECT * FROM enforcement_registration - enterprise_name like concat(concat('%',#{enterpriseName}),'%') + AND enterprise_name like concat(concat('%',#{enterpriseName}),'%') - bureau_dept_name like concat(concat('%',#{bureauDeptName}),'%') + AND bureau_dept_name like concat(concat('%',#{bureauDeptName}),'%') - (law_enforcer like concat(concat('%',#{lawEnforcer}),'%') + AND (law_enforcer like concat(concat('%',#{lawEnforcer}),'%') or law_enforcer_two like concat(concat('%',#{lawEnforcer}),'%')) - law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%') + AND law_enforcement_item_text like concat(concat('%',#{lawEnforcementItemText}),'%') + + + AND YEAR(create_time) = #{year} + + + AND QUARTER(create_time) = #{quarter} + + + AND DATE_FORMAT(create_time, '%m') = #{month} + + + AND = #{params.beginTime} ]]> + + + AND ORDER BY create_time DESC LIMIT 1000000000 ) t GROUP BY t.enterprise_number + order by t.create_time + \ No newline at end of file