From 0cfb973d0cadf0e324722c68133757a33604e0cc Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Sun, 3 Nov 2024 17:59:12 +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

---
 .../com/zdxt/code/controller/ComplaintStaticController.java | 2 +-
 .../java/com/zdxt/code/controller/DeptStaticController.java | 6 ++++--
 .../code/service/impl/EnforcementCheckStatisticsImpl.java   | 4 ++--
 3 files changed, 7 insertions(+), 5 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 9b87e3cb..6381780f 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
@@ -66,6 +66,7 @@ public class ComplaintStaticController extends BaseController {
     @GetMapping("/searchType1")
     public String searchType1(SearchType searchType,Model model){
         LocalDate localDate=LocalDate.now();
+        model.addAttribute("year",localDate.getYear());
         ComplaintStatistics complaintStatistics=dateMake(searchType);
         if(searchType.getCType()!=null&&!"".equals(searchType.getCType())) {
             complaintStatistics.setComplaintType(Integer.parseInt(searchType.getCType()));
@@ -76,7 +77,6 @@ public class ComplaintStaticController extends BaseController {
             deptMap=deptList.stream().collect(Collectors.toMap(Dept::getDeptId, Function.identity()));
             complaintStatistics.setComplaintDepartmentIdList(new ArrayList<>(deptMap.keySet()));
         }
-        model.addAttribute("year",localDate.getYear());
         model.addAttribute("Number1",complaintStatisticsService.selectComplaintStatisticsList(complaintStatistics).size());
         model.addAttribute("Number2",complaintStatisticsService.selectComplaintStatisticsGroup(complaintStatistics).size());
         return prefix+"/complaintA";
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
index c157d116..d11b48c4 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
@@ -11,6 +11,7 @@ import com.zdxt.code.mapper.Zfztjdm111915Mapper;
 import com.zdxt.code.service.IZfryjdm2405301Service;
 import com.zdxt.code.service.IZfztjdm111915Service;
 import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.IdCardCryptoUtil;
 import com.zdxt.common.util.TableDataInfo;
 import com.zdxt.domain.auth.Dept;
 import com.zdxt.domain.auth.User;
@@ -93,8 +94,9 @@ public class DeptStaticController extends BaseController {
         }*/
         startPage();
         List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);
-
-
+        for(int i=0;i<zfryjdm2405301List.size();i++){
+            zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0",zfryjdm2405301List.get(i).getPhoneNumber()));
+        }
         /*List<User> users=new ArrayList<>();
         for(User u:list){
             if(u.getDeptId()!=null&&!"".equals(u.getDeptId())){
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 8077947b..5866e6a7 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
@@ -658,8 +658,8 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                 }*/
                     if (jdList.size() > 1) {
                         /*System.out.println("第351行："+rowNum2);*/
-                        sheet2.addMergedRegion(new CellRangeAddress(rowNum2 - jdList.size() , rowNum2, 0, 0));
-                        hbStyle(rowNum2 - jdList.size() , rowNum2, 0, 0, sheet2);
+                        sheet2.addMergedRegion(new CellRangeAddress(rowNum2 - jdList.size() + 1, rowNum2, 0, 0));
+                        hbStyle(rowNum2 - jdList.size() + 1, rowNum2, 0, 0, sheet2);
                     }
                 }
             }else{