导出模版及文字更改

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<String, Long> 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));
                                             }
                                         }