From f212d89fbe3fc1a563f438d7fc53b0ff43c4af83 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Sat, 2 Nov 2024 16:07:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/system/UserMapper.xml | 5 +- .../StatisticalPanelController.java | 33 +++- .../StatisticsWarningController.java | 26 ++- .../LawEnforcementWarningListMapper.java | 1 + .../ILawEnforcementWarningListService.java | 2 + .../code/service/StatisticalPaneService.java | 6 + .../LawEnforcementWarningListServiceImpl.java | 5 + .../service/impl/StatisticalPaneImpl.java | 172 ++++++++++++++++-- .../LawEnforcementWarningListMapper.xml | 17 +- 9 files changed, 229 insertions(+), 38 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index c6479027..6bff6347 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -110,8 +110,8 @@ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java index a93d2f3b..6f619a56 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java @@ -1,30 +1,49 @@ package com.zdxt.code.controller; +import com.zdxt.code.domain.StatisticsIndicator; +import com.zdxt.code.domain.StatisticsIndicatorPart; import com.zdxt.code.service.StatisticalPaneService; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; /** * 综合统计 */ -@RequestMapping("/statisticalPanel") @Controller +@RequestMapping("/code/statisticalPanel") public class StatisticalPanelController extends BaseController { @Autowired private StatisticalPaneService statisticalPaneService; - @RequestMapping("/") + /*@RequestMapping("/") public ZDResponse home(){ return ZDResponse.success(); - } - - @RequestMapping("/") - public ZDResponse complaint(){ + }*/ - return ZDResponse.success(""); + @GetMapping("/enterprise") + @ResponseBody + public ZDResponse qy(StatisticsIndicatorPart statisticsIndicatorPart){ + return ZDResponse.success("成功",statisticalPaneService.enterprise(statisticsIndicatorPart)); + } + @GetMapping("/registration") + @ResponseBody + public ZDResponse registration(StatisticsIndicatorPart statisticsIndicatorPart){ + return ZDResponse.success("成功",statisticalPaneService.registration(statisticsIndicatorPart)); + } + @GetMapping("/warning") + @ResponseBody + public ZDResponse warning(StatisticsIndicatorPart statisticsIndicatorPart){ + return ZDResponse.success("成功",statisticalPaneService.warning(statisticsIndicatorPart)); + } + @GetMapping("/complaint") + @ResponseBody + public ZDResponse complaint(StatisticsIndicatorPart statisticsIndicatorPart){ + return ZDResponse.success("成功",statisticalPaneService.complaint(statisticsIndicatorPart)); } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java index 20653aba..f874b3f5 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticsWarningController.java @@ -21,6 +21,8 @@ import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Controller @RequestMapping("/code/statisticsWarning") @@ -40,14 +42,18 @@ public class StatisticsWarningController extends BaseController { lawEnforcementWarningList.setBeginTime(str.format(beginTime)); lawEnforcementWarningList.setEndTime(str.format(endTime)); List lawEnforcementWarningListList=iLawEnforcementWarningListService.selectLawEnforcementWarningListList1(lawEnforcementWarningList); - int Number1=0; + /*int Number1=0; for(LawEnforcementWarningList l:lawEnforcementWarningListList){ Number1=Number1+l.getEnforcementNumber(); - } + }*/ + List listList=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(lawEnforcementWarningList); model.addAttribute("yearList",yearMake()); model.addAttribute("year",localDate.getYear()); - model.addAttribute("Number1",Number1); - model.addAttribute("Number2",lawEnforcementWarningListList.size()); + /*model.addAttribute("Number1",Number1);*/ + model.addAttribute("Number1",listList.size()); + /*model.addAttribute("Number2",lawEnforcementWarningListList.size());*/ + Map map=lawEnforcementWarningListList.stream().collect(Collectors.groupingBy(LawEnforcementWarningList::getEnforcementDepartmentId,Collectors.counting())); + model.addAttribute("Number2",map.size()); return prefix + "/statisticsWarning"; } @RequiresPermissions("code:statisticsWarning:list") @@ -76,13 +82,17 @@ public class StatisticsWarningController extends BaseController { lawEnforcementWarningList.setEnterpriseName(searchType.getName()); } List lawEnforcementWarningListList=iLawEnforcementWarningListService.selectLawEnforcementWarningListList1(lawEnforcementWarningList); - int Number1=0; + /*int Number1=0; for(LawEnforcementWarningList l:lawEnforcementWarningListList){ Number1=Number1+l.getEnforcementNumber(); - } + }*/ + List listList=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(lawEnforcementWarningList); model.addAttribute("year",searchType.getYear()); - model.addAttribute("Number1",Number1); - model.addAttribute("Number2",lawEnforcementWarningListList.size()); + /*model.addAttribute("Number1",Number1);*/ + model.addAttribute("Number1",listList); + /*model.addAttribute("Number2",lawEnforcementWarningListList.size());*/ + Map map=lawEnforcementWarningListList.stream().collect(Collectors.groupingBy(LawEnforcementWarningList::getEnforcementDepartmentId,Collectors.counting())); + model.addAttribute("Number2",map.size()); return prefix+"/fragmentW"; } private LawEnforcementWarningList dateMake(SearchType searchType){ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LawEnforcementWarningListMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LawEnforcementWarningListMapper.java index 9459d732..07cea55e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LawEnforcementWarningListMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LawEnforcementWarningListMapper.java @@ -27,6 +27,7 @@ public interface LawEnforcementWarningListMapper */ List selectLawEnforcementWarningListList(LawEnforcementWarningList lawEnforcementWarningList); List selectLawEnforcementWarningListList1(LawEnforcementWarningList lawEnforcementWarningList); + List selectLawEnforcementWarningListList2(LawEnforcementWarningList lawEnforcementWarningList); /** * 查询企业预警信息 * @param lawEnforcementWarningList diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILawEnforcementWarningListService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILawEnforcementWarningListService.java index cb819e02..9b919d79 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILawEnforcementWarningListService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILawEnforcementWarningListService.java @@ -29,6 +29,8 @@ public interface ILawEnforcementWarningListService List selectLawEnforcementWarningListList1(LawEnforcementWarningList lawEnforcementWarningList); + List selectLawEnforcementWarningListList2(LawEnforcementWarningList lawEnforcementWarningList); + /** * 查询企业预警信息 * @param lawEnforcementWarningList diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java index ff6e7a52..4277e3c5 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/StatisticalPaneService.java @@ -4,5 +4,11 @@ import com.zdxt.code.domain.StatisticsIndicatorPart; public interface StatisticalPaneService { + StatisticsIndicatorPart enterprise(StatisticsIndicatorPart statisticsIndicatorPart); + + StatisticsIndicatorPart registration(StatisticsIndicatorPart statisticsIndicatorPart); + + StatisticsIndicatorPart warning(StatisticsIndicatorPart statisticsIndicatorPart); + StatisticsIndicatorPart complaint(StatisticsIndicatorPart statisticsIndicatorPart); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawEnforcementWarningListServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawEnforcementWarningListServiceImpl.java index 974f2225..63650c1a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawEnforcementWarningListServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawEnforcementWarningListServiceImpl.java @@ -50,6 +50,11 @@ public class LawEnforcementWarningListServiceImpl implements ILawEnforcementWarn { return lawEnforcementWarningListMapper.selectLawEnforcementWarningListList1(lawEnforcementWarningList); } + @Override + public List selectLawEnforcementWarningListList2(LawEnforcementWarningList lawEnforcementWarningList) + { + return lawEnforcementWarningListMapper.selectLawEnforcementWarningListList2(lawEnforcementWarningList); + } @Override public List selectLawEnforcementWarningByEnterpriseNumber(LawEnforcementWarningList lawEnforcementWarningList) { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneImpl.java index f2a0716a..4926fa44 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneImpl.java @@ -1,11 +1,7 @@ package com.zdxt.code.service.impl; -import com.zdxt.code.domain.ComplaintStatistics; -import com.zdxt.code.domain.EnterpriseComplaint; -import com.zdxt.code.domain.StatisticsIndicatorPart; -import com.zdxt.code.service.ComplaintStatisticsService; -import com.zdxt.code.service.IEnterpriseComplaintService; -import com.zdxt.code.service.StatisticalPaneService; +import com.zdxt.code.domain.*; +import com.zdxt.code.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,17 +12,153 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - +/** + * 年度：year!==null,quarter==null,month==null + * 季度：year!==null,quarter!==null,month==null + * 月度：year!==null,quarter!==null,month!==null + */ @Service public class StatisticalPaneImpl implements StatisticalPaneService { @Autowired private ComplaintStatisticsService complaintStatisticsService; + @Autowired + private ILawEnforcementWarningListService iLawEnforcementWarningListService; + @Autowired + private IEnforcementRegistrationService enforcementRegistrationService; + @Autowired + private IEnterpriseInformationService iEnterpriseInformationService; + + /** + * 企业--无权限 + * @param statisticsIndicatorPart + * @return + */ + @Override + public StatisticsIndicatorPart enterprise(StatisticsIndicatorPart statisticsIndicatorPart){ + StatisticsIndicatorPart sNow=nowDataMake(statisticsIndicatorPart); + StatisticsIndicatorPart sLast=lastDataMake(statisticsIndicatorPart,sNow.getBeginTime()); + EnterpriseInformation enterpriseNow=new EnterpriseInformation(); + EnterpriseInformation enterpriseLast=new EnterpriseInformation(); + enterpriseNow.setBeginTime(sNow.getBeginTime()); + enterpriseNow.setEndTime(sNow.getEndTime()); + enterpriseLast.setBeginTime(sLast.getBeginTime()); + enterpriseLast.setEndTime(sLast.getEndTime()); + List enterpriseNowList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseNow); + List enterpriseLastList = iEnterpriseInformationService.selectEnterpriseInformationList1(enterpriseLast); + List existListNow = enterpriseNowList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); + List logoutListNow = enterpriseNowList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + List existListLast = enterpriseLastList.stream().filter(item -> item.getIsDelete() == 0).collect(Collectors.toList()); + List logoutListLast = enterpriseLastList.stream().filter(item -> item.getIsDelete() == 1).collect(Collectors.toList()); + StatisticsIndicatorPart p1=new StatisticsIndicatorPart(); + p1.setName("企业数量"); + p1.setTotal(enterpriseNowList.size()); + p1.setHuan(enterpriseNowList.size()-enterpriseLastList.size()); + StatisticsIndicatorPart p2=new StatisticsIndicatorPart(); + p2.setName("续存企业数量"); + p2.setTotal(existListNow.size()); + p2.setHuan(existListNow.size()-existListLast.size()); + StatisticsIndicatorPart p3=new StatisticsIndicatorPart(); + p3.setName("注销企业数量"); + p3.setTotal(logoutListNow.size()); + p3.setHuan(logoutListNow.size()-logoutListLast.size()); + StatisticsIndicatorPart p=new StatisticsIndicatorPart(); + List statisticsIndicatorPartList=new ArrayList<>(); + p.setName("企业数量"); + statisticsIndicatorPartList.add(p1); + statisticsIndicatorPartList.add(p2); + statisticsIndicatorPartList.add(p3); + p.setStatisticsIndicatorPartList(statisticsIndicatorPartList); + return p; + } + + /** + * 执法检查--本单位执法检查需设权限未设 + * @param statisticsIndicatorPart + * @return + */ + @Override + public StatisticsIndicatorPart registration(StatisticsIndicatorPart statisticsIndicatorPart){ + StatisticsIndicatorPart sNow=nowDataMake(statisticsIndicatorPart); + StatisticsIndicatorPart sLast=lastDataMake(statisticsIndicatorPart,sNow.getBeginTime()); + EnforcementRegistration enforcementRegistrationNow=new EnforcementRegistration(); + EnforcementRegistration enforcementRegistrationLast=new EnforcementRegistration(); + enforcementRegistrationNow.setBeginTime(sNow.getBeginTime()); + enforcementRegistrationNow.setEndTime(sNow.getEndTime()); + enforcementRegistrationLast.setBeginTime(sLast.getBeginTime()); + enforcementRegistrationLast.setEndTime(sLast.getEndTime()); + List now = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistrationNow); + List last = enforcementRegistrationService.selectEnforcementRegistrationList1(enforcementRegistrationLast); + List uniteListNow=now.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList()); + List uniteListLast=last.stream().filter(item->item.getUniteCheck()!=null&&!"".equals(item.getUniteCheck())).collect(Collectors.toList()); + StatisticsIndicatorPart p1=new StatisticsIndicatorPart(); + p1.setName("执法检查数量"); + p1.setTotal(now.size()); + p1.setHuan(now.size()-last.size()); + StatisticsIndicatorPart p2=new StatisticsIndicatorPart(); + p2.setName("执法检查数量"); + p2.setTotal(uniteListNow.size()); + p2.setHuan(uniteListNow.size()-uniteListLast.size()); + StatisticsIndicatorPart p3=new StatisticsIndicatorPart(); + p3.setName("本单位检查数量"); + p3.setTotal(now.size()); + p3.setHuan(now.size()-last.size()); + StatisticsIndicatorPart p=new StatisticsIndicatorPart(); + List statisticsIndicatorPartList=new ArrayList<>(); + p.setName("执法检查"); + statisticsIndicatorPartList.add(p1); + statisticsIndicatorPartList.add(p2); + statisticsIndicatorPartList.add(p3); + p.setStatisticsIndicatorPartList(statisticsIndicatorPartList); + return p; + } + /** + * 预警部分--本部门需设权限未设 + * @param statisticsIndicatorPart + * @return + */ @Override + public StatisticsIndicatorPart warning(StatisticsIndicatorPart statisticsIndicatorPart){ + StatisticsIndicatorPart sNow=nowDataMake(statisticsIndicatorPart); + StatisticsIndicatorPart sLast=lastDataMake(statisticsIndicatorPart,sNow.getBeginTime()); + LawEnforcementWarningList warningStatisticsNow=new LawEnforcementWarningList(); + LawEnforcementWarningList warningStatisticsLast=new LawEnforcementWarningList(); + warningStatisticsNow.setBeginTime(sNow.getBeginTime()); + warningStatisticsNow.setEndTime(sNow.getEndTime()); + warningStatisticsLast.setBeginTime(sLast.getBeginTime()); + warningStatisticsLast.setEndTime(sLast.getEndTime()); + List lListNow1=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(warningStatisticsNow); + List lListLast1=iLawEnforcementWarningListService.selectLawEnforcementWarningListList2(warningStatisticsLast); + StatisticsIndicatorPart p1=new StatisticsIndicatorPart(); + p1.setName("执法预警数量"); + p1.setTotal(lListNow1.size()); + p1.setHuan(lListNow1.size()-lListLast1.size()); + Map mapNow=lListNow1.stream().collect(Collectors.groupingBy(LawEnforcementWarningList::getEnforcementDepartmentId,Collectors.counting())); + Map mapLast=lListLast1.stream().collect(Collectors.groupingBy(LawEnforcementWarningList::getEnforcementDepartmentId,Collectors.counting())); + StatisticsIndicatorPart p2=new StatisticsIndicatorPart(); + p2.setName("涉事单位"); + p2.setTotal(mapNow.size()); + p2.setHuan(mapNow.size()-mapLast.size()); + StatisticsIndicatorPart p3=new StatisticsIndicatorPart(); + p3.setName("本单位发布预警数量"); + p3.setTotal(lListNow1.size()); + p3.setHuan(lListNow1.size()-lListLast1.size()); + StatisticsIndicatorPart p=new StatisticsIndicatorPart(); + List statisticsIndicatorPartList=new ArrayList<>(); + p.setName("执法预警"); + statisticsIndicatorPartList.add(p1); + statisticsIndicatorPartList.add(p2); + statisticsIndicatorPartList.add(p3); + p.setStatisticsIndicatorPartList(statisticsIndicatorPartList); + return p; + + } + /** - * 年度：year!==null,quarter==null,month==null - * 季度：year!==null,quarter!==null,month==null - * 月度：year!==null,quarter!==null,month!==null + * 投诉部分--无权限 + * @param statisticsIndicatorPart + * @return */ + @Override public StatisticsIndicatorPart complaint(StatisticsIndicatorPart statisticsIndicatorPart){ StatisticsIndicatorPart sNow=nowDataMake(statisticsIndicatorPart); StatisticsIndicatorPart sLast=lastDataMake(statisticsIndicatorPart,sNow.getBeginTime()); @@ -42,24 +174,24 @@ public class StatisticalPaneImpl implements StatisticalPaneService { p1.setName("执法投诉数量"); p1.setTotal(complaintStatisticsListNow.size()); p1.setHuan(complaintStatisticsListNow.size()-complaintStatisticsListLast.size()); - List rqbsmNow=complaintStatisticsListNow.stream().filter(item->item.getComplaintType()==3).collect(Collectors.toList()); - List rqbsmLast=complaintStatisticsListLast.stream().filter(item->item.getComplaintType()==3).collect(Collectors.toList()); - StatisticsIndicatorPart p2=new StatisticsIndicatorPart(); - p2.setName("入企不扫码"); - p2.setTotal(rqbsmNow.size()); - p2.setHuan(rqbsmNow.size()-rqbsmLast.size()); Map btsbmNow=complaintStatisticsListNow.stream().collect(Collectors.groupingBy(ComplaintStatistics::getComplaintDepartmentId,Collectors.counting())); Map btsbmLast=complaintStatisticsListLast.stream().collect(Collectors.groupingBy(ComplaintStatistics::getComplaintDepartmentId,Collectors.counting())); + StatisticsIndicatorPart p2=new StatisticsIndicatorPart(); + p2.setName("被投诉部门数量"); + p2.setTotal(btsbmNow.size()); + p2.setHuan(btsbmNow.size()-btsbmLast.size()); + Map tsqyNowList=complaintStatisticsListNow.stream().collect(Collectors.groupingBy(ComplaintStatistics::getEnterpriseNumber,Collectors.counting())); + Map tsqyLastList=complaintStatisticsListLast.stream().collect(Collectors.groupingBy(ComplaintStatistics::getEnterpriseNumber,Collectors.counting())); StatisticsIndicatorPart p3=new StatisticsIndicatorPart(); - p3.setName("被投诉部门"); - p3.setTotal(btsbmNow.size()); - p3.setHuan(btsbmNow.size()-btsbmLast.size()); + p3.setName("投诉企业数量"); + p3.setTotal(tsqyNowList.size()); + p3.setHuan(tsqyNowList.size()-tsqyLastList.size()); StatisticsIndicatorPart p=new StatisticsIndicatorPart(); List statisticsIndicatorPartList=new ArrayList<>(); p.setName("执法投诉"); statisticsIndicatorPartList.add(p1); statisticsIndicatorPartList.add(p2); - statisticsIndicatorPartList.add(p2); + statisticsIndicatorPartList.add(p3); p.setStatisticsIndicatorPartList(statisticsIndicatorPartList); return p; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml index 01fa3c77..4821b9a1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml @@ -101,7 +101,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY warning_level ASC,create_time DESC LIMIT 1000000000 - ) t GROUP BY t.enterprise_number order by t.create_time desc + ) t GROUP BY t.enterprise_number,t.enforcement_department_id,DATE_FORMAT(t.create_time,'%Y-%m') order by t.create_time desc + +