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)); }