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; + } /** * 填充机构相关的瞬态字段,便于前端直接展示