From 229de67653155f5aaa57930a7fbc1c87b91ddebd Mon Sep 17 00:00:00 2001 From: ganhao Date: Fri, 12 Jun 2026 18:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A7=E5=B1=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DashboardCheckRegisterAreaController.java | 5 +- .../DashboardCheckRegisterHighController.java | 16 ++- .../bo/DashboardCheckHighAreaQueryBo.java | 33 +++++ .../bo/DashboardCheckRegisterAreaQueryBo.java | 2 +- .../vo/DashboardCheckHighAreaInfoVo.java | 49 +++++++ .../DashboardCheckRegisterDomainMapper.java | 2 +- .../mapper/DashboardOverviewMapper.java | 23 +++- .../service/IDashboardOverviewService.java | 9 ++ ...DashboardCheckRegisterAreaServiceImpl.java | 3 + ...shboardCheckRegisterDomainServiceImpl.java | 16 ++- .../impl/DashboardOverviewServiceImpl.java | 79 +++++------ .../DashboardCheckRegisterAreaMapper.xml | 2 +- .../DashboardCheckRegisterDomainMapper.xml | 31 ++--- .../DashboardOverviewMapper.xml | 123 +++++++++++++++++- .../DashboardTrendStatMapper.xml | 10 +- 15 files changed, 316 insertions(+), 87 deletions(-) create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckHighAreaQueryBo.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckHighAreaInfoVo.java diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterAreaController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterAreaController.java index 68d0cbec..adddc18c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterAreaController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterAreaController.java @@ -2,8 +2,10 @@ package com.zdxt.enforcementcode.controller.web.supervision; import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaBo; import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaQueryBo; +import com.zdxt.enforcementcode.domain.bo.QueryDashboardOverviewBo; import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaInfoVo; import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaVo; +import com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityVo; import com.zdxt.enforcementcode.service.IDashboardCheckRegisterAreaService; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -36,8 +38,7 @@ public class DashboardCheckRegisterAreaController extends BaseController { public R getCheckRegisterArea(DashboardCheckRegisterAreaQueryBo bo) { //1、默认查询上个月的数据 //2、totalCheckRegisterAreaInfo 查询条件： 年+月+城市code+level = 1 - //3、checkRegisterAreaList 查询条件： 年+月+城市code+level = 2 + //3、checkRegisterAreaList 查询条件： 年+月+城市code+level = 3 return dashboardCheckRegisterAreaService.getCheckRegisterArea(bo); } - } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterHighController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterHighController.java index 69060dc2..d65dcb50 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterHighController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterHighController.java @@ -1,14 +1,13 @@ package com.zdxt.enforcementcode.controller.web.supervision; import com.zdxt.enforcementcode.common.util.StringUtils; -import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaQueryBo; -import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterDomainQueryBo; -import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterHighQueryBo; -import com.zdxt.enforcementcode.domain.bo.DashboardCompanyHighFreqCheckBo; +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +import com.zdxt.enforcementcode.domain.bo.*; import com.zdxt.enforcementcode.domain.vo.*; import com.zdxt.enforcementcode.service.IDashboardCheckRegisterAreaService; import com.zdxt.enforcementcode.service.IDashboardCheckRegisterDomainService; import com.zdxt.enforcementcode.service.IDashboardCompanyHighFreqCheckService; +import com.zdxt.enforcementcode.service.IDashboardOverviewService; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.PageQuery; @@ -38,6 +37,9 @@ public class DashboardCheckRegisterHighController extends BaseController { private final IDashboardCompanyHighFreqCheckService dashboardCompanyHighFreqCheckService; private final IDashboardCheckRegisterAreaService dashboardCheckRegisterAreaService; + + private final IDashboardOverviewService dashboardOverviewService; + /** * 大屏-高频检查预警-各领域高频检查次数排行 * 1、高频检查次数排行： pageQuery.orderByColumn = "sqjczs" , pageQuery.isAsc = "desc" @@ -69,9 +71,9 @@ public class DashboardCheckRegisterHighController extends BaseController { * 前端不用默认不用传参数 */ @GetMapping("/getHighInfoByArea") - public R getHighInfoByArea(DashboardCheckRegisterAreaQueryBo bo) { - return dashboardCheckRegisterAreaService.getCheckRegisterArea(bo); + public R> getHighInfoByArea(DashboardCheckHighAreaQueryBo bo) { + List list = dashboardOverviewService.getHighInfoByArea(bo); + return R.ok(list); } - } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckHighAreaQueryBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckHighAreaQueryBo.java new file mode 100644 index 00000000..98470ae9 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckHighAreaQueryBo.java @@ -0,0 +1,33 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +/** + * 大屏-高频检查 + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data + +public class DashboardCheckHighAreaQueryBo extends BaseEntity { + + /** + * 年份 + */ + private Long year; + + /** + * 月份 1-12 + */ + private Long month; + + /** + * 级别：1-市 2-区 3-街道 + */ + private Integer level; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaQueryBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaQueryBo.java index 21e44558..b779713c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaQueryBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaQueryBo.java @@ -37,7 +37,7 @@ public class DashboardCheckRegisterAreaQueryBo extends BaseEntity { private String cityCode; /** - * 级别：1-市 2-区 3-街道 + * 级别：1-市 2-市直属，3-区 4-街道 */ private Integer level; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckHighAreaInfoVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckHighAreaInfoVo.java new file mode 100644 index 00000000..229cc672 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckHighAreaInfoVo.java @@ -0,0 +1,49 @@ +package com.zdxt.enforcementcode.domain.vo; + + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 大屏-高频检查区域 + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DashboardCheckRegisterArea.class) +public class DashboardCheckHighAreaInfoVo implements Serializable { + + + /** + * 区县编码 + */ + @ExcelProperty(value = "区县编码") + private String areaCode; + + /** + * 区县名称 + */ + @ExcelProperty(value = "区县名称") + private String areaName; + + + /** + * 高频检查次数 + */ + private Long hpjccs; + + /** + * 高频检查登记级别：级别1-4 + */ + private Integer gplevel; + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java index 542d111b..aa7a64a4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java @@ -27,7 +27,7 @@ public interface DashboardCheckRegisterDomainMapper extends BaseMapperPlus queryRegisterDomainList(Long year, Long month); + List queryRegisterDomainList(Long year, Long month,String type); /** * 查询高频预警领域统计-按月 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewMapper.java index 469da062..54b8316e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewMapper.java @@ -5,6 +5,7 @@ import com.zdxt.enforcementcode.domain.bean.DashboardOverview; import com.zdxt.enforcementcode.domain.bo.GenerateDataBo; import com.zdxt.enforcementcode.domain.bo.LawEnforcementIntensityQueryBo; import com.zdxt.enforcementcode.domain.bo.QueryDashboardOverviewCountBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckHighAreaInfoVo; import com.zdxt.enforcementcode.domain.vo.DashboardOverviewVo; import com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityVo; import com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityCountVo; @@ -14,7 +15,7 @@ import java.util.List; public interface DashboardOverviewMapper extends BaseMapperPlus { - LawEnforcementIntensityVo queryLawEnforcementIntensity(LawEnforcementIntensityQueryBo queryBo); + List queryLawEnforcementIntensity(LawEnforcementIntensityQueryBo queryBo); List queryCount(QueryDashboardOverviewCountBo bo); @@ -22,4 +23,24 @@ public interface DashboardOverviewMapper extends BaseMapperPlus queryHighInfoByArea(Long year, Long month, Integer level); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardOverviewService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardOverviewService.java index c9002dff..7445a242 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardOverviewService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardOverviewService.java @@ -100,4 +100,13 @@ public interface IDashboardOverviewService { * @return 生成结果信息 */ String generateData(GenerateDataBo bo); + + /** + * 高频检查预警-高频检查企业&高频检查区域统计 + * 默认查询上个月数据 + * + * @param bo 查询条件 + * @return 高频检查区域统计列表 + */ + List getHighInfoByArea(com.zdxt.enforcementcode.domain.bo.DashboardCheckHighAreaQueryBo bo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterAreaServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterAreaServiceImpl.java index 80d1fdc6..ee1f394d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterAreaServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterAreaServiceImpl.java @@ -1,6 +1,7 @@ package com.zdxt.enforcementcode.service.impl; import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +import com.zdxt.enforcementcode.mapper.DashboardOverviewMapper; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -38,6 +39,8 @@ public class DashboardCheckRegisterAreaServiceImpl implements IDashboardCheckReg private final DashboardCheckRegisterAreaMapper baseMapper; + private final DashboardOverviewMapper dashboardOverviewMapper; + /** * 查询大屏-检查登记-区域统计 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterDomainServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterDomainServiceImpl.java index c0f33c90..cddc4f1e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterDomainServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterDomainServiceImpl.java @@ -1,5 +1,6 @@ package com.zdxt.enforcementcode.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterDomain; import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterDomainQueryBo; import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterHighQueryBo; @@ -164,15 +165,18 @@ public class DashboardCheckRegisterDomainServiceImpl implements IDashboardCheckR month = (long) lastMonth.getMonthValue(); } + // 组装返回结果 + DashboardCheckRegisterDomainInfoVo infoVo = new DashboardCheckRegisterDomainInfoVo(); // 查询总体概览数据 - DashboardCheckRegisterDomainVo totalRegisterDomain = baseMapper.queryTotalRegisterDomain(year, month); + List totalRegisterDomainList = baseMapper.queryRegisterDomainList(year, month,"2"); + if(CollectionUtil.isNotEmpty(totalRegisterDomainList)){ + DashboardCheckRegisterDomainVo totalRegisterDomain = + baseMapper.queryRegisterDomainList(year, month,"2").get(0); + infoVo.setTotalRegisterDomain(totalRegisterDomain); + } // 查询领域统计列表 - List registerDomainList = baseMapper.queryRegisterDomainList(year, month); - - // 组装返回结果 - DashboardCheckRegisterDomainInfoVo infoVo = new DashboardCheckRegisterDomainInfoVo(); - infoVo.setTotalRegisterDomain(totalRegisterDomain); + List registerDomainList = baseMapper.queryRegisterDomainList(year, month,"1"); infoVo.setRegisterDomainList(registerDomainList); return R.ok(infoVo); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java index 593e51ac..4dae8f9e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java @@ -4,9 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import com.zdxt.enforcementcode.domain.bean.DashboardOverview; import com.zdxt.enforcementcode.domain.bo.*; -import com.zdxt.enforcementcode.domain.vo.DashboardAreaInfoVo; -import com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityVo; -import com.zdxt.enforcementcode.domain.vo.LawEnforcementIntensityCountVo; +import com.zdxt.enforcementcode.domain.vo.*; import com.zdxt.enforcementcode.service.IDashboardAreaInfoService; import org.dromara.common.core.utils.MapstructUtils; @@ -23,7 +21,6 @@ import org.dromara.common.translation.annotation.Translation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.annotation.Transient; import org.springframework.stereotype.Service; -import com.zdxt.enforcementcode.domain.vo.DashboardOverviewVo; import com.zdxt.enforcementcode.mapper.DashboardOverviewMapper; import com.zdxt.enforcementcode.service.IDashboardOverviewService; import org.springframework.transaction.annotation.Transactional; @@ -73,48 +70,20 @@ public class DashboardOverviewServiceImpl implements IDashboardOverviewService { // 类型1：大屏总览数据 if (bo.getType() == 1) { -// // 先删除该年月的旧数据 -// baseMapper.deleteByYearMonth(bo.getYear().longValue(), bo.getMonth().longValue()); -// DashboardAreaInfoBo queryBo = new DashboardAreaInfoBo(); -// queryBo.setLevel(2L);//查询所有的区 -// List areaInfoVos = dashboardAreaInfoService.queryList(queryBo); -// for (DashboardAreaInfoVo areaInfoVo : areaInfoVos) { -// DashboardOverview dashboardOverviewArea = new DashboardOverview(); -// dashboardOverviewArea.setId(IdUtil.simpleUUID()); -// dashboardOverviewArea.setCityCode(areaInfoVo.getParentCode()); -// dashboardOverviewArea.setCityName("深圳"); -// dashboardOverviewArea.setYear(bo.getYear()); -// dashboardOverviewArea.setMonth(bo.getMonth()); -// dashboardOverviewArea.setDistrictCode(areaInfoVo.getCode()); -// dashboardOverviewArea.setDistrictName(areaInfoVo.getName()); -// dashboardOverviewArea.setLevel(3L);//区 -// this.baseMapper.insert(dashboardOverviewArea); - -// // 查询街道 -// queryBo.setLevel(3L); -// queryBo.setParentCode(areaInfoVo.getCode());//区编码 -// List streetInfoVos = dashboardAreaInfoService.queryList(queryBo); -// if(CollectionUtil.isNotEmpty(streetInfoVos)){ -// for (DashboardAreaInfoVo dashboardAreaInfoVo: streetInfoVos ) { -// DashboardOverview dashboardOverviewStreet = new DashboardOverview(); -// dashboardOverviewStreet.setId(IdUtil.simpleUUID()); -// dashboardOverviewStreet.setCityCode("1"); -// dashboardOverviewStreet.setCityName("深圳"); -// dashboardOverviewStreet.setYear(bo.getYear()); -// dashboardOverviewStreet.setMonth(bo.getMonth()); -// dashboardOverviewStreet.setDistrictCode(areaInfoVo.getCode()); -// dashboardOverviewStreet.setDistrictName(areaInfoVo.getName()); -// dashboardOverviewStreet.setStreetCode(dashboardAreaInfoVo.getCode()); -// dashboardOverviewStreet.setStreetName(dashboardAreaInfoVo.getName()); -// dashboardOverviewStreet.setLevel(5L);//街道 -// this.baseMapper.insert(dashboardOverviewStreet); -// } -// } + // 先删除该年月的旧数据 + baseMapper.deleteByYearMonth(bo.getYear().longValue(), bo.getMonth().longValue()); - } + // 通过SQL批量生成区级大屏总览数据（level=2） + baseMapper.generateOverviewData(bo); + + // 汇总生成市级大屏总览数据（level=1） + baseMapper.generateCityOverviewData(bo); - return "大屏总览数据生成成功，年份：" + bo.getYear() + "，月份：" + bo.getMonth(); + // 计算并更新同比、环比数据 + baseMapper.updateYoyMom(bo); } + return "大屏总览数据生成成功，年份：" + bo.getYear() + "，月份：" + bo.getMonth(); + } /** * 查询大屏总览 @@ -252,7 +221,11 @@ public class DashboardOverviewServiceImpl implements IDashboardOverviewService { } // 调用 Mapper 查询 - return baseMapper.queryLawEnforcementIntensity(queryBo); + List list = baseMapper.queryLawEnforcementIntensity(queryBo); + if (list == null || list.isEmpty()) { + return null; + } + return baseMapper.queryLawEnforcementIntensity(queryBo).get(0); } /** @@ -412,5 +385,23 @@ public class DashboardOverviewServiceImpl implements IDashboardOverviewService { return baseMapper.deleteByIds(ids) > 0; } + /** + * 高频检查预警-高频检查企业&高频检查区域统计 + */ + @Override + public List getHighInfoByArea(DashboardCheckHighAreaQueryBo bo) { + if (bo.getYear() == null || bo.getMonth() == null) { + LocalDate lastMonth = LocalDate.now().minusMonths(1); + bo.setYear((long) lastMonth.getYear()); + bo.setMonth((long) lastMonth.getMonthValue()); + } + if (bo.getLevel() == null) { + bo.setLevel(2); + } + + List list = baseMapper.queryHighInfoByArea( + bo.getYear(), bo.getMonth(), bo.getLevel()); + return list; + } } 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 3c2d416c..ebcc480a 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 @@ -84,7 +84,7 @@ AND city_code = #{cityCode} - AND level = 2 + AND level = 3 ORDER BY 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 f8abf7cb..602931ab 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 @@ -19,9 +19,9 @@ SUM(xzcfzs) AS xzcfzs, SUM(xzcftb) AS xzcftb, SUM(xzcfhb) AS xzcfhb, - SUM(xzzqzs) AS xzzqzs, - SUM(xzzqtb) AS xzzqtb, - SUM(xzzqhb) AS xzzqhb, + SUM(xzqzzs) AS xzqzzs, + SUM(xzqztb) AS xzqztb, + SUM(xzqzhb) AS xzqzhb, SUM(qtzfzs) AS qtzfzs, SUM(qtzftb) AS qtzftb, SUM(qtzfhb) AS qtzfhb @@ -50,9 +50,9 @@ xzcfzs, xzcftb, xzcfhb, - xzzqzs, - xzzqtb, - xzzqhb, + xzqzzs, + xzqztb, + xzqzhb, qtzfzs, qtzftb, qtzfhb, @@ -63,6 +63,7 @@ WHERE is_delete = '0' AND year = #{year} AND month = #{month} + AND type = #{type} ORDER BY lymc @@ -82,9 +83,9 @@ xzcfzs, xzcftb, xzcfhb, - xzzqzs, - xzzqtb, - xzzqhb, + xzqzzs, + xzqztb, + xzqzhb, qtzfzs, qtzftb, qtzfhb @@ -111,9 +112,9 @@ SUM(xzcfzs) AS xzcfzs, SUM(xzcftb) AS xzcftb, SUM(xzcfhb) AS xzcfhb, - SUM(xzzqzs) AS xzzqzs, - SUM(xzzqtb) AS xzzqtb, - SUM(xzzqhb) AS xzzqhb, + SUM(xzqzzs) AS xzqzzs, + SUM(xzqztb) AS xzqztb, + SUM(xzqzhb) AS xzqzhb, SUM(qtzfzs) AS qtzfzs, SUM(qtzftb) AS qtzftb, SUM(qtzfhb) AS qtzfhb @@ -143,9 +144,9 @@ SUM(xzcfzs) AS xzcfzs, SUM(xzcftb) AS xzcftb, SUM(xzcfhb) AS xzcfhb, - SUM(xzzqzs) AS xzzqzs, - SUM(xzzqtb) AS xzzqtb, - SUM(xzzqhb) AS xzzqhb, + SUM(xzqzzs) AS xzqzzs, + SUM(xzqztb) AS xzqztb, + SUM(xzqzhb) AS xzqzhb, SUM(qtzfzs) AS qtzfzs, SUM(qtzftb) AS qtzftb, SUM(qtzfhb) AS qtzfhb diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewMapper.xml index 0008f886..aeace134 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewMapper.xml @@ -6,11 +6,11 @@ + SELECT + district_code AS areaCode, + district_name AS areaName, + COALESCE(gpjcyj, 0) AS hpjccs, + gplevel + FROM dashboard_overview + WHERE is_delete = '0' + AND year = #{year} + AND month = #{month} + AND level = #{level} + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatMapper.xml index e8c66f63..13e27b62 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatMapper.xml @@ -19,7 +19,7 @@ IFNULL(SUM(a.dj_d), 0) AS djD, IFNULL(SUM(a.dj_e), 0) AS djE, IFNULL(SUM(a.wgcs), 0) AS wgcs - FROM dashboard_trend_stat a + FROM dashboard_trend_stat a left join dashboard_area_info b on a.district_code = b.`code` and b.`level` = 2 WHERE a.is_delete = '0' AND ( @@ -44,6 +44,7 @@ a.quarter ORDER BY + b.sort , a.district_name, a.year, a.quarter @@ -54,7 +55,7 @@