From 7d826d3b26365e43ae7a2d523565fbab8ad5466a Mon Sep 17 00:00:00 2001 From: zhangchaoyang02 Date: Fri, 17 Oct 2025 17:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E3=80=81?= =?UTF-8?q?=E6=89=A7=E6=B3=95=E4=BF=A1=E6=81=AF=E3=80=81=E6=89=A7=E6=B3=95?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E8=A7=A3=E5=AF=86=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/EnforcementInfoService.java | 6 ++++++ .../lawenforcement/service/EnterpriseService.java | 1 - .../iles/lawenforcement/service/OfficerService.java | 11 +++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnforcementInfoService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnforcementInfoService.java index 03b3ff7..0c2d431 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnforcementInfoService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnforcementInfoService.java @@ -370,6 +370,12 @@ public class EnforcementInfoService { if (enforcementTime == null || enforcementTime.length < 2) { throw new BusinessError("执法时间不能为空！"); } + enforcementInfo.setEnforcementStartTime(enforcementTime[0]); + enforcementInfo.setEnforcementEndTime(enforcementTime[1]); + enforcementInfo.setAgencyId(enforcementInfoDto.getAgencyId()); + enforcementInfo.setEnterpriseId(enterprise.getEnterpriseId()); + enforcementInfo.setUpdateTime(LocalDateTime.now()); + enforcementInfoRepository.save(enforcementInfo); }); enforceCheckRepository.findById(enforcementInfoDto.getEnforceCheckId()).ifPresent(enforceCheck -> { Optional.ofNullable(enforcementInfoDto.getCheckItemIds()).ifPresent(ids -> enforceCheck.setCheckItemIds(String.join(",", ids))); diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseService.java index 67211cc..cb8a43f 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseService.java @@ -1417,7 +1417,6 @@ public class EnterpriseService { }; } - /** * 企业信息自查自报 * diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/OfficerService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/OfficerService.java index 0e101bd..a75f4cd 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/OfficerService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/OfficerService.java @@ -269,6 +269,17 @@ public class OfficerService { return officerRepository.count(); } + /** + * 查询执法人员列表 + * + * @param query 查询条件 + * @return 执法人员列表 + */ + public List listOfficers(OfficerQuery query) { + List list = officerRepository.findAll(buildSpec(query), "officer-with-agency"); + list.forEach(this::populateAgencyTransientFields); + return list; + } /** * 填充机构相关的瞬态字段，便于前端直接展示