From b98303d87944b3d6ebadf6b289680a4e92ff12b2 Mon Sep 17 00:00:00 2001 From: yanyan Date: Wed, 25 Jun 2025 19:14:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E7=89=88=E5=8F=8A?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EnforcementCheckStatisticsImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 1db4448f..55f3336e 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 @@ -2373,15 +2373,15 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic qyGroup2.get(k).get(0).getRemark(),row,styleRow3); }else { sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),2,2));//合并企业 - sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),7,7)); sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),8,8)); sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),9,9)); sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),10,10)); + sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),11,11)); hbStyle(rowNum+1, (int) (rowNum+qyGroup1.get(k)),2,2,sheet); - hbStyle(rowNum+1, (int) (rowNum+qyGroup1.get(k)),7,7,sheet); hbStyle(rowNum+1, (int) (rowNum+qyGroup1.get(k)),8,8,sheet); hbStyle(rowNum+1, (int) (rowNum+qyGroup1.get(k)),9,9,sheet); hbStyle(rowNum+1, (int) (rowNum+qyGroup1.get(k)),10,10,sheet); + hbStyle(rowNum+1, (int) (rowNum+qyGroup1.get(k)),11,11,sheet); //以同企业内，以执法分组 Map zfGroup1 = qyGroup2.get(k).stream().collect(Collectors.groupingBy((m -> m.getBureauDeptId()== null ? "" : m.getBureauDeptId()), Collectors.counting())); @@ -2507,10 +2507,10 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic //setStyle(cellList,row,styleRow3); if (sxGroup1.get(sx) >= 2) { sheet.addMergedRegion(new CellRangeAddress(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 5, 5));//合并事项 - sheet.addMergedRegion(new CellRangeAddress(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 6, 6)); +// sheet.addMergedRegion(new CellRangeAddress(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 7, 7)); hbStyle(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 5, 5,sheet); - hbStyle(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 6, 6,sheet); - hbStyle(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 11, 11,sheet); +// hbStyle(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 7, 7,sheet); + hbStyle(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 12, 12,sheet); rowNum = (int) (rowNum - 1 + sxGroup1.get(sx)); } }