From 6ff1b8c803dd58cb31439fc0af91e613beb0f58d Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Thu, 26 Jun 2025 10:11:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EnforcementCheckStatisticsImpl.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

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 f34e1326..57755075 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
@@ -2506,10 +2506,19 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                                             }
                                             //setStyle(cellList,row,styleRow3);
                                             if (sxGroup1.get(sx) >= 2) {
+                                                //添加执法时间
+                                                for(int s=0; s<sxGroup1.get(sx); s++){
+                                                    HSSFRow timrow = sheet.createRow(rowNum+s);
+                                                    setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
+                                                            sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(s).getEnforcementTime(),sxGroup1.get(sx),
+                                                            qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0).getRemark(),timrow,styleRow3);
+                                                }
                                                 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)), 6, 6));
                                                 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)), 6, 6,sheet);
                                                 hbStyle(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 12, 12,sheet);
                                                 rowNum = (int) (rowNum - 1 + sxGroup1.get(sx));
                                             }