From c37f98fa28600504b05e3578ff82261d87d07519 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Tue, 13 Oct 2026 12:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=EF=BC=8C=E6=80=81=E5=8A=BF=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/SituationController.java | 95 +++++++++++++++++++ .../report/TrendBehaviorController.java | 32 ++++++- .../domain/bo/DashboardTrendStatDomainBo.java | 4 + .../domain/vo/DashboardTrendStatAreaVo.java | 4 - .../domain/vo/DashboardTrendStatDomainVo.java | 4 + .../DashboardSituationTrendAreaMapper.java | 6 +- .../DashboardSituationTrendDomainMapper.java | 5 +- .../mapper/DashboardTrendStatAreaMapper.java | 6 +- .../DashboardTrendStatDomainMapper.java | 9 ++ .../report/ITrendBehaviorService.java | 9 +- .../report/impl/TrendBehaviorServiceImpl.java | 19 +++- .../IDashboardSituationTrendAreaService.java | 1 + ...IDashboardSituationTrendDomainService.java | 2 + ...ashboardSituationTrendAreaServiceImpl.java | 7 ++ ...hboardSituationTrendDomainServiceImpl.java | 7 ++ .../CimDashboardOverviewMapper.xml | 20 ++-- .../DashboardSituationTrendAreaMapper.xml | 26 +++-- .../DashboardSituationTrendDomainMapper.xml | 26 +++-- .../DashboardTrendStatAreaMapper.xml | 7 +- .../DashboardTrendStatDomainMapper.xml | 56 +++++++++++ 20 files changed, 305 insertions(+), 40 deletions(-) create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/SituationController.java diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/SituationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/SituationController.java new file mode 100644 index 00000000..ed9df0f0 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/SituationController.java @@ -0,0 +1,95 @@ +package com.zdxt.enforcementcode.controller.web.supervision.report; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo; +import com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo; +import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo; +import com.zdxt.enforcementcode.service.IDashboardSituationTrendAreaService; +import com.zdxt.enforcementcode.service.IDashboardSituationTrendDomainService; +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/situationTrend") +public class SituationController { + + private final IDashboardSituationTrendAreaService situationTrendAreaService; + private final IDashboardSituationTrendDomainService situationTrendDomainService; + + + @GetMapping("/situationTrendAreaList") + public TableDataInfo querySituationTrendAreaPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery) { + return situationTrendAreaService.selectSituationTrendAreaPageList( bo,pageQuery); + } + + /** + * 重点企业-导出Excel + */ + @PostMapping("/exportSituationTrendArea") + public void export(DashboardTrendStatQueryBo bo, HttpServletResponse response) { + try { + List list = situationTrendAreaService.querySituationTrendAreaList(bo); + ExcelUtil.exportExcel(list, "重点企业", DashboardSituationAreaVo.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("/situationTrendDomainList") + public TableDataInfo selectSituationTrendDomainPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery) { + return situationTrendDomainService.selectSituationTrendDomainPageList(bo, pageQuery); + } + + /** + * 重点企业-导出Excel + */ + @PostMapping("/exportSituationTrendDomain") + public void exportDomain(DashboardTrendStatQueryBo bo, HttpServletResponse response) { + try { + List list = situationTrendDomainService.querySituationTrendDomainList(bo); + ExcelUtil.exportExcel(list, "重点企业", DashboardSituationDomainVo.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/TrendBehaviorController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/TrendBehaviorController.java index f479eb27..c5cf1f3c 100644 --- 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 @@ -4,9 +4,11 @@ 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.DashboardTrendStatDomainBo; 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.DashboardTrendStatDomainVo; import com.zdxt.enforcementcode.domain.vo.report.DashboardEnterpriseCheckListVo; import com.zdxt.enforcementcode.report.ITrendBehaviorService; import jakarta.servlet.http.HttpServletResponse; @@ -48,7 +50,7 @@ public class TrendBehaviorController { @PostMapping("/exportTrendBehaviorArea") public void export(DashboardTrendStatAreaBo bo, HttpServletResponse response) { try { - List list = trendBehaviorService.selectTrendBehaviorAreaAreaList(bo); + List list = trendBehaviorService.selectTrendBehaviorAreaList(bo); ExcelUtil.exportExcel(list, "重点企业", DashboardTrendStatAreaVo.class, response); } catch (Exception e) { log.error("导出重点企业Excel异常", e); @@ -61,4 +63,32 @@ public class TrendBehaviorController { } } } + + /** + * 领域 + */ + @GetMapping("/trendBehaviorDomainList") + public TableDataInfo queryTrendBehaviorDomainPageList(DashboardTrendStatDomainBo bo, PageQuery pageQuery) { + return trendBehaviorService.selectTrendBehaviorDomainPageList(bo, pageQuery); + } + + /** + * 重点企业-导出Excel + */ + @PostMapping("/exportTrendBehavioDomain") + public void exportDomain(DashboardTrendStatDomainBo bo, HttpServletResponse response) { + try { + List list = trendBehaviorService.selectTrendBehaviorDomainList(bo); + ExcelUtil.exportExcel(list, "重点企业", DashboardTrendStatDomainVo.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/bo/DashboardTrendStatDomainBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardTrendStatDomainBo.java index 907a18a5..043d8e1c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardTrendStatDomainBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardTrendStatDomainBo.java @@ -92,5 +92,9 @@ public class DashboardTrendStatDomainBo extends BaseEntity { */ private String organId; + /** + * 查询时间 + */ + private String quarterTime; } 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 d6b801d6..49c24ce1 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 @@ -187,8 +187,4 @@ public class DashboardTrendStatAreaVo implements Serializable { */ private String quarterTime; - /** - * 行政执法次数 - */ - private Long xzzfcs; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatDomainVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatDomainVo.java index aff8f82d..f53c3b9c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatDomainVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardTrendStatDomainVo.java @@ -113,4 +113,8 @@ public class DashboardTrendStatDomainVo implements Serializable { private String organId; + /** + * 季度时间 + */ + private String quarterTime; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendAreaMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendAreaMapper.java index 0088dddf..9a8cd9a8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendAreaMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendAreaMapper.java @@ -1,11 +1,14 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.bean.DashboardSituationTrendArea; import com.zdxt.enforcementcode.domain.bo.BashboardSituationQueryBo; import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationPerListVo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationTrendAreaVo; +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; @@ -23,8 +26,9 @@ public interface DashboardSituationTrendAreaMapper extends BaseMapperPlus querySituationTrendAreaList(DashboardTrendStatQueryBo bo); + List querySituationTrendAreaList(@Param("bo") DashboardTrendStatQueryBo bo); + Page selectSituationTrendAreaPageList(@Param("bo") DashboardTrendStatQueryBo bo, @Param("page") Page page); /** * 根据年份和季度，按综合评价分组统计个数 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendDomainMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendDomainMapper.java index 220a48d2..57c958a3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendDomainMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardSituationTrendDomainMapper.java @@ -1,12 +1,14 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.bean.DashboardSituationTrendDomain; import com.zdxt.enforcementcode.domain.bo.BashboardSituationQueryBo; import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationPerListVo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationTrendDomainVo; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import java.util.List; @@ -25,8 +27,9 @@ public interface DashboardSituationTrendDomainMapper extends BaseMapperPlus querySituationTrendDomainList(DashboardTrendStatQueryBo bo); + List querySituationTrendDomainList(@Param("bo") DashboardTrendStatQueryBo bo); + Page selectSituationTrendDomainPageList(@Param("bo") DashboardTrendStatQueryBo bo,@Param("page") Page page); /** * 根据年份和季度，按综合评价分组统计个数 * 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 45898e67..d9846662 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 @@ -3,7 +3,9 @@ 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.bo.DashboardTrendStatDomainBo; import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -20,5 +22,7 @@ public interface DashboardTrendStatAreaMapper extends BaseMapperPlus selectTrendBehaviorAreaPageList(@Param("page") Page page, @Param("bo") DashboardTrendStatAreaBo bo); - List selectTrendBehaviorAreaAreaList(@Param("bo") DashboardTrendStatAreaBo bo); + List selectTrendBehaviorAreaList(@Param("bo") DashboardTrendStatAreaBo bo); + + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatDomainMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatDomainMapper.java index 03625267..1f7e4667 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatDomainMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardTrendStatDomainMapper.java @@ -1,9 +1,14 @@ package com.zdxt.enforcementcode.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.DashboardTrendStatDomain; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo; import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo; +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 DashboardTrendStatDomainMapper extends BaseMapperPlus { + Page selectTrendBehaviorDomainPageList(@Param("page") Page page, + @Param("bo") DashboardTrendStatDomainBo bo); + + List selectTrendBehaviorDomainList(@Param("bo") DashboardTrendStatDomainBo 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 index c1a65cb4..53fd8e18 100644 --- 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 @@ -1,9 +1,12 @@ package com.zdxt.enforcementcode.report; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.bo.DashboardHighCheckEntdetailsAreaBo; import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatDomainBo; import com.zdxt.enforcementcode.domain.vo.DashboardHighCheckEntdetailsAreaVo; import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -14,5 +17,9 @@ public interface ITrendBehaviorService { TableDataInfo queryTrendBehaviorAreaPageList(DashboardTrendStatAreaBo bo, PageQuery pageQuery); - List selectTrendBehaviorAreaAreaList(DashboardTrendStatAreaBo bo); + List selectTrendBehaviorAreaList(DashboardTrendStatAreaBo bo); + + TableDataInfo selectTrendBehaviorDomainPageList(DashboardTrendStatDomainBo bo, PageQuery pageQuery); + + List selectTrendBehaviorDomainList(DashboardTrendStatDomainBo bo); } 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 index 03af3a9a..fe2ebeff 100644 --- 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 @@ -4,8 +4,11 @@ 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.bo.DashboardTrendStatDomainBo; import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardTrendStatDomainVo; import com.zdxt.enforcementcode.mapper.DashboardTrendStatAreaMapper; +import com.zdxt.enforcementcode.mapper.DashboardTrendStatDomainMapper; import com.zdxt.enforcementcode.report.ITrendBehaviorService; import lombok.RequiredArgsConstructor; import org.dromara.common.mybatis.core.page.PageQuery; @@ -20,6 +23,7 @@ import java.util.List; public class TrendBehaviorServiceImpl implements ITrendBehaviorService { private final DashboardTrendStatAreaMapper dashboardTrendStatAreaMapper; + private final DashboardTrendStatDomainMapper dashboardTrendStatDomainMapper; @Override public TableDataInfo queryTrendBehaviorAreaPageList(DashboardTrendStatAreaBo bo, PageQuery pageQuery) { @@ -28,8 +32,19 @@ public class TrendBehaviorServiceImpl implements ITrendBehaviorService { } @Override - public List selectTrendBehaviorAreaAreaList(DashboardTrendStatAreaBo bo) { - return dashboardTrendStatAreaMapper.selectTrendBehaviorAreaAreaList(bo); + public List selectTrendBehaviorAreaList(DashboardTrendStatAreaBo bo) { + return dashboardTrendStatAreaMapper.selectTrendBehaviorAreaList(bo); + } + + @Override + public TableDataInfo selectTrendBehaviorDomainPageList(DashboardTrendStatDomainBo bo, PageQuery pageQuery) { + Page list=dashboardTrendStatDomainMapper.selectTrendBehaviorDomainPageList(pageQuery.build(),bo); + return TableDataInfo.build(list); + } + + @Override + public List selectTrendBehaviorDomainList(DashboardTrendStatDomainBo bo) { + return dashboardTrendStatDomainMapper.selectTrendBehaviorDomainList(bo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendAreaService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendAreaService.java index c95f3269..70f3e5f0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendAreaService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendAreaService.java @@ -78,6 +78,7 @@ public interface IDashboardSituationTrendAreaService { */ List querySituationTrendAreaList(DashboardTrendStatQueryBo bo); + TableDataInfo selectSituationTrendAreaPageList(DashboardTrendStatQueryBo bo,PageQuery pageQuery); /** * 根据年份和季度，按综合评价分组统计个数 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendDomainService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendDomainService.java index e6adad1d..50bd3c6d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendDomainService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardSituationTrendDomainService.java @@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.service; import com.zdxt.enforcementcode.domain.bo.BashboardSituationQueryBo; import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo; +import com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationPerVo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationTrendDomainVo; @@ -78,6 +79,7 @@ public interface IDashboardSituationTrendDomainService { */ List querySituationTrendDomainList(DashboardTrendStatQueryBo bo); + TableDataInfo selectSituationTrendDomainPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery); /** * 根据年份和季度，按综合评价分组统计个数 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendAreaServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendAreaServiceImpl.java index 6bdfe444..728c786f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendAreaServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendAreaServiceImpl.java @@ -158,6 +158,13 @@ public class DashboardSituationTrendAreaServiceImpl implements IDashboardSituati return baseMapper.querySituationTrendAreaList(bo); } + @Override + public TableDataInfo selectSituationTrendAreaPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery) { + Page list= baseMapper.selectSituationTrendAreaPageList(bo,pageQuery.build()); + return TableDataInfo.build(list); + } + + /** * 根据年份和季度，按综合评价分组统计个数 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendDomainServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendDomainServiceImpl.java index d8a51385..059982c2 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendDomainServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardSituationTrendDomainServiceImpl.java @@ -160,6 +160,13 @@ public class DashboardSituationTrendDomainServiceImpl implements IDashboardSitua return baseMapper.querySituationTrendDomainList(bo); } + @Override + public TableDataInfo selectSituationTrendDomainPageList(DashboardTrendStatQueryBo bo, PageQuery pageQuery) { + Page list=baseMapper.selectSituationTrendDomainPageList(bo,pageQuery.build()); + return TableDataInfo.build(list); + } + + /** * 根据年份和季度，按综合评价分组统计个数 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml index f255efdc..9ba54117 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml @@ -25,9 +25,11 @@ and DATE_FORMAT(t1.enforcement_time,'%Y-%m') >= DATE_FORMAT(#{monthTime},'%Y-%m') - + + and t3.code = #{code} + @@ -103,7 +105,7 @@ and t1.enterprise_number = #{enterpriseNumber} - + and t3.code = #{code} @@ -248,7 +250,7 @@ and DATE_FORMAT(t1.enforcement_time,'%Y-%m') = DATE_FORMAT(#{monthTime},'%Y-%m') - + and t3.code = #{code} @@ -273,7 +275,7 @@ and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d') - + and t3.code = #{code} @@ -299,7 +301,7 @@ and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d') - + and t3.code = #{code} @@ -329,7 +331,7 @@ and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d') - + and t3.code = #{code} @@ -548,7 +550,7 @@ and DATE_FORMAT(t2.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d') - + and t4.code = #{code} @@ -582,7 +584,7 @@ and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d') - + and t3.code = #{code} ) as zs @@ -601,7 +603,7 @@ and DATE_FORMAT(t2.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d') - + and t4.code = #{code} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml index ee85e7de..566d7a10 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml @@ -5,7 +5,7 @@ - + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml index 3cd36e16..89036ff0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml @@ -5,7 +5,7 @@ - + + + + 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 ee287c73..4b8ca451 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 @@ -8,7 +8,7 @@ select t1.district_name as districtName, t1.quarter_time as quarterTime, - t1.quarter_value as xzzfcs + t1.quarter_value as jccs from ( select @@ -56,7 +56,10 @@ - + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatDomainMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatDomainMapper.xml index af5080ee..ca8a2622 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatDomainMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatDomainMapper.xml @@ -3,4 +3,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + select + t1.domain_name as domainName, + t1.quarter_time as quarterTime, + t1.quarter_value as jccs + from + ( + select + domain_name, + firstQuarter as quarter_value, + firstTime as quarter_time + from + dashboard_trend_stat_domain + where is_delete =0 + union all + select + domain_name, + secondQuarter as quarter_value, + secondTime as quarter_time + from + dashboard_trend_stat_domain + where is_delete =0 + union all + select + domain_name, + thirdQuarter as quarter_value, + thirdTime as quarter_time + from + dashboard_trend_stat_domain + where is_delete =0 + union all + select + domain_name, + fourthQuarter as quarter_value, + fourthTime as quarter_time + from + dashboard_trend_stat_domain + where is_delete =0) t1 + + + t1.domain_name = #{bo.domainName} + + + and t1.quarter_time = #{bo.quarterTime} + + + + + + +