From 56534a8955c204cd5ac6773edd2ba9b8af9d2cd8 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Thu, 14 Nov 2024 11:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E5=88=86=E6=9E=90=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/complaintStatic/complaintStatic.html | 3 +- .../code/registration/registration.html | 1 - .../code/registration/staticRegistration.html | 43 ++++- .../EnforcementRegistrationController.java | 6 +- .../dto/EnforcementRegistrationDto.java | 27 +++ .../mapper/EnforcementRegistrationMapper.java | 1 + .../IEnforcementRegistrationService.java | 2 + .../EnforcementRegistrationServiceImpl.java | 155 +++++++++++++++++- .../EnforcementCheckStatisticsMapper.xml | 2 +- .../mapper/EnforcementRegistrationMapper.xml | 61 ++++++- 10 files changed, 285 insertions(+), 16 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html index 97a878fd..7f0d7c65 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html @@ -342,7 +342,7 @@ let string=''; if (value.length > 0) { for (let i = 0; i < value.length; i++) { - string = string + ''; + string = string + ''; } } return string; @@ -594,6 +594,7 @@ }) } function openPicture(url){ + debugger if(url!=null&&url!=''){ this.$message.warning('图片不存在'); }else{ diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html index 4fc3d66c..274224ee 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html @@ -254,7 +254,6 @@ var caseType=[]; var prefix = ctx + "code/registration"; var prefixC= ctx+"code/complaintStatic"; - var prefixDict=ctx+'system/dict/data'; var quarterBoolean=/*[[${quarterBoolean}]]*/{}; var monthBoolean=/*[[${monthBoolean}]]*/{}; var unite=/*[[${unite}]]*/{}; diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html index 4777b2ff..e751b921 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html @@ -29,6 +29,17 @@

检查事项：

+
  • +

    区域：

    + + +

  • 时段：

    @@ -126,6 +137,7 @@ $("#month").hide(); $("#select-time").hide(); $("#showDetail").hide(); + $("#jd").hide(); }; $(function() { var options = { @@ -135,14 +147,24 @@ removeUrl: prefix + "/remove", detailUrl: prefix + "/detail/{id}", exportUrl: prefix + "/export", - height: $(window).height()-$(".search-collapse").height()-$("#toolbar").height()-50, + //height: $(window).height()-$(".search-collapse").height()-$("#toolbar").height()-50, modalName: "执法分析", showHeader: false, showFooter: false, showColumns: false, showRefresh: false, showToggle: false, + pagination: true, + pageSize: 10, columns: [ + { + field : 'qy', + title : '区域' + }, + { + field : 'jd', + title : '街道' + }, { field : 'enterpriseName', title : '企业名称', @@ -479,6 +501,25 @@ $('form').eq(0).trigger("reset"); search1(); timeType(); + addressMake(); + } + function addressMake(){ + var dateSearch = document.getElementById("qy"); + console.log(dateSearch.value) + if(dateSearch.value!=null&&dateSearch.value!=""){ + $("#jd").show(); + $.ajax({ + url:prefix+'/jdList', + type:'GET', + data: {"name":dateSearch.value}, + success: function (response) { + $('#jd').html(response); + } + }) + }else { + $("#jd").hide(); + document.getElementById("jd").value=''; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java index 63a907fc..1995fbe1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java @@ -265,9 +265,11 @@ public class EnforcementRegistrationController extends BaseController @PostMapping("/staticEnforcementRegistration") @ResponseBody public TableDataInfo staticList(EnforcementRegistrationDto enforcementRegistrationDto){ - startPage(); + /*startPage(); + List enforcementRegistrationDtos = enforcementRegistrationService. + staticEnforcementRegistration(enforcementRegistrationDto);*/ List enforcementRegistrationDtos = enforcementRegistrationService. - staticEnforcementRegistration(enforcementRegistrationDto); + staticEnforcementRegistrationLI(enforcementRegistrationDto); return getDataTable(enforcementRegistrationDtos); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java index 4bcea386..a7c33a7a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/dto/EnforcementRegistrationDto.java @@ -62,6 +62,9 @@ public class EnforcementRegistrationDto extends BaseDomain { */ private String endTime; + private String qy; + private String jd; + private String enterpriseAddress; public String getEnterpriseName() { return enterpriseName; @@ -174,4 +177,28 @@ public class EnforcementRegistrationDto extends BaseDomain { public void setEndTime(String endTime) { this.endTime = endTime; } + + public String getQy() { + return qy; + } + + public void setQy(String qy) { + this.qy = qy; + } + + public String getJd() { + return jd; + } + + public void setJd(String jd) { + this.jd = jd; + } + + public String getEnterpriseAddress() { + return enterpriseAddress; + } + + public void setEnterpriseAddress(String enterpriseAddress) { + this.enterpriseAddress = enterpriseAddress; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java index 705a8763..aa9e69f6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java @@ -102,6 +102,7 @@ public interface EnforcementRegistrationMapper * @return */ List staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto); + List staticEnforcementRegistrationLI(EnforcementRegistrationDto enforcementRegistrationDto); /** * 统计分析，统计分类列表 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index d2509d56..e0c9f0de 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -99,6 +99,8 @@ public interface IEnforcementRegistrationService */ List staticEnforcementRegistration(EnforcementRegistrationDto enforcementRegistrationDto); + List staticEnforcementRegistrationLI(EnforcementRegistrationDto enforcementRegistrationDto); + /** * 统计分析列表详细清单 * @param enforcementRegistrationDto diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index edfcd050..6ad581d9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -533,6 +533,123 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat enforcementRegistrationMapper.staticEnforcementRegistration(enforcementRegistrationDto); return enforcementRegistrationDtos; } + @Override + public List staticEnforcementRegistrationLI(EnforcementRegistrationDto enforcementRegistrationDto) { + /*if(enforcementRegistrationDto.getQy()!=null&&!"".equals(enforcementRegistrationDto.getQy())) { + if (enforcementRegistrationDto.getJd() != null && !"".equals(enforcementRegistrationDto.getJd())) { + String qy = iDictDataService.selectDictLabel("address_Type", enforcementRegistrationDto.getQy()); + String jd = iDictDataService.selectDictLabel(enforcementRegistrationDto.getQy(), enforcementRegistrationDto.getJd()); + enforcementRegistrationDto.setJd(jd); + enforcementRegistrationDto.setQy(qy); + *//*List enforcementRegistrationDtos = + enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto);*//* + }else { + String qy = iDictDataService.selectDictLabel("address_Type", enforcementRegistrationDto.getQy()); + enforcementRegistrationDto.setQy(qy); + } + } + List enforcementRegistrationDtos = + enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto); + return enforcementRegistrationDtos;*/ + if(enforcementRegistrationDto.getQy()!=null&&!"".equals(enforcementRegistrationDto.getQy())){ + if(enforcementRegistrationDto.getJd()!=null&&!"".equals(enforcementRegistrationDto.getJd())){ + String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistrationDto.getQy()); + String jd=iDictDataService.selectDictLabel(enforcementRegistrationDto.getQy(),enforcementRegistrationDto.getJd()); + enforcementRegistrationDto.setJd(jd); + enforcementRegistrationDto.setQy(qy); + List enforcementRegistrationDtos = + enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto); + for(int i=0;i enforcementRegistrationDtos =new ArrayList<>(); + String qy=iDictDataService.selectDictLabel("address_Type",enforcementRegistrationDto.getQy()); + List jdList=iDictDataService.selectDictDataByType(enforcementRegistrationDto.getQy()); + enforcementRegistrationDto.setQy(qy); + List enforcementRegistrationDtoList = + enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto); + /*List jdStrings=new ArrayList<>(); + for(DictData dictData:jdList){ + jdStrings.add(dictData.getDictLabel()); + }*/ + for(DictData jd:jdList){ + List jdEList=new ArrayList<>(); + if(qy.equals("光明区")){ + jdEList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区"+jd.getDictLabel())||item.getEnterpriseAddress().startsWith("深圳市"+qy+jd.getDictLabel())).collect(Collectors.toList()); + }else { + jdEList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy+jd.getDictLabel())).collect(Collectors.toList()); + } + if(jdEList.size()>0){ + for(int i=0;iqtjdList=enforcementRegistrationDtoList.stream().filter(item->!jdMake(qy,jdList,item.getEnterpriseAddress())).collect(Collectors.toList()); + if(qtjdList.size()>0){ + for(int i=0;i qyList=iDictDataService.selectDictDataByType("address_Type"); + List qyStrings=new ArrayList<>(); + for(DictData dictData:qyList){ + qyStrings.add(dictData.getDictLabel()); + } + List enforcementRegistrationDtoList = + enforcementRegistrationMapper.staticEnforcementRegistrationLI(enforcementRegistrationDto); + List enforcementRegistrationDtos=new ArrayList<>(); + for(DictData qy:qyList){ + List jdList=iDictDataService.selectDictDataByType(qy.getDictValue()); + /*List jdStrings=new ArrayList<>(); + for(DictData dictData:jdList){ + jdStrings.add(dictData.getDictLabel()); + }*/ + List qyEList=new ArrayList<>(); + if(qy.getDictLabel().equals("光明区")){ + qyEList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区")||item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel())).collect(Collectors.toList()); + }else { + qyEList=enforcementRegistrationDtoList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel())).collect(Collectors.toList()); + } + for(DictData jd:jdList){ + List jdEList=new ArrayList<>(); + if(qy.getDictLabel().equals("光明区")){ + jdEList=qyEList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市光明新区"+jd.getDictLabel())||item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel()+jd.getDictLabel())).collect(Collectors.toList()); + }else { + jdEList=qyEList.stream().filter(item->item.getEnterpriseAddress().startsWith("深圳市"+qy.getDictLabel()+jd.getDictLabel())).collect(Collectors.toList()); + } + if(jdEList.size()>0){ + for(int i=0;iqtjdList=qyEList.stream().filter(item->!jdMake(qy.getDictLabel(),jdList,item.getEnterpriseAddress())).collect(Collectors.toList()); + if(qtjdList.size()>0){ + for(int i=0;iqtqyList=enforcementRegistrationDtoList.stream().filter(item->!qyMake(qyStrings,item.getEnterpriseAddress())).collect(Collectors.toList()); + if(qtqyList.size()>0){ + enforcementRegistrationDtos.addAll(qtqyList); + } + return enforcementRegistrationDtos; + } + } @Override public List staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto) { @@ -557,14 +674,6 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat LocalDate lastDayOfMonth = lastLocalDate.with(TemporalAdjusters.lastDayOfMonth()); return firstDayOfMonth +"," + lastDayOfMonth; } - public Boolean qyMake(List stringList,String s){ - for (String string : stringList) { - if (s.startsWith(string)) { - return true; - } - } - return false; - } /*@Override public void export(HttpServletResponse httpServletResponse,EnforcementRegistration enforcementRegistration,List list){ @@ -584,5 +693,35 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat row.createCell(1).setCellValue(); } }*/ + public Boolean qyMake(List strings,String s){ + for (String string : strings) { + if(string.equals("光明区")){ + if (s.startsWith("深圳市" + string)||s.startsWith("深圳市光明新区")) { + return true; + } + }else { + if (s.startsWith("深圳市" + string)) { + return true; + } + } + } + return false; + } + public Boolean jdMake(String qy, List stringList, String s){ + if(qy.equals("光明区")){ + for(DictData d:stringList){ + if(s.startsWith("深圳市"+qy+d.getDictLabel())||s.startsWith("深圳市光明新区"+d.getDictLabel())){ + return true; + } + } + }else { + for (DictData d : stringList) { + if (s.startsWith("深圳市"+qy+d.getDictLabel())) { + return true; + } + } + } + return false; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml index 712a708c..b777aa74 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml @@ -50,7 +50,7 @@ + +