From a5ee416d0f03eb723cd54abe5c6856d1f1d5f829 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Thu, 28 Nov 2024 18:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pEnforcementCheckStatisticsController.java | 86 +++++++++++- .../dept/controller/DeptController.java | 2 +- .../RegistrationComplaintInformation.java | 5 +- .../java/com/zdxt/code/domain/SearchType.java | 14 +- .../code/domain/StatisticsIndicatorPart.java | 113 +++++++++++++++- .../mapper/ComplaintStatisticsMapper.java | 3 + .../mapper/EnforcementRegistrationMapper.java | 28 ++++ .../com/zdxt/code/service/AnalyseService.java | 15 +++ .../code/service/impl/AnalyseServiceImpl.java | 124 ++++++++++++++++++ .../impl/EnforcementCheckStatisticsImpl.java | 9 +- .../mapper/ComplaintStatisticsMapper.xml | 21 +++ .../mapper/EnforcementRegistrationMapper.xml | 106 +++++++++++++++ ...RegistrationComplaintInformationMapper.xml | 12 +- 13 files changed, 523 insertions(+), 15 deletions(-) create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/AnalyseService.java create mode 100644 lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/AnalyseServiceImpl.java diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java index 55aba1d1..39be773f 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementCheckStatisticsController.java @@ -6,11 +6,14 @@ import com.google.common.collect.Lists; import com.zdxt.auth.project.system.dept.mapper.DeptMapper; import com.zdxt.auth.project.system.user.mapper.UserMapper; import com.zdxt.code.domain.*; +import com.zdxt.code.mapper.EnforcementRegistrationMapper; import com.zdxt.code.mapper.Zfryjdm2405301Mapper; +import com.zdxt.code.service.AnalyseService; import com.zdxt.code.service.EnforcementCheckStatisticsService; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.StringUtils; +import com.zdxt.domain.auth.DictData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -41,6 +44,10 @@ public class AppEnforcementCheckStatisticsController extends BaseController { private Zfryjdm2405301Mapper zfryjdm2405301Mapper; @Autowired private DeptMapper deptMapper; + @Autowired + private AnalyseService analyseService; + @Autowired + private EnforcementRegistrationMapper enforcementRegistrationMapper; @GetMapping ("/queryList/{year}/{month}") @ResponseBody @@ -180,7 +187,7 @@ public class AppEnforcementCheckStatisticsController extends BaseController { return ZDResponse.success("成功",enforcementRegistration); } - @GetMapping("/statisticsIndicatorPart1") + /* @GetMapping("/statisticsIndicatorPart1") @ResponseBody public ZDResponse statisticsIndicatorPart1(EnforcementRegistration enforcementRegistration){ if(enforcementRegistration.getBeginTime()==null||"".equals(enforcementRegistration.getBeginTime())){ @@ -192,7 +199,7 @@ public class AppEnforcementCheckStatisticsController extends BaseController { //当不需要时间筛选时startTime=0，endTime=0，dateType=0 月度 dateType=6，年度 dateType=5，季度 dateType=1 自定义时，startTime，endTime；dateType=0 List statisticsIndicatorPartList =enforcementCheckStatisticsService.statisticsIndicatorPart1(enforcementRegistration); return ZDResponse.success("成功", statisticsIndicatorPartList); - } + }*/ @GetMapping("/statisticsIndicatorPart2") @ResponseBody public ZDResponse statisticsIndicatorPart2(SearchType searchType) throws ParseException { @@ -278,4 +285,79 @@ public class AppEnforcementCheckStatisticsController extends BaseController { } return ZDResponse.success("该执法人员执法部门为空"); } + @GetMapping("/statisticsIndicatorPart1") + @ResponseBody + public ZDResponse totalPart(EnforcementRegistration enforcementRegistration) throws CloneNotSupportedException {//需传入--userId&&(dateType||(beginTime&&endTime)) + SearchType searchType=new SearchType(); + if(enforcementRegistration.getUserId() != null){ + searchType.setUserId(enforcementRegistration.getUserId()); + Long userId = searchType.getUserId(); + String lawCertificateNum = userMapper.selectUserById(userId).getLawCertificateNum(); + String zzjgdm = zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm(); + String deptId = deptMapper.selectDeptByCreditcode(zzjgdm).getDeptId(); + if (!deptId.isEmpty()) { + searchType.setBureauDeptId(deptId); + } + } + if(enforcementRegistration.getDateType()!=null){ + searchType.setDateType(enforcementRegistration.getDateType()); + } + /*if(enforcementRegistration.getBeginTime()!=null&&!"".equals(enforcementRegistration.getBeginTime())){ + searchType.setBeginTime(enforcementRegistration.getBeginTime()); + } + if(enforcementRegistration.getEndTime()!=null&&!"".equals(enforcementRegistration.getEndTime())){ + searchType.setBeginTime(enforcementRegistration.getEndTime()); + }*/ + return ZDResponse.success("成功",analyseService.totalPart(searchType)); + } +/* @GetMapping("/partPerson") + @ResponseBody + public ZDResponse partPerson(SearchType searchType){ + + }*/ + + @GetMapping("/getDeptListToPerson") + @ResponseBody + public ZDResponse getDeptListToPerson(EnforcementRegistration enforcementRegistration){ + SearchType searchType=new SearchType(); + if(enforcementRegistration.getUserId() != null){ + searchType.setUserId(enforcementRegistration.getUserId()); + } + if(enforcementRegistration.getDateType()!=null){ + searchType.setDateType(enforcementRegistration.getDateType()); + } + /*if(enforcementRegistration.getBeginTime()!=null&&!"".equals(enforcementRegistration.getBeginTime())){ + searchType.setBeginTime(enforcementRegistration.getBeginTime()); + } + if(enforcementRegistration.getEndTime()!=null&&!"".equals(enforcementRegistration.getEndTime())){ + searchType.setBeginTime(enforcementRegistration.getEndTime()); + }*/ + List enforcementRegistrationList=enforcementRegistrationMapper.selectGroupByDeptList(searchType); + return ZDResponse.success("个人部门筛选条件",analyseService.deptList(enforcementRegistrationList)); + } + @GetMapping("/getDeptListToDept") + @ResponseBody + public ZDResponse getDeptListToDept(EnforcementRegistration enforcementRegistration){ + SearchType searchType=new SearchType(); + if(enforcementRegistration.getUserId() != null){ + Long userId = enforcementRegistration.getUserId(); + String lawCertificateNum = userMapper.selectUserById(userId).getLawCertificateNum(); + String zzjgdm = zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm(); + String deptId = deptMapper.selectDeptByCreditcode(zzjgdm).getDeptId(); + if (!deptId.isEmpty()) { + searchType.setBureauDeptId(deptId); + } + } + if(enforcementRegistration.getDateType()!=null){ + searchType.setDateType(enforcementRegistration.getDateType()); + } + /*if(enforcementRegistration.getBeginTime()!=null&&!"".equals(enforcementRegistration.getBeginTime())){ + searchType.setBeginTime(enforcementRegistration.getBeginTime()); + } + if(enforcementRegistration.getEndTime()!=null&&!"".equals(enforcementRegistration.getEndTime())){ + searchType.setBeginTime(enforcementRegistration.getEndTime()); + }*/ + List enforcementRegistrationList=enforcementRegistrationMapper.selectGroupByDeptList(searchType); + return ZDResponse.success("部门的部门筛选条件",analyseService.deptList(enforcementRegistrationList)); + } } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/controller/DeptController.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/controller/DeptController.java index 598b69d4..fc15c7e2 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/controller/DeptController.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/controller/DeptController.java @@ -77,7 +77,7 @@ public class DeptController extends BaseController { /** * 新增部门 */ -// @GetMapping("/add/{parentId}") + @GetMapping("/add/{parentId}") public String add(@PathVariable("parentId") String parentId, ModelMap mmap) { mmap.put("dept", deptService.selectDeptById(parentId)); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/RegistrationComplaintInformation.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/RegistrationComplaintInformation.java index 57bf9859..ab47a4af 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/RegistrationComplaintInformation.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/RegistrationComplaintInformation.java @@ -15,7 +15,7 @@ public class RegistrationComplaintInformation { private String enterpriseName; private String enterpriseAddress; /** - * 投诉类型 + * 企业类型 */ private String companyOrgType; private Date rCreateTime; @@ -43,8 +43,11 @@ public class RegistrationComplaintInformation { * 投诉部门 */ private String complaintDepartmentIds; + private String complaintItemCodes; /** * 投诉类型 */ private Integer complaintType; + private Integer enforceType; + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java index 5f321c02..a15c5168 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/SearchType.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.List; -public class SearchType { +public class SearchType implements Cloneable{ private List areaStreet; private List deptId; private List enterpriseType; @@ -18,6 +18,7 @@ public class SearchType { private String beginTime; private String endTime; private Integer dateType; + private String timeType; private String name; private Integer nameId; private String year; @@ -198,6 +199,14 @@ public class SearchType { this.complaintTypeStr = complaintTypeStr; } + public String getTimeType() { + return timeType; + } + + public void setTimeType(String timeType) { + this.timeType = timeType; + } + public SearchType(){} public SearchType(SearchType searchType){ this.areaStreet=searchType.getAreaStreet(); @@ -212,5 +221,8 @@ public class SearchType { this.dateType=searchType.getDateType(); } + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } } \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java index 2d54bf33..623276ab 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/StatisticsIndicatorPart.java @@ -5,7 +5,6 @@ import lombok.Data; import java.util.List; -@Data public class StatisticsIndicatorPart extends BaseDomain { private String name; private Integer number; @@ -46,4 +45,116 @@ public class StatisticsIndicatorPart extends BaseDomain { private String beginTime; private String endTime; + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + this.number = number; + } + + public Integer getHuan() { + return huan; + } + + public void setHuan(Integer huan) { + this.huan = huan; + } + + public Integer getTong() { + return tong; + } + + public void setTong(Integer tong) { + this.tong = tong; + } + + public Integer getComplaint() { + return complaint; + } + + public void setComplaint(Integer complaint) { + this.complaint = complaint; + } + + public List getStatisticsIndicatorPartList() { + return statisticsIndicatorPartList; + } + + public void setStatisticsIndicatorPartList(List statisticsIndicatorPartList) { + this.statisticsIndicatorPartList = statisticsIndicatorPartList; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Integer getTotal() { + return total; + } + + public void setTotal(Integer total) { + this.total = total; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + + public Integer getQuarter() { + return quarter; + } + + public void setQuarter(Integer quarter) { + this.quarter = quarter; + } + + public String getMonth() { + return month; + } + + public void setMonth(String month) { + this.month = month; + } + + public String getCreditCode() { + return creditCode; + } + + public void setCreditCode(String creditCode) { + this.creditCode = creditCode; + } + + public String getBeginTime() { + return beginTime; + } + + public void setBeginTime(String beginTime) { + this.beginTime = beginTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java index 8c49d353..06b9c3a1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java @@ -1,6 +1,7 @@ package com.zdxt.code.mapper; import com.zdxt.code.domain.ComplaintStatistics; +import com.zdxt.code.domain.SearchType; import java.util.List; @@ -19,4 +20,6 @@ public interface ComplaintStatisticsMapper { List selectComplaintStatisticsGroup(ComplaintStatistics complaintStatistics); List selectComplaintStatisticsGroupByType(ComplaintStatistics complaintStatistics); Integer insertComplaintStatistics(ComplaintStatistics complaintStatistics); + + List selectAppComplaintStatisticsP1(SearchType searchType); } 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 aa9e69f6..00a8b365 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 @@ -2,6 +2,7 @@ package com.zdxt.code.mapper; import com.zdxt.code.domain.EnforceRegCount; import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.SearchType; import com.zdxt.code.domain.dto.EnforcementRegistrationDto; import org.apache.ibatis.annotations.Param; @@ -110,4 +111,31 @@ public interface EnforcementRegistrationMapper * @return */ List staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto); + + /** + * 用于移动端统计第一部分 + * @param searchType + * @return + */ + List selectAppStatisticsPart1(SearchType searchType); + + /** + * 传入userId或bureauDeptId得符合记录的部门 + * @param searchType + * @return + */ + ListselectGroupByDeptList(SearchType searchType); + /** + * 传入联合执法批次id和本次执法id--得此次联合执法除本身外的部门 + * @param enforcementRegistration + * @return + */ + ListselectUniteGroupByDeptList(EnforcementRegistration enforcementRegistration); + /** + * 传入联合执法批次id和本次执法id--得此次联合执法除本身外的记录 + * @param enforcementRegistration + * @return + */ + ListselectUniteNotItself(EnforcementRegistration enforcementRegistration); + } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/AnalyseService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/AnalyseService.java new file mode 100644 index 00000000..50de70d4 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/AnalyseService.java @@ -0,0 +1,15 @@ +package com.zdxt.code.service; + + +import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.SearchType; +import com.zdxt.code.domain.StatisticsIndicatorPart; +import com.zdxt.domain.auth.DictData; + +import java.util.List; + +public interface AnalyseService { + List totalPart(SearchType searchType) throws CloneNotSupportedException; + + List deptList(List enforcementRegistrationList1); +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/AnalyseServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/AnalyseServiceImpl.java new file mode 100644 index 00000000..b41aed05 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/AnalyseServiceImpl.java @@ -0,0 +1,124 @@ +package com.zdxt.code.service.impl; + +import com.zdxt.auth.project.system.dept.mapper.DeptMapper; +import com.zdxt.auth.project.system.user.mapper.UserMapper; +import com.zdxt.code.domain.ComplaintStatistics; +import com.zdxt.code.domain.EnforcementRegistration; +import com.zdxt.code.domain.SearchType; +import com.zdxt.code.domain.StatisticsIndicatorPart; +import com.zdxt.code.mapper.ComplaintStatisticsMapper; +import com.zdxt.code.mapper.EnforcementRegistrationMapper; +import com.zdxt.code.mapper.Zfryjdm2405301Mapper; +import com.zdxt.code.service.AnalyseService; +import com.zdxt.domain.auth.DictData; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class AnalyseServiceImpl implements AnalyseService { + + @Autowired + private UserMapper userMapper; + @Autowired + private Zfryjdm2405301Mapper zfryjdm2405301Mapper; + @Autowired + private DeptMapper deptMapper; + @Autowired + private EnforcementRegistrationMapper enforcementRegistrationMapper; + @Autowired + private ComplaintStatisticsMapper complaintStatisticsMapper; + + /** + * 移动端统计--第一部分 + * @param searchType + * @return + * 时间筛选 如本年则dateType=6，本年dateType=5，本季dateType=1，自定义beginTime，endTime + * 在controller传值时第一部分，user_id!=null,dept_id==null + * 无其他类型筛选 + * 返回为指标名称：name，总数：Number，环比：huan，同比：tong，投诉数量：complaint + */ + @Override + public List totalPart(SearchType searchType) throws CloneNotSupportedException { + //筛选对象 + // searchType个人 searchTypeH个人环比 searchTypeT个人同比 + SearchType searchTypeH=(SearchType) searchType.clone(); + SearchType searchTypeT=(SearchType) searchType.clone(); + searchType.setTimeType("new"); + searchTypeH.setTimeType("lastH"); + searchTypeT.setTimeType("lastT"); + // searchTypeDept 部门 searchTypeDeptH 部门环比 searchTypeT个人同比 + SearchType searchTypeDept=(SearchType) searchType.clone(); + SearchType searchTypeDeptH=(SearchType) searchTypeH.clone(); + SearchType searchTypeDeptT=(SearchType) searchTypeT.clone(); + searchType.setBureauDeptId(null); + searchTypeH.setBureauDeptId(null); + searchTypeT.setBureauDeptId(null); + searchTypeDept.setUserId(null); + searchTypeDeptH.setUserId(null); + searchTypeDeptT.setUserId(null); + List personList=enforcementRegistrationMapper.selectAppStatisticsPart1(searchType); + List personListH=enforcementRegistrationMapper.selectAppStatisticsPart1(searchTypeH); + List personListT=enforcementRegistrationMapper.selectAppStatisticsPart1(searchTypeT); + List deptList=enforcementRegistrationMapper.selectAppStatisticsPart1(searchTypeDept); + List deptListH=enforcementRegistrationMapper.selectAppStatisticsPart1(searchTypeDeptH); + List deptListT=enforcementRegistrationMapper.selectAppStatisticsPart1(searchTypeDeptT); + List personComplaintList=personList.stream().filter(item->item.getIsComplaint()==1).collect(Collectors.toList()); + /*List deptComplaintList=deptList.stream().filter(item->item.getIsComplaint()==1).collect(Collectors.toList());*/ + List deptComplaintList=complaintStatisticsMapper.selectAppComplaintStatisticsP1(searchTypeDept); + List statisticsIndicatorPartList=new ArrayList<>(); + StatisticsIndicatorPart personSIP=new StatisticsIndicatorPart(); + personSIP.setNumber(personList.size()); + personSIP.setHuan(personList.size()-personListH.size()); + personSIP.setTong(personList.size()-personListT.size()); + personSIP.setComplaint(personComplaintList.size()); + StatisticsIndicatorPart deptSIP=new StatisticsIndicatorPart(); + deptSIP.setNumber(deptList.size()); + deptSIP.setHuan(deptList.size()-deptListH.size()); + deptSIP.setTong(deptList.size()-deptListT.size()); + deptSIP.setComplaint(deptComplaintList.size()); + statisticsIndicatorPartList.add(personSIP); + statisticsIndicatorPartList.add(deptSIP); + return statisticsIndicatorPartList; + } + + /** + * 移动端统计第二部分，个人 + * @param searchType + * @return + * 前置处理--区域为文字且已拼接为xx区xx街道，部门为部门id，企业为企业类型（特殊处理），检查类型为value值，投诉类型为value值 + */ + public List partPerson(SearchType searchType){ + + List statisticsIndicatorPartList=new ArrayList<>(); + return statisticsIndicatorPartList; + } + + @Override + public List deptList(List enforcementRegistrationList1){ + List enforcementRegistrationList=new ArrayList<>(); + enforcementRegistrationList.addAll(enforcementRegistrationList1); + for(EnforcementRegistration e:enforcementRegistrationList1){ + if(e.getUniteCheck()!=null&&!"".equals(e.getUniteCheck())){ + List uniteList=enforcementRegistrationMapper.selectUniteGroupByDeptList(e); + if(uniteList.size()>0){ + enforcementRegistrationList.addAll(uniteList); + } + } + } + Map> map=enforcementRegistrationList.stream().filter(item->item.getBureauDeptId()!=null&&!"".equals(item.getBureauDeptId())).collect(Collectors.groupingBy(EnforcementRegistration::getBureauDeptId)); + List dictDataList=new ArrayList<>(); + for(String s: map.keySet()){ + DictData dictData=new DictData(); + dictData.setDictLabel(map.get(s).get(0).getBureauDeptName()); + dictData.setDictValue(s); + dictDataList.add(dictData); + } + return dictDataList; + } + +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java index 6c95ea35..f2e6fc6b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java @@ -1844,7 +1844,8 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic s2.setName("部门检查数量"); Long userId=enforcementRegistration.getUserId(); String lawCertificateNum=userMapper.selectUserById(userId).getLawCertificateNum(); - String deptId=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm(); + String zzjgdm=zfryjdm2405301Mapper.selectZfryByZfCode(lawCertificateNum).getZzjgdm(); + String deptId=deptMapper.selectDeptByCreditcode(zzjgdm).getDeptId(); //按时间筛选，月季年或自定义 List erTime=TimeFiltering1(enforcementRegistration.getBeginTime(),enforcementRegistration.getEndTime(),enforcementRegistration.getDateType()); //条件：用户id，时间 @@ -2019,7 +2020,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic } } //进行企业地区筛选 - if(searchType.getAreaStreet()!=null){ + if(searchType.getAreaStreet()!=null&&searchType.getAreaStreet().size()>0){ List addressList=searchType.getAreaStreet(); rNowList = rNowList.stream().filter(item -> item.getEnterpriseAddress() != null && !"".equals(item.getEnterpriseAddress()) && AddressStreetFiltering(item.getEnterpriseAddress(),addressList)).collect(Collectors.toList()); rLastList = rLastList.stream().filter(item -> item.getEnterpriseAddress() != null && !"".equals(item.getEnterpriseAddress()) && AddressStreetFiltering(item.getEnterpriseAddress(),addressList)).collect(Collectors.toList()); @@ -2027,7 +2028,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic cLastList = cLastList.stream().filter(item -> item.getEnterpriseAddress() != null && !"".equals(item.getEnterpriseAddress()) && AddressStreetFiltering(item.getEnterpriseAddress(),addressList)).collect(Collectors.toList()); } //进行企业类型筛选 - if(searchType.getEnterpriseType()!=null){ + if(searchType.getEnterpriseType()!=null&&searchType.getEnterpriseType().size()>0){ List enterpriseTypeList=searchType.getEnterpriseType(); rNowList = rNowList.stream().filter(item->item.getCompanyOrgType()!=null&&!"".equals(item.getCompanyOrgType())&&enterpriseTypeFiltering(item.getCompanyOrgType(),enterpriseTypeList,dictDataMap.keySet())).collect(Collectors.toList()); rLastList = rLastList.stream().filter(item->item.getCompanyOrgType()!=null&&!"".equals(item.getCompanyOrgType())&&enterpriseTypeFiltering(item.getCompanyOrgType(),enterpriseTypeList,dictDataMap.keySet())).collect(Collectors.toList()); @@ -2057,7 +2058,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic } private Boolean AddressStreetFiltering(String s,List strings){ for(String i:strings){ - if(s.startsWith("深圳市"+i)){ + if(s.startsWith("深圳市" + i.substring(0, i.indexOf("区"))+i.substring(i.indexOf("区")))||s.startsWith("深圳市" + i.substring(0, i.indexOf("区"))+"新"+i.substring(i.indexOf("区")))){ return true; } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml index a2e0c4d0..d539bb8f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml @@ -123,4 +123,25 @@ #{enterpriseAddress}, + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 849acbab..a00dfbbf 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -770,4 +770,110 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by i.enterprise_address + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml index c79abee9..9efed54e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/RegistrationComplaintInformationMapper.xml @@ -20,9 +20,11 @@ + +