From 0874344f4a3783bf98fbf78c119c32526086caa6 Mon Sep 17 00:00:00 2001 From: zouyx <1798599149@qq.com> Date: Sat, 26 Apr 2025 20:38:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E7=AB=AF-=E6=89=A7=E6=B3=95?= =?UTF-8?q?=E6=8A=95=E8=AF=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ComplaintStaticController.java | 16 ++++++++++++++-- .../service/impl/ComplaintStatisticsImpl.java | 13 ++++++++++--- .../impl/ComplaintsReportServiceImpl.java | 15 ++++++++++----- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java index 864ce609..9b98fc89 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/ComplaintStaticController.java @@ -64,7 +64,7 @@ public class ComplaintStaticController extends BaseController { complaintStatistics.setBeginTime(str.format(beginTime)); complaintStatistics.setEndTime(str.format(endTime)); model.addAttribute("yearList",yearMake()); -// model.addAttribute("year",localDate.getYear()); + model.addAttribute("year",localDate.getYear()); model.addAttribute("selectTime",localDate.getYear()+"年"); model.addAttribute("Number1",complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics).size()); model.addAttribute("Number2",complaintStatisticsService.selectComplaintStatisticsGroup(complaintStatistics).size()); @@ -114,10 +114,22 @@ public class ComplaintStaticController extends BaseController { } } Map deptMap=new HashMap<>(); - if(complaintStatistics.getComplaintDepartment()!=null&&!"".equals(complaintStatistics.getComplaintDepartment())){//搜索条件内有投诉对象时 +/* if(complaintStatistics.getComplaintDepartment()!=null&&!"".equals(complaintStatistics.getComplaintDepartment())){//搜索条件内有投诉对象时 List deptList=iDeptService.selectDeptByDeptName(complaintStatistics.getComplaintDepartment()); deptMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId, Function.identity())); complaintStatistics.setComplaintDepartmentIdList(new ArrayList<>(deptMap.keySet())); + }*/ + if(complaintStatistics.getComplaintDepartment()!=null&&!"".equals(complaintStatistics.getComplaintDepartment())) {//搜索条件内有投诉对象时 + List deptList = new ArrayList<>(); + deptList = iDeptService.selectDeptByDeptName(complaintStatistics.getComplaintDepartment()); + if (!deptList.isEmpty()) { + deptMap = deptList.stream().collect(Collectors.toMap(Dept::getDeptId, Function.identity())); + complaintStatistics.setComplaintDepartmentIdList(new ArrayList<>(deptMap.keySet())); + } else { + List strings = new ArrayList<>(); + strings.add("无此部门"); + complaintStatistics.setComplaintDepartmentIdList(strings); + } } model.addAttribute("Number1",complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics).size()); model.addAttribute("Number2",complaintStatisticsService.selectComplaintStatisticsGroup(complaintStatistics).size()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java index 3cb94089..e656a32a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java @@ -243,9 +243,16 @@ public class ComplaintStatisticsImpl implements ComplaintStatisticsService { public List selectComplaintStatisticsListGroupDeptList(ComplaintStatistics complaintStatistics) { Map deptMap=new HashMap<>(); if(complaintStatistics.getComplaintDepartment()!=null&&!"".equals(complaintStatistics.getComplaintDepartment())){//搜索条件内有投诉对象时 - List deptList=iDeptService.selectDeptByDeptName(complaintStatistics.getComplaintDepartment()); - deptMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId, Function.identity())); - complaintStatistics.setComplaintDepartmentIdList(new ArrayList<>(deptMap.keySet())); + List deptList=new ArrayList<>(); + deptList=iDeptService.selectDeptByDeptName(complaintStatistics.getComplaintDepartment()); + if(!deptList.isEmpty()) { + deptMap = deptList.stream().collect(Collectors.toMap(Dept::getDeptId, Function.identity())); + complaintStatistics.setComplaintDepartmentIdList(new ArrayList<>(deptMap.keySet())); + }else{ + List strings=new ArrayList<>(); + strings.add("无此部门"); + complaintStatistics.setComplaintDepartmentIdList(strings); + } }else { deptMap=iDeptService.selectDeptAll().stream().collect(Collectors.toMap(Dept::getDeptId, Function.identity())); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintsReportServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintsReportServiceImpl.java index 32c6da3b..589b0974 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintsReportServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintsReportServiceImpl.java @@ -71,11 +71,16 @@ public class ComplaintsReportServiceImpl implements ComplaintsReportService { if (zdxtFileCommonList.size() > 0) { complaintStatistics.setFileList(zdxtFileCommonList.stream().map(ZdxtFileCommon::getUploadPath).collect(Collectors.toList())); } - String enforceTypeText = dictDataMapper.selectDictLabel("caseType", enterpriseComplaint.getEnforceType() + ""); - if (enforceTypeText == null || enforceTypeText.isEmpty()) { - enterpriseComplaint.setEnforceTypeStr(enterpriseComplaint.getEnforceType() + ""); - } else { - enterpriseComplaint.setEnforceTypeStr(enforceTypeText); + if(enterpriseComplaint.getEnforceType()!=null) { + String enforceTypeText = dictDataMapper.selectDictLabel("caseType", enterpriseComplaint.getEnforceType() + ""); + if (enforceTypeText == null || enforceTypeText.isEmpty()) { + + enterpriseComplaint.setEnforceTypeStr(enterpriseComplaint.getEnforceType() + ""); + } else { + enterpriseComplaint.setEnforceTypeStr(enforceTypeText); + } + }else{ + enterpriseComplaint.setEnforceTypeStr(" "); } enterpriseComplaint.setCreateTimeStr(simpleDateFormat.format(enterpriseComplaint.getCreateTime())); complaintStatistics.setEnterpriseComplaint(enterpriseComplaint);