From 8e0e5f74e91514e267eda4cc6138419fe0553819 Mon Sep 17 00:00:00 2001
From: zouyx <1798599149@qq.com>
Date: Fri, 27 Jun 2025 18:59:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=BB=9F=E8=AE=A1=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EnforcementCheckStatisticsImpl.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 57755075..0829f87b 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
@@ -2509,9 +2509,15 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
                                                 //添加执法时间
                                                 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);
+                                                    if(s<1){
+                                                        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);
+                                                    }else {
+                                                        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(), 0,
+                                                                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));