From 3ddc55cb39c6b0b2182c298af58231d3e3e13c47 Mon Sep 17 00:00:00 2001 From: chenrui <1950717904@qq.com> Date: Mon, 21 Oct 2024 10:47:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=A1=8C=E6=94=BF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E8=AE=A1=E5=88=92=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/css/stat1.css | 2 +- .../code/statistical/staticProgram.html | 244 ++++++++++++++++++ ...nforcementInspectionProgramController.java | 40 ++- .../dto/EnforcementInspectionProgramDto.java | 95 +++++++ .../EnforcementInspectionProgramMapper.java | 28 +- .../IEnforcementInspectionProgramService.java | 29 ++- ...forcementInspectionProgramServiceImpl.java | 13 + .../EnforcementInspectionProgramMapper.xml | 45 +++- 8 files changed, 481 insertions(+), 15 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java 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 53ce55c2..b7fe606d 100755 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css @@ -39,7 +39,7 @@ body { .seltime { display: flex; position: absolute; - top: 110px; + /*top: 110px;*/ right: 1%; align-items: center; } 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 new file mode 100644 index 00000000..96372278 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/staticProgram.html @@ -0,0 +1,244 @@ + + + + + + + + + +
+
+ + + 年度 + + + + + + + + + + + + 所属行业： + + +
+
+ 检查事项 + 案件数量 +
+ +
+
+ +
+
+
+
+
+
    +
  • +

    执法部门：

    + +
    • +
  • +

    时段：

    + +
    • +
  • +

    企业类型：

    + +
    • +
  • +

    企业地址：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + +
行政检查部门行政检查案件数量
+
+
+
+ + + + + + +
+
+
+
+
+
+ +
+
+ + + + + \ 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 3468033c..2be7c290 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 @@ -5,6 +5,7 @@ import java.util.List; import cn.hutool.core.bean.BeanUtil; import com.zdxt.code.domain.LawEnforcementEnterprise; import com.zdxt.code.domain.LawEnforcementEnterpriseExport; +import com.zdxt.code.domain.dto.EnforcementInspectionProgramDto; import com.zdxt.code.service.ILawEnforcementEnterpriseService; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; @@ -29,7 +30,8 @@ import org.springframework.web.multipart.MultipartFile; @RequestMapping("/code/enforcementInspectionProgram") public class EnforcementInspectionProgramController extends BaseController { - private String prefix = "code/enforcementInspectionProgram"; + private String prefix = "project/code/enforcementInspectionProgram"; + private String prefix2 = "project/code/statistical"; @Autowired private IEnforcementInspectionProgramService enforcementInspectionProgramService; @@ -43,6 +45,11 @@ public class EnforcementInspectionProgramController extends BaseController return prefix + "/enforcementInspectionProgram"; } + @GetMapping("/staticProgramView") + public String staticProgramView() + { + return prefix2 + "/staticProgram"; + } /** * 查询执法检查计划列表 */ @@ -83,6 +90,35 @@ public class EnforcementInspectionProgramController extends BaseController return ZDResponse.success("查询成功",list); } + /** + * 按照分类统计执法计划 + * @param enforcementInspectionProgramDto + * @return + */ + @PostMapping("/staticProgram") + @ResponseBody + public TableDataInfo staticProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto) + { +// startPage(); + List enforcementInspectionProgramDtos = + enforcementInspectionProgramService.staticProgram(enforcementInspectionProgramDto); + return getDataTable(enforcementInspectionProgramDtos); + } + + /** + * 按照分类统计执法计划 + * @param enforcementInspectionProgramDto + * @return + */ + @PostMapping("/staticAllProgram") + @ResponseBody + public ZDResponse staticAllProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto) + { + EnforcementInspectionProgramDto enforcementInspectionProgramDto1 = + enforcementInspectionProgramService.staticAllProgram(enforcementInspectionProgramDto); + return ZDResponse.success("执法计划分类统计总数查询成功",enforcementInspectionProgramDto1); + } + /** * 新增执法检查计划 @@ -151,4 +187,6 @@ public class EnforcementInspectionProgramController extends BaseController lawEnforcementEnterpriseService.insertLawEnforcementEnterprise(lawEnforcementEnterprise); } } + + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java new file mode 100644 index 00000000..268d65ea --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementInspectionProgramDto.java @@ -0,0 +1,95 @@ +package com.zdxt.code.domain.dto; + +import com.zdxt.common.BaseDomain; + +public class EnforcementInspectionProgramDto extends BaseDomain { + + /** + * 开始时间 + */ + private String beginTime; + /** + * 结束时间 + */ + private String endTime; + + /** + * 局级部门ID + */ + private String bureauDeptId; + /** + * 局级部门名称 + */ + private String bureauDeptName; + + /** + * 年度总数 + */ + private Integer yearTotal = 0; + + /** + * 季度总数 + */ + private Integer quarterTotal = 0; + + /** + * 月度总数 + */ + private Integer monthTotal = 0; + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getBureauDeptId() { + return bureauDeptId; + } + + public void setBureauDeptId(String bureauDeptId) { + this.bureauDeptId = bureauDeptId; + } + + public String getBureauDeptName() { + return bureauDeptName; + } + + public void setBureauDeptName(String bureauDeptName) { + this.bureauDeptName = bureauDeptName; + } + + public Integer getYearTotal() { + return yearTotal; + } + + public void setYearTotal(Integer yearTotal) { + this.yearTotal = yearTotal; + } + + public Integer getQuarterTotal() { + return quarterTotal; + } + + public void setQuarterTotal(Integer quarterTotal) { + this.quarterTotal = quarterTotal; + } + + public Integer getMonthTotal() { + return monthTotal; + } + + public void setMonthTotal(Integer monthTotal) { + this.monthTotal = monthTotal; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java index cd4e3b4d..dfad8b15 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementInspectionProgramMapper.java @@ -1,7 +1,10 @@ package com.zdxt.code.mapper; import com.zdxt.code.domain.EnforcementInspectionProgram; +import com.zdxt.code.domain.dto.EnforcementInspectionProgramDto; + import java.util.List; +import java.util.Map; /** * 执法检查计划Mapper接口 @@ -17,7 +20,7 @@ public interface EnforcementInspectionProgramMapper * @param id 执法检查计划ID * @return 执法检查计划 */ - public EnforcementInspectionProgram selectEnforcementInspectionProgramById(String id); + EnforcementInspectionProgram selectEnforcementInspectionProgramById(String id); /** * 查询执法检查计划列表 @@ -25,7 +28,7 @@ public interface EnforcementInspectionProgramMapper * @param enforcementInspectionProgram 执法检查计划 * @return 执法检查计划集合 */ - public List selectEnforcementInspectionProgramList(EnforcementInspectionProgram enforcementInspectionProgram); + List selectEnforcementInspectionProgramList(EnforcementInspectionProgram enforcementInspectionProgram); /** * 新增执法检查计划 @@ -33,7 +36,7 @@ public interface EnforcementInspectionProgramMapper * @param enforcementInspectionProgram 执法检查计划 * @return 结果 */ - public int insertEnforcementInspectionProgram(EnforcementInspectionProgram enforcementInspectionProgram); + int insertEnforcementInspectionProgram(EnforcementInspectionProgram enforcementInspectionProgram); /** * 修改执法检查计划 @@ -41,7 +44,7 @@ public interface EnforcementInspectionProgramMapper * @param enforcementInspectionProgram 执法检查计划 * @return 结果 */ - public int updateEnforcementInspectionProgram(EnforcementInspectionProgram enforcementInspectionProgram); + int updateEnforcementInspectionProgram(EnforcementInspectionProgram enforcementInspectionProgram); /** * 删除执法检查计划 @@ -49,7 +52,7 @@ public interface EnforcementInspectionProgramMapper * @param id 执法检查计划ID * @return 结果 */ - public int deleteEnforcementInspectionProgramById(String id); + int deleteEnforcementInspectionProgramById(String id); /** * 批量删除执法检查计划 @@ -57,5 +60,18 @@ public interface EnforcementInspectionProgramMapper * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteEnforcementInspectionProgramByIds(String[] ids); + int deleteEnforcementInspectionProgramByIds(String[] ids); + + /** + * 统计执法计划按照执法部门统计 + * @return + */ + List staticProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + + /** + * 统计总数 + * @param enforcementInspectionProgramDto + * @return + */ + EnforcementInspectionProgramDto staticAllProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java index da9d25b3..b63627f2 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementInspectionProgramService.java @@ -1,7 +1,10 @@ package com.zdxt.code.service; import com.zdxt.code.domain.EnforcementInspectionProgram; +import com.zdxt.code.domain.dto.EnforcementInspectionProgramDto; + import java.util.List; +import java.util.Map; /** * 执法检查计划Service接口 @@ -17,7 +20,7 @@ public interface IEnforcementInspectionProgramService * @param id 执法检查计划ID * @return 执法检查计划 */ - public EnforcementInspectionProgram selectEnforcementInspectionProgramById(String id); + EnforcementInspectionProgram selectEnforcementInspectionProgramById(String id); /** * 查询执法检查计划列表 @@ -25,7 +28,7 @@ public interface IEnforcementInspectionProgramService * @param enforcementInspectionProgram 执法检查计划 * @return 执法检查计划集合 */ - public List selectEnforcementInspectionProgramList(EnforcementInspectionProgram enforcementInspectionProgram); + List selectEnforcementInspectionProgramList(EnforcementInspectionProgram enforcementInspectionProgram); List selectEnforcementInspectionProgramListNoPermission(EnforcementInspectionProgram enforcementInspectionProgram); /** @@ -34,7 +37,7 @@ public interface IEnforcementInspectionProgramService * @param enforcementInspectionProgram 执法检查计划 * @return 结果 */ - public int insertEnforcementInspectionProgram(EnforcementInspectionProgram enforcementInspectionProgram); + int insertEnforcementInspectionProgram(EnforcementInspectionProgram enforcementInspectionProgram); /** * 修改执法检查计划 @@ -42,7 +45,7 @@ public interface IEnforcementInspectionProgramService * @param enforcementInspectionProgram 执法检查计划 * @return 结果 */ - public int updateEnforcementInspectionProgram(EnforcementInspectionProgram enforcementInspectionProgram); + int updateEnforcementInspectionProgram(EnforcementInspectionProgram enforcementInspectionProgram); /** * 批量删除执法检查计划 @@ -50,7 +53,7 @@ public interface IEnforcementInspectionProgramService * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteEnforcementInspectionProgramByIds(String ids); + int deleteEnforcementInspectionProgramByIds(String ids); /** * 删除执法检查计划信息 @@ -58,5 +61,19 @@ public interface IEnforcementInspectionProgramService * @param id 执法检查计划ID * @return 结果 */ - public int deleteEnforcementInspectionProgramById(String id); + int deleteEnforcementInspectionProgramById(String id); + + /** + * 执法计划分类统计 + * @param enforcementInspectionProgramDto + * @return + */ + List staticProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto); + + /** + * 统计总数 + * @param enforcementInspectionProgramDto + * @return + */ + EnforcementInspectionProgramDto staticAllProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java index bbf9f5d4..c698e955 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementInspectionProgramServiceImpl.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.IdUtil; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; +import com.zdxt.code.domain.dto.EnforcementInspectionProgramDto; import com.zdxt.common.annotation.DataScope; import com.zdxt.common.util.DateUtils; import com.zdxt.common.zdxtFile.ZdxtFileCommon; @@ -169,4 +170,16 @@ public class EnforcementInspectionProgramServiceImpl implements IEnforcementInsp { return enforcementInspectionProgramMapper.deleteEnforcementInspectionProgramById(id); } + + @Override + public List staticProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto) { + + return enforcementInspectionProgramMapper.staticProgram(enforcementInspectionProgramDto); + } + + @Override + public EnforcementInspectionProgramDto staticAllProgram(EnforcementInspectionProgramDto enforcementInspectionProgramDto) { + + return enforcementInspectionProgramMapper.staticAllProgram(enforcementInspectionProgramDto); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml index f2865ae0..e8fd30f7 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml @@ -173,5 +173,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - + + + + \ No newline at end of file