diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/CheckRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/CheckRegistrationController.java index 4cfe08da..9f7410d1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/CheckRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/CheckRegistrationController.java @@ -1,7 +1,12 @@ package com.zdxt.enforcementcode.controller.web.supervision.report; +import cn.dev33.satoken.annotation.SaIgnore; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsDomainBo; import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationAreaStatBo; import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationDomainStatBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsDomainVo; import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationAreaStatVo; import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationDomainStatVo; import com.zdxt.enforcementcode.report.ICheckRegistrationService; @@ -24,6 +29,7 @@ import java.util.List; * * @author zdxt */ +@SaIgnore @Slf4j @Validated @RequiredArgsConstructor @@ -36,19 +42,19 @@ public class CheckRegistrationController { /** * 按区域统计-分页列表查询 */ - @GetMapping("/areaStatList") - public TableDataInfo areaStatList(CheckRegistrationAreaStatBo bo, PageQuery pageQuery) { - return checkRegistrationService.queryAreaStatPageList(bo, pageQuery); + @GetMapping("/areaList") + public TableDataInfo areaStatList(DashboardCheckRegisterZfajdetailsAreaBo bo, PageQuery pageQuery) { + return checkRegistrationService.queryAreaPageList(bo, pageQuery); } /** * 按区域统计-导出Excel */ - @PostMapping("/exportAreaStat") - public void exportAreaStat(CheckRegistrationAreaStatBo bo, HttpServletResponse response) { + @PostMapping("/exportArea") + public void exportAreaStat(DashboardCheckRegisterZfajdetailsAreaBo bo, HttpServletResponse response) { try { - List list = checkRegistrationService.queryAreaStatList(bo); - ExcelUtil.exportExcel(list, "按区域统计", CheckRegistrationAreaStatVo.class, response); + List list = checkRegistrationService.queryAreaList(bo); + ExcelUtil.exportExcel(list, "按区域统计", DashboardCheckRegisterZfajdetailsAreaVo.class, response); } catch (Exception e) { log.error("导出按区域统计Excel异常", e); response.reset(); @@ -64,19 +70,19 @@ public class CheckRegistrationController { /** * 按领域统计-分页列表查询 */ - @GetMapping("/domainStatList") - public TableDataInfo domainStatList(CheckRegistrationDomainStatBo bo, PageQuery pageQuery) { - return checkRegistrationService.queryDomainStatPageList(bo, pageQuery); + @GetMapping("/domainList") + public TableDataInfo domainStatList(DashboardCheckRegisterZfajdetailsDomainBo bo, PageQuery pageQuery) { + return checkRegistrationService.queryDomainPageList(bo, pageQuery); } /** * 按领域统计-导出Excel */ - @PostMapping("/exportDomainStat") - public void exportDomainStat(CheckRegistrationDomainStatBo bo, HttpServletResponse response) { + @PostMapping("/exportDomain") + public void exportDomainStat(DashboardCheckRegisterZfajdetailsDomainBo bo, HttpServletResponse response) { try { - List list = checkRegistrationService.queryDomainStatList(bo); - ExcelUtil.exportExcel(list, "按领域统计", CheckRegistrationDomainStatVo.class, response); + List list = checkRegistrationService.queryDomainList(bo); + ExcelUtil.exportExcel(list, "按领域统计", DashboardCheckRegisterZfajdetailsDomainVo.class, response); } catch (Exception e) { log.error("导出按领域统计Excel异常", e); response.reset(); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/HighFrequencyEnterpriseController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/HighFrequencyEnterpriseController.java new file mode 100644 index 00000000..ce191a7f --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/HighFrequencyEnterpriseController.java @@ -0,0 +1,99 @@ +package com.zdxt.enforcementcode.controller.web.supervision.report; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsDomainBo; +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsDomainBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsDomainVo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsDomainVo; +import com.zdxt.enforcementcode.report.IHighCheckEntService; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +/** + * 高频检查监测分析 + */ +@SaIgnore +@Slf4j +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/web/supervision/report/highFrequencyEnterprise") +public class HighFrequencyEnterpriseController { + + + private final IHighCheckEntService highCheckEntService; + + /** + * 按区域统计-分页列表查询 + */ + @GetMapping("/highCheckAreaList") + public TableDataInfo queryHighCheckAreaPageList(DashboardHighCheckEntdetailsAreaBo bo, PageQuery pageQuery) { + return highCheckEntService.queryHighCheckAreaPageList(bo, pageQuery); + } + + /** + * 按区域统计-导出Excel + */ + @PostMapping("/exporthighCheckArea") + public void queryHighCheckAreaList(DashboardHighCheckEntdetailsAreaBo bo, HttpServletResponse response) { + try { + List list = highCheckEntService.queryHighCheckAreaList(bo); + ExcelUtil.exportExcel(list, "按区域统计", DashboardHighCheckEntdetailsAreaVo.class, response); + } catch (Exception e) { + log.error("导出按区域统计Excel异常", e); + response.reset(); + response.setContentType("application/json; charset=utf-8"); + try { + response.getWriter().write("{\"code\":500,\"msg\":\"导出失败: " + e.getMessage() + "\"}"); + } catch (Exception ignored) { + log.error("响应重置异常", ignored); + } + } + } + + + /** + * 按领域统计-分页列表查询 + */ + @GetMapping("/highCheckDomainList") + public TableDataInfo queryHighCheckDomainPageList(DashboardHighCheckEntdetailsDomainBo bo, PageQuery pageQuery) { + return highCheckEntService.queryHighCheckDomainPageList(bo, pageQuery); + } + + /** + * 按领域统计-导出Excel + */ + @PostMapping("/exportHighCheckDomain") + public void exportHighCheckDomain(DashboardHighCheckEntdetailsDomainBo bo, HttpServletResponse response) { + try { + List list = highCheckEntService.queryHighCheckDomainList(bo); + ExcelUtil.exportExcel(list, "按领域统计", DashboardHighCheckEntdetailsDomainVo.class, response); + } catch (Exception e) { + log.error("导出按领域统计Excel异常", e); + response.reset(); + response.setContentType("application/json; charset=utf-8"); + try { + response.getWriter().write("{\"code\":500,\"msg\":\"导出失败: " + e.getMessage() + "\"}"); + } catch (Exception ignored) { + log.error("响应重置异常", ignored); + } + } + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/KeyEnterprisesController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/KeyEnterprisesController.java index c05ca288..e77ca0bf 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/KeyEnterprisesController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/KeyEnterprisesController.java @@ -1,10 +1,14 @@ package com.zdxt.enforcementcode.controller.web.supervision.report; +import cn.dev33.satoken.annotation.SaIgnore; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo; import com.zdxt.enforcementcode.service.IDashboardEnterpriseCheckService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -22,6 +26,7 @@ import java.util.List; * * @author zdxt */ +@SaIgnore @Slf4j @Validated @RequiredArgsConstructor @@ -39,6 +44,20 @@ public class KeyEnterprisesController { return dashboardEnterpriseCheckService.queryEnterpriseCheckPageList(bo, pageQuery); } + /** + * 重点企业-查询详情 + * @param bo + * @param pageQuery + * @return + */ + @GetMapping("/details") + public TableDataInfo detatils(EnforcementRegistrationBo bo,PageQuery pageQuery){ + TableDataInfo list=dashboardEnterpriseCheckService.selectEnterpriseCheckDetailsList(bo,pageQuery); + return list; + } + + + /** * 重点企业-导出Excel */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/TrendBehaviorController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/TrendBehaviorController.java new file mode 100644 index 00000000..f479eb27 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/TrendBehaviorController.java @@ -0,0 +1,64 @@ +package com.zdxt.enforcementcode.controller.web.supervision.report; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo; +import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo; +import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo; +import com.zdxt.enforcementcode.report.ITrendBehaviorService; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 趋势行为监测分析 + */ +@SaIgnore +@Slf4j +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/web/supervision/report/trendBehavior") +public class TrendBehaviorController { + + + private final ITrendBehaviorService trendBehaviorService; + + @GetMapping("/trendBehaviorAreaList") + public TableDataInfo queryTrendBehaviorAreaPageList(DashboardTrendStatAreaBo bo, PageQuery pageQuery) { + return trendBehaviorService.queryTrendBehaviorAreaPageList(bo, pageQuery); + } + + /** + * 重点企业-导出Excel + */ + @PostMapping("/exportTrendBehaviorArea") + public void export(DashboardTrendStatAreaBo bo, HttpServletResponse response) { + try { + List list = trendBehaviorService.selectTrendBehaviorAreaAreaList(bo); + ExcelUtil.exportExcel(list, "重点企业", DashboardTrendStatAreaVo.class, response); + } catch (Exception e) { + log.error("导出重点企业Excel异常", e); + response.reset(); + response.setContentType("application/json; charset=utf-8"); + try { + response.getWriter().write("{\"code\":500,\"msg\":\"导出失败: " + e.getMessage() + "\"}"); + } catch (Exception ignored) { + log.error("响应重置异常", ignored); + } + } + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardHighCheckEntdetailsArea.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardHighCheckEntdetailsArea.java new file mode 100644 index 00000000..b565a4d0 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardHighCheckEntdetailsArea.java @@ -0,0 +1,54 @@ +package com.zdxt.enforcementcode.domain; + +import cn.idev.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serial; + +/** + * 大屏-检测预警-高频检查预警分析-高频检查区域执法单位检查次数对象 dashboard_high_check_entdetails_area + * + * @author Lion Li + * @date 2026-09-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DashboardHighCheckEntdetailsArea extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + + /** + * 企业统一信用代码 + */ + private String enterpriseNumber; + + /** + * 企业名称 + */ + private String enterpriseName; + + + /** + * 行政执法次数 + */ + private Long xzzfcs; + + + /** + * 区 + */ + private String district; + + /** + * 街道 + */ + private String street; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardHighCheckEntdetailsAreaBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardHighCheckEntdetailsAreaBo.java new file mode 100644 index 00000000..cb94e966 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardHighCheckEntdetailsAreaBo.java @@ -0,0 +1,65 @@ +package com.zdxt.enforcementcode.domain.bo; + +import cn.idev.excel.annotation.ExcelProperty; +import com.zdxt.enforcementcode.domain.DashboardHighCheckEntdetailsArea; +import com.zdxt.enforcementcode.domain.DashboardHighCheckEntdetailsDomain; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.util.Date; + +/** + * 大屏-检测预警-高频检查预警分析-高频检查区域执法单位检查次数业务对象 dashboard_high_check_entdetails_area + * + * @author Lion Li + * @date 2026-09-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DashboardHighCheckEntdetailsArea.class, reverseConvertGenerate = false) +public class DashboardHighCheckEntdetailsAreaBo extends BaseEntity { + + + /** + * 企业统一信用代码 + */ + @ExcelProperty(value = "企业统一信用代码") + private String enterpriseNumber; + + /** + * 企业名称 + */ + @ExcelProperty(value = "企业名称") + private String enterpriseName; + + + /** + * 行政执法次数 + */ + @ExcelProperty(value = "行政执法次数") + private Long xzzfcs; + + + /** + * 区 + */ + private String district; + + /** + * 街道 + */ + private String street; + + /** + * 执法时间 + */ + private Date enforcementTime; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardTrendStatAreaBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardTrendStatAreaBo.java index ca6a4a14..15da2520 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardTrendStatAreaBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardTrendStatAreaBo.java @@ -129,4 +129,8 @@ public class DashboardTrendStatAreaBo extends BaseEntity { private String organId; + /** + * 季度查询 + */ + private String quarterTime; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardHighCheckEntdetailsAreaVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardHighCheckEntdetailsAreaVo.java new file mode 100644 index 00000000..cb653e76 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardHighCheckEntdetailsAreaVo.java @@ -0,0 +1,58 @@ +package com.zdxt.enforcementcode.domain.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.zdxt.enforcementcode.domain.DashboardHighCheckEntdetailsArea; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 大屏-检测预警-高频检查预警分析-高频检查区域执法单位检查次数视图对象 dashboard_high_check_entdetails_area + * + * @author Lion Li + * @date 2026-09-16 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DashboardHighCheckEntdetailsArea.class) +public class DashboardHighCheckEntdetailsAreaVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 企业统一信用代码 + */ + @ExcelProperty(value = "企业统一信用代码") + private String enterpriseNumber; + + /** + * 企业名称 + */ + @ExcelProperty(value = "企业名称") + private String enterpriseName; + + + /** + * 行政执法次数 + */ + @ExcelProperty(value = "行政执法次数") + private Long xzzfcs; + + + /** + * 区 + */ + private String district; + + /** + * 街道 + */ + private String street; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatAreaVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatAreaVo.java index 9559b73e..d6b801d6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatAreaVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatAreaVo.java @@ -1,5 +1,6 @@ package com.zdxt.enforcementcode.domain.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.zdxt.enforcementcode.domain.DashboardTrendStatArea; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -63,6 +64,12 @@ public class DashboardTrendStatAreaVo implements Serializable { */ @ExcelProperty(value = "一季度") private Long firstquarter; + /** + * 一季度时间 + */ + @TableField(value = "firstTime") + @ExcelProperty(value = "一季度时间") + private String firstTime; /** * 二季度 @@ -70,18 +77,39 @@ public class DashboardTrendStatAreaVo implements Serializable { @ExcelProperty(value = "二季度") private Long secondquarter; + /** + * 二季度时间 + */ + @TableField(value = "secondTime") + @ExcelProperty(value = "二季度时间") + private String secondTime; /** * 三季度 */ @ExcelProperty(value = "三季度") private Long thirdquarter; + /** + * 三季度时间 + */ + @TableField(value = "thirdTime") + @ExcelProperty(value = "三季度时间") + private String thirdTime; + /** * 四季度 */ @ExcelProperty(value = "四季度") private Long fourthquarter; + /** + * 四季度时间 + */ + @TableField(value = "fourthTime") + @ExcelProperty(value = "四季度时间") + private String fourthTime; + + /** * 检查次数 */ @@ -154,5 +182,13 @@ public class DashboardTrendStatAreaVo implements Serializable { @ExcelProperty(value = "组织单位ID") private String organId; + /** + * 季度查询 + */ + private String quarterTime; + /** + * 行政执法次数 + */ + private Long xzzfcs; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java index 9d1500b7..857afc54 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java @@ -419,4 +419,9 @@ public class EnforcementRegistrationVo implements Serializable { * 预告ID */ private String noticeId; + + /** + * 字典标签 + */ + private String dictLabel; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterZfajdetailsAreaMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterZfajdetailsAreaMapper.java index 065cf357..6e02b831 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterZfajdetailsAreaMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterZfajdetailsAreaMapper.java @@ -1,9 +1,16 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.DashboardCheckRegisterZfajdetailsArea; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationAreaStatBo; import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationAreaStatVo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 大屏-检查登记检测分析-区域行政执法数行政执法案件数明细Mapper接口 * @@ -12,4 +19,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface DashboardCheckRegisterZfajdetailsAreaMapper extends BaseMapperPlus { + + Page selectAreaPageList(@Param("page") Page page, + @Param("bo") DashboardCheckRegisterZfajdetailsAreaBo bo); + + List selectAreaList(@Param("bo") DashboardCheckRegisterZfajdetailsAreaBo bo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterZfajdetailsDomainMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterZfajdetailsDomainMapper.java index db1b3842..92bb2963 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterZfajdetailsDomainMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterZfajdetailsDomainMapper.java @@ -1,9 +1,16 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.DashboardCheckRegisterZfajdetailsDomain; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsDomainBo; +import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationDomainStatBo; import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsDomainVo; +import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationDomainStatVo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 大屏-检查登记检测分析-区域行政执法数行政执法案件数明细Mapper接口 * @@ -12,4 +19,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface DashboardCheckRegisterZfajdetailsDomainMapper extends BaseMapperPlus { + + Page selectDomainPageList(@Param("page") Page page, + @Param("bo") DashboardCheckRegisterZfajdetailsDomainBo bo); + + List selectDomainList(@Param("bo") DashboardCheckRegisterZfajdetailsDomainBo bo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardEnterpriseCheckMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardEnterpriseCheckMapper.java index 16329cac..b5a61d30 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardEnterpriseCheckMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardEnterpriseCheckMapper.java @@ -2,9 +2,11 @@ package com.zdxt.enforcementcode.mapper; import com.zdxt.enforcementcode.domain.bean.DashboardEnterpriseCheck; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo; import com.zdxt.enforcementcode.domain.vo.DashboardEnterpriseCheckVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -40,4 +42,11 @@ public interface DashboardEnterpriseCheckMapper extends BaseMapperPlus selectEnterpriseCheckList(@Param("bo") DashboardEnterpriseCheckListBo bo); + /** + * 查询重点企业明细 + * @param bo + * @return + */ + Page selectEnterpriseCheckDetailsList(@Param("page") Page page,@Param("bo") EnforcementRegistrationBo bo); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardHighCheckEntdetailsAreaMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardHighCheckEntdetailsAreaMapper.java new file mode 100644 index 00000000..2057c51f --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardHighCheckEntdetailsAreaMapper.java @@ -0,0 +1,30 @@ +package com.zdxt.enforcementcode.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.DashboardHighCheckEntdetailsArea; +import com.zdxt.enforcementcode.domain.DashboardHighCheckEntdetailsDomain; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsDomainVo; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 大屏-检测预警-高频检查预警分析-高频检查区域执法单位检查次数Mapper接口 + * + * @author Lion Li + * @date 2026-09-16 + */ +public interface DashboardHighCheckEntdetailsAreaMapper extends BaseMapperPlus { + + + Page selectHighCheckAreaPageList(@Param("page") Page page, + @Param("bo") DashboardHighCheckEntdetailsAreaBo bo); + + List selectHighCheckAreaList(@Param("bo") DashboardHighCheckEntdetailsAreaBo bo); + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatAreaMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatAreaMapper.java index b1ba7b1c..45898e67 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatAreaMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatAreaMapper.java @@ -1,9 +1,14 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.DashboardTrendStatArea; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo; import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 趋势行为分析-区域-统计Mapper接口 * @@ -12,4 +17,8 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface DashboardTrendStatAreaMapper extends BaseMapperPlus { + Page selectTrendBehaviorAreaPageList(@Param("page") Page page, + @Param("bo") DashboardTrendStatAreaBo bo); + + List selectTrendBehaviorAreaAreaList(@Param("bo") DashboardTrendStatAreaBo bo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ICheckRegistrationService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ICheckRegistrationService.java index dff15d9d..7431a8d7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ICheckRegistrationService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ICheckRegistrationService.java @@ -1,7 +1,13 @@ package com.zdxt.enforcementcode.report; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zdxt.enforcementcode.domain.DashboardCheckRegisterZfajdetailsArea; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsDomainBo; import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationAreaStatBo; import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationDomainStatBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsDomainVo; import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationAreaStatVo; import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationDomainStatVo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -21,7 +27,7 @@ public interface ICheckRegistrationService { * @param pageQuery 分页参数 * @return 分页列表 */ - TableDataInfo queryAreaStatPageList(CheckRegistrationAreaStatBo bo, PageQuery pageQuery); + TableDataInfo queryAreaPageList(DashboardCheckRegisterZfajdetailsAreaBo bo, PageQuery pageQuery); /** * 查询按区域统计列表（导出用，不分页） @@ -29,7 +35,7 @@ public interface ICheckRegistrationService { * @param bo 查询条件 * @return 列表 */ - List queryAreaStatList(CheckRegistrationAreaStatBo bo); + List queryAreaList(DashboardCheckRegisterZfajdetailsAreaBo bo); /** * 分页查询按领域统计列表 @@ -38,7 +44,7 @@ public interface ICheckRegistrationService { * @param pageQuery 分页参数 * @return 分页列表 */ - TableDataInfo queryDomainStatPageList(CheckRegistrationDomainStatBo bo, PageQuery pageQuery); + TableDataInfo queryDomainPageList(DashboardCheckRegisterZfajdetailsDomainBo bo, PageQuery pageQuery); /** * 查询按领域统计列表（导出用，不分页） @@ -46,5 +52,6 @@ public interface ICheckRegistrationService { * @param bo 查询条件 * @return 列表 */ - List queryDomainStatList(CheckRegistrationDomainStatBo bo); + List queryDomainList(DashboardCheckRegisterZfajdetailsDomainBo bo); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/IHighCheckEntService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/IHighCheckEntService.java new file mode 100644 index 00000000..268ebc44 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/IHighCheckEntService.java @@ -0,0 +1,54 @@ +package com.zdxt.enforcementcode.report; + +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsDomainBo; +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsDomainBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsDomainVo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsDomainVo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +import java.util.List; + +/** + * 高频检查监测分析 + */ +public interface IHighCheckEntService { + + /** + * 分页查询按区域统计列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分页列表 + */ + TableDataInfo queryHighCheckAreaPageList(DashboardHighCheckEntdetailsAreaBo bo, PageQuery pageQuery); + + /** + * 查询按区域统计列表（导出用，不分页） + * + * @param bo 查询条件 + * @return 列表 + */ + List queryHighCheckAreaList(DashboardHighCheckEntdetailsAreaBo bo); + + /** + * 分页查询按领域统计列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 分页列表 + */ + TableDataInfo queryHighCheckDomainPageList(DashboardHighCheckEntdetailsDomainBo bo, PageQuery pageQuery); + + /** + * 查询按领域统计列表（导出用，不分页） + * + * @param bo 查询条件 + * @return 列表 + */ + List queryHighCheckDomainList(DashboardHighCheckEntdetailsDomainBo bo); +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ITrendBehaviorService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ITrendBehaviorService.java new file mode 100644 index 00000000..c1a65cb4 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/ITrendBehaviorService.java @@ -0,0 +1,18 @@ +package com.zdxt.enforcementcode.report; + +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +import java.util.List; + +public interface ITrendBehaviorService { + + TableDataInfo queryTrendBehaviorAreaPageList(DashboardTrendStatAreaBo bo, PageQuery pageQuery); + + List selectTrendBehaviorAreaAreaList(DashboardTrendStatAreaBo bo); +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/CheckRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/CheckRegistrationServiceImpl.java index 51303c69..ac9eca4b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/CheckRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/CheckRegistrationServiceImpl.java @@ -1,14 +1,21 @@ package com.zdxt.enforcementcode.report.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterZfajdetailsDomainBo; import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationAreaStatBo; import com.zdxt.enforcementcode.domain.bo.report.CheckRegistrationDomainStatBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsDomainVo; import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationAreaStatVo; import com.zdxt.enforcementcode.domain.vo.report.CheckRegistrationDomainStatVo; import com.zdxt.enforcementcode.mapper.DashboardCheckRegisterAreaMapper; import com.zdxt.enforcementcode.mapper.DashboardCheckRegisterDomainMapper; +import com.zdxt.enforcementcode.mapper.DashboardCheckRegisterZfajdetailsAreaMapper; +import com.zdxt.enforcementcode.mapper.DashboardCheckRegisterZfajdetailsDomainMapper; import com.zdxt.enforcementcode.report.ICheckRegistrationService; import lombok.RequiredArgsConstructor; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.springframework.stereotype.Service; @@ -22,29 +29,30 @@ import java.util.List; @Service public class CheckRegistrationServiceImpl implements ICheckRegistrationService { - private final DashboardCheckRegisterAreaMapper areaMapper; - private final DashboardCheckRegisterDomainMapper domainMapper; + private final DashboardCheckRegisterZfajdetailsAreaMapper areaMapper; + private final DashboardCheckRegisterZfajdetailsDomainMapper domainMapper; + @Override - public TableDataInfo queryAreaStatPageList(CheckRegistrationAreaStatBo bo, PageQuery pageQuery) { - Page result = areaMapper.selectAreaStatPageList(pageQuery.build(), bo); + public TableDataInfo queryAreaPageList(DashboardCheckRegisterZfajdetailsAreaBo bo, PageQuery pageQuery) { + Page result = areaMapper.selectAreaPageList(pageQuery.build(), bo); return TableDataInfo.build(result); } @Override - public List queryAreaStatList(CheckRegistrationAreaStatBo bo) { - List list = areaMapper.selectAreaStatList(bo); + public List queryAreaList(DashboardCheckRegisterZfajdetailsAreaBo bo) { + List list = areaMapper.selectAreaList(bo); return list; } @Override - public TableDataInfo queryDomainStatPageList(CheckRegistrationDomainStatBo bo, PageQuery pageQuery) { - Page result = domainMapper.selectDomainStatPageList(pageQuery.build(), bo); + public TableDataInfo queryDomainPageList(DashboardCheckRegisterZfajdetailsDomainBo bo, PageQuery pageQuery) { + Page result = domainMapper.selectDomainPageList(pageQuery.build(), bo); return TableDataInfo.build(result); } @Override - public List queryDomainStatList(CheckRegistrationDomainStatBo bo) { - return domainMapper.selectDomainStatList(bo); + public List queryDomainList(DashboardCheckRegisterZfajdetailsDomainBo bo) { + return domainMapper.selectDomainList(bo); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/HighCheckEntServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/HighCheckEntServiceImpl.java new file mode 100644 index 00000000..336ae3a6 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/HighCheckEntServiceImpl.java @@ -0,0 +1,65 @@ +package com.zdxt.enforcementcode.report.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.DashboardHighCheckEntdetailsDomain; +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsDomainBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterZfajdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsDomainVo; +import com.zdxt.enforcementcode.domain.vo.EnforcementCarouselBannerVo; +import com.zdxt.enforcementcode.mapper.DashboardHighCheckEntdetailsAreaMapper; +import com.zdxt.enforcementcode.mapper.DashboardHighCheckEntdetailsDomainMapper; +import com.zdxt.enforcementcode.report.IHighCheckEntService; +import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.springframework.stereotype.Service; + +import java.util.List; +@RequiredArgsConstructor +@Service +public class HighCheckEntServiceImpl implements IHighCheckEntService { + + private final DashboardHighCheckEntdetailsAreaMapper highCheckEntdetailsAreaMapper; + private final DashboardHighCheckEntdetailsDomainMapper HighCheckEntdetailsDomainMapper; + + @Override + public TableDataInfo queryHighCheckAreaPageList(DashboardHighCheckEntdetailsAreaBo bo, PageQuery pageQuery) { + Page result = highCheckEntdetailsAreaMapper.selectHighCheckAreaPageList(pageQuery.build(),bo); + return TableDataInfo.build(result); + } + + @Override + public List queryHighCheckAreaList(DashboardHighCheckEntdetailsAreaBo bo) { + return highCheckEntdetailsAreaMapper.selectHighCheckAreaList(bo); + } + + @Override + public TableDataInfo queryHighCheckDomainPageList(DashboardHighCheckEntdetailsDomainBo bo, PageQuery pageQuery) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DashboardHighCheckEntdetailsDomain::getLevel, 2); + queryWrapper.eq(DashboardHighCheckEntdetailsDomain::getIsDelete, "0"); + queryWrapper.eq(bo.getYear()!=null,DashboardHighCheckEntdetailsDomain::getYear,bo.getYear()); + queryWrapper.eq(bo.getMonth()!=null,DashboardHighCheckEntdetailsDomain::getMonth, bo.getMonth()); + queryWrapper.eq(bo.getDomainName()!=null,DashboardHighCheckEntdetailsDomain::getDomainName,bo.getDomainName()); + queryWrapper.like(bo.getEnterpriseName()!=null,DashboardHighCheckEntdetailsDomain::getEnterpriseName,bo.getEnterpriseName()); + Page list = HighCheckEntdetailsDomainMapper.selectVoPage(pageQuery.build(),queryWrapper); + return TableDataInfo.build(list); + } + + @Override + public List queryHighCheckDomainList(DashboardHighCheckEntdetailsDomainBo bo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DashboardHighCheckEntdetailsDomain::getLevel, 2); + queryWrapper.eq(DashboardHighCheckEntdetailsDomain::getIsDelete, "0"); + queryWrapper.eq(bo.getYear()!=null,DashboardHighCheckEntdetailsDomain::getYear,bo.getYear()); + queryWrapper.eq(bo.getMonth()!=null,DashboardHighCheckEntdetailsDomain::getMonth, bo.getMonth()); + queryWrapper.eq(bo.getDomainName()!=null,DashboardHighCheckEntdetailsDomain::getDomainName,bo.getDomainName()); + queryWrapper.like(bo.getEnterpriseName()!=null,DashboardHighCheckEntdetailsDomain::getEnterpriseName,bo.getEnterpriseName()); + List list = HighCheckEntdetailsDomainMapper.selectVoList(queryWrapper); + return list; + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/TrendBehaviorServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/TrendBehaviorServiceImpl.java new file mode 100644 index 00000000..03af3a9a --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/report/impl/TrendBehaviorServiceImpl.java @@ -0,0 +1,36 @@ +package com.zdxt.enforcementcode.report.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zdxt.enforcementcode.domain.DashboardTrendStatArea; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo; +import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo; +import com.zdxt.enforcementcode.mapper.DashboardTrendStatAreaMapper; +import com.zdxt.enforcementcode.report.ITrendBehaviorService; +import lombok.RequiredArgsConstructor; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +@RequiredArgsConstructor +public class TrendBehaviorServiceImpl implements ITrendBehaviorService { + + private final DashboardTrendStatAreaMapper dashboardTrendStatAreaMapper; + + @Override + public TableDataInfo queryTrendBehaviorAreaPageList(DashboardTrendStatAreaBo bo, PageQuery pageQuery) { + Page list =dashboardTrendStatAreaMapper.selectTrendBehaviorAreaPageList(pageQuery.build(),bo); + return TableDataInfo.build(list); + } + + @Override + public List selectTrendBehaviorAreaAreaList(DashboardTrendStatAreaBo bo) { + return dashboardTrendStatAreaMapper.selectTrendBehaviorAreaAreaList(bo); + } + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardEnterpriseCheckService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardEnterpriseCheckService.java index ef39c2f4..69329ce1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardEnterpriseCheckService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardEnterpriseCheckService.java @@ -1,9 +1,12 @@ package com.zdxt.enforcementcode.service; import com.zdxt.enforcementcode.domain.bo.DashboardEnterpriseCheckBo; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo; import com.zdxt.enforcementcode.domain.vo.DashboardEnterpriseCheckVo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -87,4 +90,11 @@ public interface IDashboardEnterpriseCheckService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 查询重点企业明细 + * @param bo + * @return + */ + TableDataInfo selectEnterpriseCheckDetailsList(EnforcementRegistrationBo bo,PageQuery pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardEnterpriseCheckServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardEnterpriseCheckServiceImpl.java index 98138e97..695f1fae 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardEnterpriseCheckServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardEnterpriseCheckServiceImpl.java @@ -2,7 +2,9 @@ package com.zdxt.enforcementcode.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zdxt.enforcementcode.domain.bean.DashboardEnterpriseCheck; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.bo.dashboard.DashboardEnterpriseCheckListBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -195,4 +197,17 @@ public class DashboardEnterpriseCheckServiceImpl implements IDashboardEnterprise } return baseMapper.deleteByIds(ids) > 0; } + + /** + * 查询重点企业明细 + * @param bo + * @return + */ + @Override + public TableDataInfo selectEnterpriseCheckDetailsList(EnforcementRegistrationBo bo,PageQuery pageQuery) { + Page result = baseMapper.selectEnterpriseCheckDetailsList(pageQuery.build(),bo); + return TableDataInfo.build(result); + } + + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml index 12c1c6af..a93ad639 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml @@ -87,37 +87,4 @@ AND level = 3 ORDER BY area_name - - - - - SELECT - a.area_name AS district, - a.xzzfs, - a.xzjczs, - a.xzcfzs, - a.xzzqzs - FROM dashboard_check_register_area a - WHERE IFNULL(a.is_delete, '0') = '0' - AND a.level = 2 - - AND a.area_name LIKE CONCAT('%', #{bo.district}, '%') - - - AND a.year = #{bo.year} - - - AND a.month = #{bo.month} - - ORDER BY a.area_name - - - - - - diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml index 65bb4a9b..9be899f4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml @@ -167,36 +167,4 @@ GROUP BY lyid, lymc - - - - - SELECT - d.lymc AS domainName, - d.xzzfs, - d.xzjczs, - d.xzcfzs, - d.xzqzzs - FROM dashboard_check_register_domain d - WHERE IFNULL(d.is_delete, '0') = '0' - - AND d.lymc LIKE CONCAT('%', #{bo.domainName}, '%') - - - AND d.year = #{bo.year} - - - AND d.month = #{bo.month} - - ORDER BY d.lymc - - - - - - diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterZfajdetailsAreaMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterZfajdetailsAreaMapper.xml index 82eefe2a..dc3718a7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterZfajdetailsAreaMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterZfajdetailsAreaMapper.xml @@ -3,4 +3,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + SELECT + a.year, + a.month, + a.area_name AS areaName, + a.xzzfs, + a.xzjcajs, + a.xzcfajs, + a.xzqzajs + FROM dashboard_check_register_zfajdetails_area a + WHERE IFNULL(a.is_delete, '0') = '0' + AND a.level = 2 + + AND a.area_name LIKE CONCAT('%', #{bo.areaName}, '%') + + + AND a.year = #{bo.year} + + + AND a.month = #{bo.month} + + ORDER BY a.area_name + + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterZfajdetailsDomainMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterZfajdetailsDomainMapper.xml index 8c0b1d3a..fb7fa7d4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterZfajdetailsDomainMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterZfajdetailsDomainMapper.xml @@ -3,4 +3,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + SELECT + d.year, + d.month, + d.lymc, + d.xzzfs, + d.xzjcajs, + d.xzcfajs, + d.xzqzajs + FROM dashboard_check_register_zfajdetails_domain d + WHERE IFNULL(d.is_delete, '0') = '0' + + AND d.lymc LIKE CONCAT('%', #{bo.lymc}, '%') + + + AND d.year = #{bo.year} + + + AND d.month = #{bo.month} + + ORDER BY d.lymc + + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml index f5d4b74e..34a05a9b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardEnterpriseCheckMapper.xml @@ -72,4 +72,40 @@ ORDER BY dec.xzzfzs desc + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardHighCheckEntdetailsAreaMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardHighCheckEntdetailsAreaMapper.xml new file mode 100644 index 00000000..48f4bddd --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardHighCheckEntdetailsAreaMapper.xml @@ -0,0 +1,76 @@ + + + + + + select + t1.enterprise_number as enterpriseNumber, + t1.enterprise_name as enterpriseName, + count(t1.enterprise_number) as xzzfcs, + CASE + WHEN t2.enterprise_address REGEXP '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REGEXP_SUBSTR(t2.enterprise_address, '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)') + WHEN t2.enterprise_address REGEXP '^深圳市(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REPLACE(REGEXP_SUBSTR(t2.enterprise_address,'深圳市(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)'),'深圳市', '') + WHEN t2.enterprise_address REGEXP '市.+?(区|县)' + THEN REGEXP_REPLACE(t2.enterprise_address, '^.*?市(.+?(区|县)).*$', '$1') + ELSE NULL + END AS district, + + CASE + + WHEN t2.enterprise_address REGEXP '^(深圳市)?(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REGEXP_SUBSTR(SUBSTRING(t2.enterprise_address, LOCATE( + CASE + WHEN t2.enterprise_address REGEXP '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REGEXP_SUBSTR(t2.enterprise_address, '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)') + ELSE REPLACE(REGEXP_SUBSTR(t2.enterprise_address, '深圳市(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)'), '深圳市', '') + END, t2.enterprise_address) + CHAR_LENGTH( + CASE + WHEN t2.enterprise_address REGEXP '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)' + THEN REGEXP_SUBSTR(t2.enterprise_address, '^(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)') + ELSE REPLACE(REGEXP_SUBSTR(t2.enterprise_address,'深圳市(福田区|罗湖区|南山区|宝安区|龙岗区|盐田区|龙华区|坪山区|光明区|大鹏新区|坪山新区|光明新区|龙华新区)'), '深圳市', '') + END)),'[0-9一-龥]+街道') + + WHEN t2.enterprise_address REGEXP '市.+?(区|县)' + THEN REGEXP_SUBSTR(SUBSTRING(t2.enterprise_address,LOCATE(REGEXP_REPLACE(t2.enterprise_address, '^.*?市(.+?(区|县)).*$', '$1'),t2.enterprise_address + ) + CHAR_LENGTH(REGEXP_REPLACE(t2.enterprise_address, '^.*?市(.+?(区|县)).*$', '$1'))),'[0-9一-龥]+(街道|镇)') + ELSE NULL + END AS street + from + enforcement_registration t1 + left join enterprise_information t2 + on t1.enterprise_number=t2.enterprise_number + + t1.is_delete =0 + and t1.is_submit =1 + and t1.enterprise_name is not null + and t1.enterprise_number is not null + + and DATE_FORMAT(t1.enforcement_time,'%Y-%m') = DATE_FORMAT(#{bo.enforcementTime},'%Y-%m') + + + and t1.enterprise_name like CONCAT('%', #{bo.enterpriseName}, '%') + + + and t1.district=#{bo.district} + + + group by + t1.enterprise_number, + t1.enterprise_name + having + xzzfcs >= 3 + order by xzzfcs desc,t1.enterprise_number desc + + + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatAreaMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatAreaMapper.xml index 832f1b37..ee287c73 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatAreaMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatAreaMapper.xml @@ -3,4 +3,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + select + t1.district_name as districtName, + t1.quarter_time as quarterTime, + t1.quarter_value as xzzfcs + from + ( + select + district_name, + firstQuarter as quarter_value, + firstTime as quarter_time + from + dashboard_trend_stat_area + where is_delete =0 + union all + select + district_name, + secondQuarter as quarter_value, + secondTime as quarter_time + from + dashboard_trend_stat_area + where is_delete =0 + union all + select + district_name, + thirdQuarter as quarter_value, + thirdTime as quarter_time + from + dashboard_trend_stat_area + where is_delete =0 + union all + select + district_name, + fourthQuarter as quarter_value, + fourthTime as quarter_time + from + dashboard_trend_stat_area + where is_delete =0) t1 + + + t1.district_name = #{bo.districtName} + + + and t1.quarter_time = #{bo.quarterTime} + + + + + + +