From 7d95ed99c52971a2648bee81e7467745ffe093ad Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Wed, 28 Oct 2026 15:58:23 +0800 Subject: [PATCH] =?UTF-8?q?cim-=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=9B=91?= =?UTF-8?q?=E7=9D=A3=E7=AB=AF-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../其他/njy/2026-1.10.0.sql | 4 +- ...CimDashboardOverviewDataSumController.java | 34 +++- .../CimDashboardOverviewJobController.java | 14 ++ .../StatisticalPanelCityController.java | 3 +- .../StatisticalPanelController.java | 2 + .../report/RegistrationController.java | 17 +- .../report/StatisticsComplaintController.java | 18 ++ .../domain/vo/CimDashboardOverviewVo.java | 7 + .../mapper/CimDashboardOverviewMapper.java | 15 +- .../ICimDashboardOverviewDataSumService.java | 31 +++- .../service/IComplaintStatisticsService.java | 2 + ...mDashboardOverviewDataSumSserviceImpl.java | 171 ++++++++++++++++-- .../impl/ComplaintStatisticsServiceImpl.java | 7 + .../impl/StatisticalPaneServiceCityImpl.java | 4 - .../CimDashboardOverviewMapper.xml | 144 +++++++++++++-- .../StatisticalPanelCityMapper.xml | 62 ++++++- .../StatisticalPanelMapper.xml | 10 +- 17 files changed, 493 insertions(+), 52 deletions(-) diff --git a/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql b/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql index 94bc8d0a..c7e1f13b 100644 --- a/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql +++ b/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql @@ -115,5 +115,5 @@ ALTER TABLE dashboard_trend_stat_domain CHANGE fourthTime fourthTime varchar(100 -ALTER TABLE zfjd_ef20_1_2026_07_13.dashboard_area_info ADD area_code varchar(100) NULL COMMENT '行政区编码'; -ALTER TABLE zfjd_ef20_1_2026_07_13.dashboard_area_info CHANGE area_code area_code varchar(100) NULL COMMENT '行政区编码' AFTER name; +ALTER TABLE dashboard_area_info ADD area_code varchar(100) NULL COMMENT '行政区编码'; +ALTER TABLE dashboard_area_info CHANGE area_code area_code varchar(100) NULL COMMENT '行政区编码' AFTER name; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java index a9175dd3..97773d12 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java @@ -49,6 +49,16 @@ public class CimDashboardOverviewDataSumController { return R.ok(vo); } + /** + * Cim-大屏总览 按区域查询 计划总数-预告总数-涉企执法总数-检查评价总数-检查投诉总数-平均检查频次 + * @param bo + * @return + */ + @GetMapping("/getDashboardOverviewAreaMonthDataSum") + public R getDashboardOverviewAreaMonthDataSum(CimDashboardOverviewQueryBo bo){ + CimDashboardOverviewVo vo= cimDashboardOverviewDataSumService.getDashboardOverviewAreaMonthDataSum(bo); + return R.ok(vo); + } /** * Cim-大屏总览-区域月数据汇总-企业数量-执法单位数-执法人员数 @@ -66,9 +76,9 @@ public class CimDashboardOverviewDataSumController { * @return */ @GetMapping("/getHighCheckAreaMonthDataSumMap") - public R> getHighCheckAreaMonthDataSumMap() { + public R> getHighCheckAreaMonthDataSumMap(CimDashboardOverviewQueryBo bo) { // 查询数据 - return R.ok(cimDashboardOverviewDataSumService.getHighCheckAreaMonthDataSumMap()); + return R.ok(cimDashboardOverviewDataSumService.getHighCheckAreaMonthDataSumMap(bo)); } @@ -136,6 +146,16 @@ public class CimDashboardOverviewDataSumController { return R.ok(cimDashboardOverviewDataSumService.getTrendAreaMonthDataSumMap()); } + /** + * 下转联动某个区域查询对应区域街道的数据 + * @param bo + * @return + */ + @GetMapping("/getAreaQuarterlyRegionList") + public R> getAreaQuarterlyRegionList(CimDashboardOverviewQueryBo bo) { + return R.ok(cimDashboardOverviewDataSumService.getAreaQuarterlyRegionList(bo)); + } + /** * Cim大屏-态势感知-领域月数据汇总-趋势行为分析 * @return @@ -147,4 +167,14 @@ public class CimDashboardOverviewDataSumController { return R.ok(cimDashboardOverviewDataSumService.getTrendFieldMonthDataSumMap()); } + + /** + * 下转联动某个区域查询对应区域领域的数据(季度) + * @param bo + * @return + */ + @GetMapping("/getAreaDomainQuarterList") + public R> getAreaDomainQuarterList(CimDashboardOverviewQueryBo bo) { + return R.ok(cimDashboardOverviewDataSumService.getAreaDomainQuarterList(bo)); + } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java index 49aafc8d..eb5de823 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java @@ -40,6 +40,20 @@ public class CimDashboardOverviewJobController { cimDashboardOverviewDataSumService.getMonthDataSum(); return R.ok(); } + /** + * Cim-大屏总览 + * 执法监管 + *月度数据 + * 按区域统计执法人员数-执法单位数-企业总数 + * @param + * @return + */ + @GetMapping("/getAreaMonthDataSum") + public R getAreaMonthDataSum(){ + //模拟测试定时任务插入新数据（月度） + cimDashboardOverviewDataSumService.getAreaMonthDataSum(); + return R.ok(); + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelCityController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelCityController.java index 08df8471..3e30722c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelCityController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelCityController.java @@ -65,9 +65,10 @@ public class StatisticalPanelCityController { /** 监督端-市数据 */ + @SaIgnore @PostMapping("/collectStatistics") @ResponseBody - public R> analysisLawUnion(@RequestBody SixAnalysisParamsBo params){ + public R> analysisLawUnion( SixAnalysisParamsBo params){ // 全市行政检查数量 Map resMap = statisticalPaneCityService.collectStatistics(params); return R.ok("联合检查", resMap); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelController.java index 616dba4a..b796f001 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelController.java @@ -42,6 +42,7 @@ public class StatisticalPanelController { * * @param params * */ + @SaIgnore @PostMapping("/analysisEnterprisesCoordination") @ResponseBody public R> analysisEnterprisesCoordination(@RequestBody(required = false) SixAnalysisParamsBo params){ @@ -210,6 +211,7 @@ public class StatisticalPanelController { } /** 监督端-行政时间维度 */ + @SaIgnore @PostMapping("/analysisTime") @ResponseBody public R > analysisEnterprisesInsTime(@RequestBody SixAnalysisParamsBo params){ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java index ea59967b..43976a04 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/RegistrationController.java @@ -2,6 +2,7 @@ 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.vo.ComplaintStatisticsVo; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.report.ChartDataVo; import com.zdxt.enforcementcode.domain.vo.report.RegistrationAnalysisVo; @@ -9,6 +10,7 @@ import com.zdxt.enforcementcode.domain.vo.report.RegistrationExportVo; import com.zdxt.enforcementcode.domain.vo.report.RegistrationExportV2Vo; import com.zdxt.enforcementcode.domain.vo.report.RegistrationStatisticsVo; import com.zdxt.enforcementcode.report.IEnforcementRegistrationReportReport; +import com.zdxt.enforcementcode.service.IComplaintStatisticsService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,11 +36,11 @@ import java.util.List; public class RegistrationController { private final IEnforcementRegistrationReportReport registrationReport; + private final IComplaintStatisticsService complaintStatisticsService; /** * 接口1：涉企执法统计指标 */ - @SaIgnore @GetMapping("/statistics") public R statistics(EnforcementRegistrationBo bo) { return R.ok(registrationReport.statistics(bo)); @@ -55,7 +57,6 @@ public class RegistrationController { /** * 接口2-V2：涉企执法统计列表（SQL JOIN字典表排序 + 服务端分页，当前使用） */ - @SaIgnore @GetMapping("/list") public TableDataInfo list(EnforcementRegistrationBo bo, PageQuery pageQuery) { return registrationReport.listForV2(bo, pageQuery); @@ -156,11 +157,21 @@ public class RegistrationController { * @param bo * @return */ - @SaIgnore @GetMapping("/unionList") public R> unionList(EnforcementRegistrationBo bo) { List returnList = registrationReport.selectEnforcementRegistrationAndAddressList(bo); return R.ok(returnList); } + + /** + * 监督端-查询是否投诉明细 + * @param rid + * @return + */ + @GetMapping("/complaintByRid") + public R complaintByRid(String rid){ + ComplaintStatisticsVo vo=complaintStatisticsService.selectById(rid); + return R.ok(vo); + } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java index e3c39ca8..fc4e9daf 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/report/StatisticsComplaintController.java @@ -1,5 +1,6 @@ package com.zdxt.enforcementcode.controller.web.supervision.report; +import com.zdxt.enforcementcode.domain.ComplaintStatistics; import com.zdxt.enforcementcode.domain.bo.ComplaintStatisticsBo; import com.zdxt.enforcementcode.domain.vo.report.*; import com.zdxt.enforcementcode.report.IStatisticsComplaintReport; @@ -10,6 +11,7 @@ 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; +import org.springframework.ui.Model; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -47,6 +49,22 @@ public class StatisticsComplaintController { return reportService.detailList(bo, pageQuery); } + /** + * 监督端-投诉明细 + * @param id + * @param model + * @return + */ + + /*@GetMapping("/details/{id}") + public String complaintsReportDetails(@PathVariable("id") String id, Model model) { + ComplaintStatistics complaintStatistics = complaintsReportService.complaintById(id); + model.addAttribute("complaintStatistics", complaintStatistics); + List mssqOrderFlowList = iEnterpriseComplaintService.selectEnterpriseComplaintProcess(complaintStatistics.getCid()); + model.addAttribute("mssqOrderFlowList", mssqOrderFlowList); + return prefix + "/details.html"; + }*/ + /** Tab2-投诉类型统计 */ @GetMapping("/typeStatList") public R> typeStatList(ComplaintStatisticsBo bo) { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java index 4bb52e32..60479894 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java @@ -93,6 +93,13 @@ public class CimDashboardOverviewVo { */ private Long lhzfs; + private Long lhzfcs; + + /** + * 检查次数 + */ + private Long jccs; + /** * 联合执法数同比（增长率，百分比，如 15.5 表示 +15.5%） */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java index e57231ba..1032e13d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java @@ -43,7 +43,7 @@ public interface CimDashboardOverviewMapper extends BaseMapperPlus getLawPersonnelCount(CimDashboardOverviewQueryBo bo); /** - * 获取执法人员数 + * 获取执法单位数 */ List getLawUnitCount(CimDashboardOverviewQueryBo bo); /** @@ -110,6 +110,13 @@ public interface CimDashboardOverviewMapper extends BaseMapperPlus getQuarterlyRegionList(CimDashboardOverviewQueryBo bo); + /** + * 下转联动某个区域查询对应区域街道的数据 + * @param bo + * @return + */ + List getAreaQuarterlyRegionList(CimDashboardOverviewQueryBo bo); + /** * 获取领域检查趋势分析(季度) * @param bo @@ -117,6 +124,12 @@ public interface CimDashboardOverviewMapper extends BaseMapperPlus getDomainQuarterList(CimDashboardOverviewQueryBo bo); + /** + * 下转联动某个区域查询对应区域领域的数据(季度) + * @param bo + * @return + */ + List getAreaDomainQuarterList(CimDashboardOverviewQueryBo bo); /** * 获取涉企登记执法类别（实） diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java index 2a093744..651035ac 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java @@ -21,6 +21,13 @@ public interface ICimDashboardOverviewDataSumService { */ Boolean getMonthDataSum(); + /** + * Cim大屏-按区域统计-企业数量-执法人员数-执法单位数 + * 定时任务调用方法 + * @param + * @return + */ + Boolean getAreaMonthDataSum(); /** * Cim大屏-查询大屏总览汇总月度数据 @@ -28,6 +35,11 @@ public interface ICimDashboardOverviewDataSumService { */ List getDashboardOverviewMonthDataSum(); + /** + * Cim大屏-按区域条件查询月度数据 + */ + CimDashboardOverviewVo getDashboardOverviewAreaMonthDataSum(CimDashboardOverviewQueryBo bo); + /** * Cim大屏-大屏总览企业数量-执法单位数-执法人员数 @@ -54,7 +66,7 @@ public interface ICimDashboardOverviewDataSumService { * Cim大屏-查询高频检查预警-区域月度数据 * @return */ - Map getHighCheckAreaMonthDataSumMap(); + Map getHighCheckAreaMonthDataSumMap(CimDashboardOverviewQueryBo bo); /** * Cim大屏-查询高频检查预警-领域月度数据 @@ -132,6 +144,14 @@ public interface ICimDashboardOverviewDataSumService { */ Map getTrendAreaMonthDataSumMap(); + + /** + * 下转联动某个区域查询对应区域街道的数据 + * @param bo + * @return + */ + List getAreaQuarterlyRegionList(CimDashboardOverviewQueryBo bo); + /** * Cim大屏-查询态势感知-趋势行为分析-领域月度数据 * 定时任务调用方法 @@ -139,10 +159,17 @@ public interface ICimDashboardOverviewDataSumService { */ Boolean getTrendFieldMonthDataSum(); - /** * Cim大屏-查询态势感知-趋势行为分析-领域月度数据 * @return */ Map getTrendFieldMonthDataSumMap(); + + + /** + * 下转联动某个区域查询对应区域领域的数据(季度) + * @param bo + * @return + */ + List getAreaDomainQuarterList(CimDashboardOverviewQueryBo bo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintStatisticsService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintStatisticsService.java index c3ea717c..fdf79081 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintStatisticsService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IComplaintStatisticsService.java @@ -24,6 +24,8 @@ public interface IComplaintStatisticsService { */ ComplaintStatisticsVo queryById(Long id); + ComplaintStatisticsVo selectById(String rid); + /** * 分页查询【请填写功能名称】列表 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java index 0f66766e..850428be 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java @@ -12,6 +12,7 @@ import com.zdxt.enforcementcode.mapper.*; import com.zdxt.enforcementcode.service.ICimDashboardOverviewDataSumService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -102,17 +103,95 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve /*vo.setQyzs(0L); vo.setQyzshb(0L); vo.setQyzstb(0L);*/ - /** - * 暂存需要确认数据来源 - * 暂时未取数-执法人员数，执法单位数（月） - * - * 暂时未取数-区域-企业数量-执法单位数-执法人员数（月） - */ + + //执法人员数：未传区域编码时查询结果是各区明细，需要汇总求和 + long zfrysSum = 0L; + List lawPersonnelList = cimDashboardOverviewMapper.getLawPersonnelCount(bo); + if (lawPersonnelList != null) { + for (CimDashboardOverviewVo item : lawPersonnelList) { + if (item.getZfrys() != null) { + zfrysSum += item.getZfrys(); + } + } + } + vo.setZfrys(zfrysSum); + + //执法单位数：未传区域编码时查询结果是各区明细，需要汇总求和 + long zfdwsSum = 0L; + List lawUnitList = cimDashboardOverviewMapper.getLawUnitCount(bo); + if (lawUnitList != null) { + for (CimDashboardOverviewVo item : lawUnitList) { + if (item.getZfdws() != null) { + zfdwsSum += item.getZfdws(); + } + } + } + vo.setZfdws(zfdwsSum); //添加月度数据 Boolean flag = insertNewData(vo); return flag; } + + /** + * Cim大屏-按区域统计-企业数量-执法人员数-执法单位数 + * 定时任务调用方法 + * @return + */ + @Override + public Boolean getAreaMonthDataSum(){ + + //CimDashboardOverviewQueryBo bo= getDateTime(); + List list=cimDashboardOverviewMapper.getLawPersonnelCount(null); + List list1=cimDashboardOverviewMapper.getLawUnitCount(null); + + + // 1. 高频检查区域：VO(code/name/number) → 实体(areaCode/areaName/gpjcqy) + List areaPersonnelList = new ArrayList<>(); + if (list != null) { + for (CimDashboardOverviewVo vo : list) { + DashboardOverviewPersonnel entity = new DashboardOverviewPersonnel(); + entity.setCityCode("440300"); + entity.setCityName("深圳市"); + entity.setDistrictCode(vo.getCode()); + entity.setDistrictName(vo.getName()); + entity.setZfrys(vo.getZfrys()); + entity.setLevel(2L); + entity.setYear(getDateTime().getYear()); + entity.setMonth(getDateTime().getMonth()); + entity.setIsDelete("0"); + areaPersonnelList.add(entity); + } + } + + // 2. 高频检查区域执法单位联合执法数：VO(bueauDeptId/bureauDeptName/number) → 实体(bureauDeptId/bureauDeptName/lhzfcs) + List areaUnionList = new ArrayList<>(); + if (list1 != null) { + for (CimDashboardOverviewVo vo : list1) { + DashboardOverviewUnit entity = new DashboardOverviewUnit(); + entity.setCityCode("440300"); + entity.setCityName("深圳市"); + entity.setDistrictCode(vo.getCode()); + entity.setDistrictName(vo.getName()); + entity.setZfdws(vo.getZfdws()); + entity.setLevel(2L); + entity.setYear(getDateTime().getYear()); + entity.setMonth(getDateTime().getMonth()); + entity.setIsDelete("0"); + areaUnionList.add(entity); + } + } + + //新增数据到数据汇总表 + if (!areaPersonnelList.isEmpty()) { + dashboardOverviewPersonnelMapper.insertBatch(areaPersonnelList); + } + if (!areaUnionList.isEmpty()) { + dashboardOverviewUnitMapper.insertBatch(areaUnionList); + } + return true; + } + /** * Cim-大屏总览 * 获取月度数据 @@ -129,6 +208,36 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve return cimDashboardOverviewMapper.selectVoList(queryWrapper); } + /** + * Cim大屏-按区域条件查询月度数据 + */ + @Override + public CimDashboardOverviewVo getDashboardOverviewAreaMonthDataSum(CimDashboardOverviewQueryBo bo) { + CimDashboardOverviewVo vo=new CimDashboardOverviewVo(); + // 区域计划总数 + bo.setMonthTime(getDateTime().getMonthTime()); + Long jhzs=cimDashboardOverviewMapper.getPlanCount(bo); + vo.setJhzs(jhzs); + //区域预告总数 + Long ygzs=cimDashboardOverviewMapper.getNoticeCount(bo); + vo.setYgzs(ygzs); + //涉企执法总数 + Long sqzfzs=cimDashboardOverviewMapper.getEnfLawCount(bo); + vo.setSqzfzs(sqzfzs); + //稽查反馈总数 + Long jcfkzs=cimDashboardOverviewMapper.getLawEvaluateCount(bo); + vo.setJcpjzs(jcfkzs); + //检查投诉总数 + Long jctszs=cimDashboardOverviewMapper.getComplaintCount(bo); + vo.setJctszs(jctszs); + //平均检查频次 + Long bzfqy=cimDashboardOverviewMapper.getSubLawEntCount(bo); + Long xzzf=cimDashboardOverviewMapper.getEnfRegistrationCount(bo); + if(bzfqy!=0) { + vo.setPjjcpc(xzzf / bzfqy); + } + return vo; + } /** * Cim大屏-大屏总览企业数量-执法单位数-执法人员数 @@ -201,8 +310,10 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve add.setJctszs(vo.getJctszs()); add.setPjjcpc(vo.getPjjcpc()); add.setQyzs(vo.getQyzs()); - add.setQyzshb(vo.getQyzshb()); - add.setQyzstb(vo.getQyzstb()); + /*add.setQyzshb(vo.getQyzshb()); + add.setQyzstb(vo.getQyzstb());*/ + add.setZfrys(vo.getZfrys()); + add.setZfdws(vo.getZfdws()); // 年份、月份 add.setYear(cal.get(Calendar.YEAR)); add.setMonth(cal.get(Calendar.MONTH) + 1); @@ -258,7 +369,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve entity.setCityName("深圳市"); entity.setBureauDeptId(vo.getBueauDeptId()); entity.setBureauDeptName(vo.getBureauDeptName()); - entity.setLhzfcs(vo.getNumber()); + entity.setLhzfcs(vo.getLhzfcs()); entity.setLevel(2L); entity.setYear(getDateTime().getYear()); entity.setMonth(getDateTime().getMonth()); @@ -276,7 +387,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve entity.setCityName("深圳市"); entity.setBureauDeptId(vo.getBueauDeptId()); entity.setBureauDeptName(vo.getBureauDeptName()); - entity.setJccs(vo.getNumber()); + entity.setJccs(vo.getJccs()); entity.setLevel(2L); entity.setYear(getDateTime().getYear()); entity.setMonth(getDateTime().getMonth()); @@ -323,34 +434,39 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve * @return */ @Override - public Map getHighCheckAreaMonthDataSumMap() { + public Map getHighCheckAreaMonthDataSumMap(CimDashboardOverviewQueryBo bo) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DashboardHighCheckArea::getLevel, 2); queryWrapper.eq(DashboardHighCheckArea::getIsDelete, "0"); queryWrapper.eq(DashboardHighCheckArea::getYear, getDateTime().getYear()); queryWrapper.eq(DashboardHighCheckArea::getMonth, getDateTime().getMonth()); + queryWrapper.eq(StringUtils.isNotBlank(bo.getCode()),DashboardHighCheckArea::getAreaCode,bo.getCode()); List areaList = dashboardHighCheckAreaMapper.selectList(queryWrapper); - LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + /*LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); queryWrapper1.eq(DashboardHighCheckUnionArea::getLevel, 2); queryWrapper1.eq(DashboardHighCheckUnionArea::getIsDelete, "0"); queryWrapper1.eq(DashboardHighCheckUnionArea::getYear, getDateTime().getYear()); queryWrapper1.eq(DashboardHighCheckUnionArea::getMonth, getDateTime().getMonth()); - List unionList = dashboardhighcheckunionMapper.selectList(queryWrapper1); + List unionList = dashboardhighcheckunionMapper.selectList(queryWrapper1);*/ + bo.setMonthTime(getDateTime().getMonthTime()); + List unionList= cimDashboardOverviewMapper.getHighCheckAreaUnionNoRanking(bo); - LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + /*LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); queryWrapper2.eq(DashboardHighCheckFrequencyArea::getLevel, 2); queryWrapper2.eq(DashboardHighCheckFrequencyArea::getIsDelete, "0"); queryWrapper2.eq(DashboardHighCheckFrequencyArea::getYear, getDateTime().getYear()); queryWrapper2.eq(DashboardHighCheckFrequencyArea::getMonth, getDateTime().getMonth()); - List freqList = dashboardHighCheckFrequencyAreaMapper.selectList(queryWrapper2); + List freqList = dashboardHighCheckFrequencyAreaMapper.selectList(queryWrapper2);*/ + List freqList=cimDashboardOverviewMapper.getHighCheckAreaenfRegistraionRanking(bo); LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); queryWrapper3.eq(DashboardHighCheckEnterprise::getLevel, 2); queryWrapper3.eq(DashboardHighCheckEnterprise::getIsDelete, "0"); queryWrapper3.eq(DashboardHighCheckEnterprise::getYear, getDateTime().getYear()); queryWrapper3.eq(DashboardHighCheckEnterprise::getMonth, getDateTime().getMonth()); + queryWrapper.eq(StringUtils.isNotBlank(bo.getCode()),DashboardHighCheckArea::getAreaCode,bo.getCode()); List enterpriseList = dashboardHighCheckEnterpriseMapper.selectList(queryWrapper3); Map map = new HashMap<>(); map.put("areaList", areaList); @@ -1126,6 +1242,19 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve return map; } + + /** + * 下转联动某个区域查询对应区域街道的数据 + * @param bo + * @return + */ + @Override + public List getAreaQuarterlyRegionList(CimDashboardOverviewQueryBo bo) { + List list= cimDashboardOverviewMapper.getAreaQuarterlyRegionList(bo); + return list; + } + + /** * 构建区域趋势统计数据副本（用于高频/低频区域结果） * 单独构建新对象，避免同一区域在多个季度上榜时 jccs 值被覆盖 @@ -1262,6 +1391,18 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve } + /** + * 下转联动某个区域查询对应区域领域的数据(季度) + * @param bo + * @return + */ + @Override + public List getAreaDomainQuarterList(CimDashboardOverviewQueryBo bo) { + List list=cimDashboardOverviewMapper.getAreaDomainQuarterList(bo); + return list; + } + + /** * 构建领域结果 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintStatisticsServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintStatisticsServiceImpl.java index d02a110a..4f965355 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintStatisticsServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/ComplaintStatisticsServiceImpl.java @@ -44,6 +44,13 @@ public class ComplaintStatisticsServiceImpl implements IComplaintStatisticsServi return baseMapper.selectVoById(id); } + @Override + public ComplaintStatisticsVo selectById(String rid){ + LambdaQueryWrapper lqw =new LambdaQueryWrapper<>(); + lqw.eq(ComplaintStatistics::getRid,rid); + return baseMapper.selectVoOne(lqw); + } + /** * 分页查询【请填写功能名称】列表 * diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/StatisticalPaneServiceCityImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/StatisticalPaneServiceCityImpl.java index 89becdb1..81bfa628 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/StatisticalPaneServiceCityImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/StatisticalPaneServiceCityImpl.java @@ -2,9 +2,6 @@ package com.zdxt.enforcementcode.service.impl; import com.zdxt.enforcementcode.common.annotation.DataScope; -import com.zdxt.enforcementcode.domain.EnforcementRegistration; -import com.zdxt.enforcementcode.domain.EnterpriseComplaint; -import com.zdxt.enforcementcode.domain.EnterpriseEvaluate; import com.zdxt.enforcementcode.domain.bo.SixAnalysisParamsBo; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.EnterpriseComplaintVo; @@ -12,7 +9,6 @@ import com.zdxt.enforcementcode.domain.vo.EnterpriseEvaluateVo; import com.zdxt.enforcementcode.mapper.StatisticalPanelCityMapper; import com.zdxt.enforcementcode.service.IStatisticalPaneCityService; import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.domain.SysDictData; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.service.ISysDeptService; 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 bb954e19..f190fe3a 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 @@ -30,7 +30,7 @@ and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d') - and DATE_FORMAT(t1.enforcement_time,'%Y-%m') >= DATE_FORMAT(#{monthTime},'%Y-%m') + and DATE_FORMAT(t1.enforcement_time,'%Y-%m') = DATE_FORMAT(#{monthTime},'%Y-%m') @@ -115,7 +115,7 @@ and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{dayTime},'%Y-%m-%d') - and DATE_FORMAT(t1.enforcement_time,'%Y-%m-%d') = DATE_FORMAT(#{monthTime},'%Y-%m-%d') + and DATE_FORMAT(t1.enforcement_time,'%Y-%m') = DATE_FORMAT(#{monthTime},'%Y-%m') and t1.enterprise_number = #{enterpriseNumber} @@ -126,6 +126,7 @@ + + + + + + + + + + - SELECT r.law_field, CAST(COUNT(1) AS CHAR) AS cnt FROM enforcement_registration r WHERE enforcement_time IS NOT null and r.bureau_dept_name is not null and r.is_submit = 1 and r.law_enforcement_id is not null and r.enterprise_name is not null and r.enterprise_number is not null and r.law_enforcer is not null and r.law_enforcer_two is not null and r.is_complaint is not null and r.check_category is not null and r.bureau_dept_id is not null and law_field is not null + + select + r.bureau_dept_id, + case r.bureau_dept_id + when '20210922213242905-1183-F9897C287' then '01' + when '20210922213242781-25B8-DF4A0AB32' then '02' + when '20210922213015633-2458-5A5E07C0C' then '03' + when '20210922213015704-F9CB-3AFDBC097' then '04' + when '20210922213015633-2459-6D7CB4903' then '05' + when '20210922212956790-EDA0-123260206' then '06' + when '20210922213220191-2F55-3493B378E' then '07' + when '20221024170151446-F82B-F4F56D018' then '08' + when '20210922213219489-1142-3C752622D' then '09' + else '' + end as law_field, + CAST(count(1) AS CHAR) AS cnt + from + enforcement_registration r + + and r.is_submit = 1 + and r.is_delete =0 + and enforcement_time IS NOT null + and r.bureau_dept_name is not null + and r.law_enforcement_id is not null + and r.enterprise_name is not null + and r.enterprise_number is not null + and r.law_enforcer is not null + and r.law_enforcer_two is not null + and r.is_complaint is not null + and r.check_category is not null + and r.bureau_dept_id is not null + and r.bureau_dept_id in ( + '20210922213242905-1183-F9897C287', + '20210922213242781-25B8-DF4A0AB32', + '20210922213015633-2458-5A5E07C0C', + '20210922213015704-F9CB-3AFDBC097', + '20210922213015633-2459-6D7CB4903', + '20210922212956790-EDA0-123260206', + '20210922213220191-2F55-3493B378E', + '20221024170151446-F82B-F4F56D018', + '20210922213219489-1142-3C752622D' + ) + and r.enforcement_time >= #{beginTime} - and r.enforcement_time < #{endTime} + and r.enforcement_time <= #{endTime} and r.zone = 1 and r.bureau_dept_id in #{bureau_dept_id} ${params.dataScope} - GROUP BY r.law_field ORDER BY cnt DESC; + + group by r.bureau_dept_id,law_field + ORDER BY cnt DESC diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/StatisticalPanelMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/StatisticalPanelMapper.xml index 051e08cf..773aa356 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/StatisticalPanelMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/StatisticalPanelMapper.xml @@ -1639,6 +1639,7 @@ and r.is_complaint is not null and r.check_category is not null and r.bureau_dept_id is not null + and enforcement_time < DATE_FORMAT(NOW(), '%Y-%m-01') and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId}) @@ -1646,8 +1647,8 @@ and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') - and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') - and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') + and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') + and DATE_FORMAT(#{endTime},'%Y-%m-%d') <= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') ${params.dataScope} @@ -1697,6 +1698,7 @@ and r.is_complaint is not null and r.check_category is not null and r.bureau_dept_id is not null + and enforcement_time < DATE_FORMAT(NOW(), '%Y-%m-01') and r.bureau_dept_id in (select sd.dept_id from sys_dept sd where sd.area_node = #{deptId} or sd.dept_id = #{deptId}) @@ -1704,8 +1706,8 @@ and (r.union_no is not null and r.union_no != '') and (r.union_no is null or r.union_no = '') - and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') - and DATE_FORMAT(#{endTime},'%Y-%m-%d') >= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') + and DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') >= DATE_FORMAT(#{beginTime},'%Y-%m-%d') + and DATE_FORMAT(#{endTime},'%Y-%m-%d') <= DATE_FORMAT(r.enforcement_time,'%Y-%m-%d') ${params.dataScope}