From f47fc7745070e8ee4efcd10843371e94d0b04802 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Mon, 26 May 2025 17:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=97=B6=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=81=94=E5=90=88=E6=89=A7=E6=B3=95=E5=92=8C=E5=A7=94=E6=89=98?= =?UTF-8?q?=E6=89=A7=E6=B3=95=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 13 +++++ .../statisticsEnterprise.html | 1 + .../code/domain/EnforcementRegistration.java | 31 +++++++++++ .../mapper/EnforcementRegistrationMapper.java | 14 +++++ .../IEnforcementRegistrationService.java | 2 + .../EnforcementRegistrationServiceImpl.java | 53 +++++++++++++++++++ .../EnterpriseInformationServiceImpl.java | 3 -- .../mapper/EnforcementRegistrationMapper.xml | 42 ++++++++++++++- 8 files changed, 155 insertions(+), 4 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 e6689a7c..2af753e4 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 @@ -370,6 +370,19 @@ public class AppEnforcementRegistrationController extends BaseController ? ZDResponse.success("保存成功") : ZDResponse.error("保存失败"); } + /** + * 根据企业统一信用号, 搜索出该企业前推一小时内的联合执法. + * 用于用户自行进行关联 + * @param enterpriseNumber + * @return + */ + @GetMapping("/queryUnionByHour/{enterpriseNumber}") + @ResponseBody + public ZDResponse queryUnionByHour(@PathVariable String enterpriseNumber) + { + return ZDResponse.success("操作成功", enforcementRegistrationService.queryUnionByHour(enterpriseNumber)); + } + /** * 修改执法端-执法登记 */ diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html index 33ceb81f..9b82d40d 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html @@ -216,6 +216,7 @@ showToggle: false, /*pageSize: 10, pageList: [10, 25, 50],*/ + // height: 400, //quarterBoolean:quarterBoolean, columns: [ { diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index 3698a3a9..b8bf6ef5 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java @@ -152,6 +152,13 @@ public class EnforcementRegistration extends BaseDomain /** 预约关联文字 */ private String lawText; + /** 联合检查编号(用于) */ + private String unionNo; + /** 是否联合检查 */ + private int hasUnion; + /** 是否委托查询 */ + private int hasAuto; + /** * 关键字查询 */ @@ -373,6 +380,14 @@ public class EnforcementRegistration extends BaseDomain this.id = id; } + public String getUnionNo() { + return unionNo; + } + + public void setUnionNo(String unionNo) { + this.unionNo = unionNo; + } + public String getLawEnforcement() { return lawEnforcement; } @@ -413,6 +428,22 @@ public class EnforcementRegistration extends BaseDomain this.enterpriseNumber = enterpriseNumber; } + public int getHasUnion() { + return hasUnion; + } + + public void setHasUnion(int hasUnion) { + this.hasUnion = hasUnion; + } + + public int getHasAuto() { + return hasAuto; + } + + public void setHasAuto(int hasAuto) { + this.hasAuto = hasAuto; + } + public Date getEnforcementTime() { return enforcementTime; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java index d79e3e1e..cf95aa80 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java @@ -143,4 +143,18 @@ public interface EnforcementRegistrationMapper */ ListselectUniteNotItself(EnforcementRegistration enforcementRegistration); + /** + * 用来 + * @param enforcementRegistration + * @return + */ + List selectEnforcementRegistrationByUnion(EnforcementRegistration enforcementRegistration); + + /** + * 根据联合检查 + * + * @param enforcementRegistration 执法端-执法登记 + * @return 结果 + */ + int updateRegToUnionFlag(EnforcementRegistration enforcementRegistration); } 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 80218105..13b4d590 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 @@ -119,4 +119,6 @@ public interface IEnforcementRegistrationService List untieCheck1Make(List enforcementRegistrationList); List untieCheck1MakeAndDetail(List enforcementRegistrationList); + + List> queryUnionByHour(String enterpriseNumber); } 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 15a5f9d3..ce129676 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 @@ -3,6 +3,7 @@ package com.zdxt.code.service.impl; import java.io.IOException; import java.net.URLEncoder; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.TemporalAdjusters; import java.util.*; @@ -328,8 +329,23 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat enforcementRegistration.setIsEvaluate(0); //默认为登记状态 // enforcementRegistration.setStatus(0); + // 登记可以直接进行联合检查, 选择了联合检查后, 如果未选择到联合检查用的分组id, 则随机生成一个, 否则用选定的unionNo, 并且修改这个unionNo的所有hasUnion为1 + // 检查编号为空:说明没有选择关联那条联合检查; hasUnion==1: 说明开启了联合检查, 那么就是新开一条联合检查 + if (StringUtils.isEmpty(enforcementRegistration.getUnionNo()) && 1 == enforcementRegistration.getHasUnion()) { + enforcementRegistration.setHasUnion(0); // 新开的联合检查先设置为0, 以为不确定后面来的人会不会与其关联, 如果都不关联, 只有它一条数据, 则不算联合检查 + enforcementRegistration.setUnionNo(IdUtil.simpleUUID()); + } + // 新增检查登记 resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration); + // unionNo 上来不等于null, 那么说明关联了联合检查, 则直接新增, 并且将之前的所有 uninoNo相同的 hasUnion更新为 1 + if (resNum > 0 && 1 == enforcementRegistration.getHasUnion()) { + EnforcementRegistration updateUnionParams = new EnforcementRegistration(); + updateUnionParams.setUnionNo(enforcementRegistration.getUnionNo()); + updateUnionParams.setHasUnion(1); + enforcementRegistrationMapper.updateRegToUnionFlag(updateUnionParams); + } + if(StrUtil.isNotEmpty(enforcementRegistration.getBureauDeptId())){ //查询人员所在区 DeptBean deptBean = deptApi.iterationDeptParentRegion(enforcementRegistration.getBureauDeptId()); @@ -1029,4 +1045,41 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat list.addAll(second); return list; } + + @Override + public List> queryUnionByHour(String enterpriseNumber) { + // 定义时间格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + // 获取当前时间 + 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); + + // 可能会出现 同一时间 多组人, 多组联合执法 , 所以新增的时候还是需要生成联合执法id , + List enforcementRegistrations = enforcementRegistrationMapper.selectEnforcementRegistrationByUnion(er); + // 分组操作 + Map> groupedByNo = enforcementRegistrations.stream() + .collect(Collectors.groupingBy(EnforcementRegistration::getUnionNo)); + + // 转换为 List> + List> result = new ArrayList<>(); + for (Map.Entry> entry : groupedByNo.entrySet()) { + Map map = new HashMap<>(); + for (EnforcementRegistration e : entry.getValue()) { + map.put(e.getId(), e); + } + result.add(map); + } + return result; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index 8d165c8b..074cecce 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java @@ -796,8 +796,5 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS } - - - } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index ebd2486a..ce2d4802 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -49,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -66,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_item_text, law_enforcement_basis, law_enforcement_basis_text, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code, is_complaint,is_submit, unite_check,check_css, enforce_reason, law_field,check_category, - bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text + bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text, has_union, has_auto, union_no from enforcement_registration @@ -103,6 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and unite_check = #{uniteCheck} and check_category = #{checkCategory} and check_css = #{checkCss} + and has_union = #{hasUnion} + and has_auto = #{hasAuto} and (law_enforcement_item_text like concat(concat('%',#{searchValue}),'%') @@ -458,6 +463,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and is_delete = #{isDelete} and is_complaint = #{isComplaint} and status = #{status} + and has_union = #{hasUnion} + and has_auto = #{hasAuto} and law_enforcement_code = #{lawEnforcementCode} and (law_enforcement_item_text like concat(concat('%',#{searchValue}),'%') @@ -569,6 +576,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_evaluate, law_id, law_text, + union_no, + has_union, + has_auto, #{id}, @@ -613,6 +623,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isEvaluate}, #{lawId}, #{lawText}, + #{unionNo}, + #{hasUnion}, + #{hasAuto}, @@ -659,6 +672,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_evaluate = #{isEvaluate}, law_id = #{lawId}, law_text = #{lawText}, + has_union = #{hasUnion} + has_auto = #{hasAuto} where id = #{id} @@ -1051,4 +1066,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by i.enterprise_address + + + + + + + update enforcement_registration + + has_union = #{hasUnion} + + where union_no = #{unionNo} + \ No newline at end of file