From 723a7e7ed682c839004c0b8f3ee12c32cdd78b43 Mon Sep 17 00:00:00 2001 From: yanyan Date: Wed, 25 Jun 2025 19:53:05 +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 --- .../code/service/impl/EnforcementCheckStatisticsImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 55f3336e..f34e1326 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 @@ -2507,9 +2507,9 @@ 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)), 7, 7)); + 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)), 7, 7,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)); }