From 8a08ad66336a5e96e179c38209e25b28bdcb65e8 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Tue, 27 May 2025 15:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E6=A3=80=E6=9F=A5=20?= =?UTF-8?q?=E8=A1=A5=E5=BD=95=20=E6=8C=89=E4=B8=80=E5=A4=A9=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 6 ++-- .../IEnforcementRegistrationService.java | 2 +- .../EnforcementRegistrationServiceImpl.java | 28 +++++++++++-------- .../mapper/EnforcementRegistrationMapper.xml | 1 + 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index 2af753e4..4d9fddd9 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -376,11 +376,11 @@ public class AppEnforcementRegistrationController extends BaseController * @param enterpriseNumber * @return */ - @GetMapping("/queryUnionByHour/{enterpriseNumber}") + @GetMapping("/queryUnionByHour/{enterpriseNumber}/{checkCss}") @ResponseBody - public ZDResponse queryUnionByHour(@PathVariable String enterpriseNumber) + public ZDResponse queryUnionByHour(@PathVariable String enterpriseNumber, @PathVariable String checkCss) { - return ZDResponse.success("操作成功", enforcementRegistrationService.queryUnionByHour(enterpriseNumber)); + return ZDResponse.success("操作成功", enforcementRegistrationService.queryUnionByHour(enterpriseNumber, checkCss)); } /** diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index 13b4d590..8ef148ff 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -120,5 +120,5 @@ public interface IEnforcementRegistrationService List untieCheck1MakeAndDetail(List enforcementRegistrationList); - List> queryUnionByHour(String enterpriseNumber); + List> queryUnionByHour(String enterpriseNumber, String checkCss); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index ce129676..cbdd202f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -1047,23 +1047,29 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat } @Override - public List> queryUnionByHour(String enterpriseNumber) { + public List> queryUnionByHour(String enterpriseNumber, String checkCss) { // 定义时间格式 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + DateTimeFormatter time_formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + // 定义时间格式 + DateTimeFormatter date_formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 获取当前时间 LocalDateTime now_tmp = LocalDateTime.now(); - // 获取当前时间前一个小时的时间 - LocalDateTime oneHourAgo_tmp = now_tmp.minusHours(1); - // 格式化时间 - String now = now_tmp.format(formatter); - String oneHourAgo = oneHourAgo_tmp.format(formatter); - - // 查询符合要求的数据 + // 正常登记为一个小时范围, 补录为为单天 EnforcementRegistration er = new EnforcementRegistration(); er.setEnterpriseNumber(enterpriseNumber); - er.setBeginTime(oneHourAgo); - er.setEndTime(now); + if ("3".equals(checkCss)) { + String now = now_tmp.format(date_formatter); + er.setCheckCss(now); + } else { + // 获取当前时间前一个小时的时间 + LocalDateTime oneHourAgo_tmp = now_tmp.minusHours(1); + // 格式化时间 + String now = now_tmp.format(time_formatter); + String oneHourAgo = oneHourAgo_tmp.format(time_formatter); + er.setBeginTime(oneHourAgo); + er.setEndTime(now); + } // 可能会出现 同一时间 多组人, 多组联合执法 , 所以新增的时候还是需要生成联合执法id , List enforcementRegistrations = enforcementRegistrationMapper.selectEnforcementRegistrationByUnion(er); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index ce2d4802..d24eaf56 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -1072,6 +1072,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enterprise_number = #{enterpriseNumber} + and DATE_FORMAT(enforcement_time, '%Y-%m-%d') = #{checkCss} and enforcement_time >= #{beginTime}