From 7ed5f03b2ac8454ce43d9e2e42b75a2d074ffa32 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Tue, 27 May 2025 17:40:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E6=A3=80=E6=9F=A5=20?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E4=B9=9F=E5=BE=97=E6=A0=87=E5=92=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=9A=84=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppEnforcementRegistrationController.java | 8 +++++--- .../service/impl/EnforcementRegistrationServiceImpl.java | 4 +++- .../resources/mapper/EnforcementRegistrationMapper.xml | 1 + 3 files changed, 9 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 4d9fddd9..d30b1400 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 @@ -563,12 +563,14 @@ public class AppEnforcementRegistrationController extends BaseController // 先获取登记数据 - 获取批次id EnforcementRegistration enforcementRegistration = enforcementRegistrationService.selectEnforcementRegistrationById(id); // 通过联合执法的批次id获取整个批次的联合执法 - if (StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())) { +// if (StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())) { + if (StringUtils.isNotEmpty(enforcementRegistration.getUnionNo()) && 1 == enforcementRegistration.getHasUnion()) { // 已登记联合检查 EnforcementRegistration regRarams = new EnforcementRegistration(); - regRarams.setUniteCheck(enforcementRegistration.getUniteCheck()); +// regRarams.setUniteCheck(enforcementRegistration.getUniteCheck()); + regRarams.setUnionNo((enforcementRegistration.getUnionNo())); regResults = enforcementRegistrationService.selectEnforcementRegistrationList(regRarams); - // 预约未登记的 + // 预约未登记的 (预约没要联合检查了) EnterpriseLawEnforcement lawRarams = new EnterpriseLawEnforcement(); lawRarams.setUniteCheck(enforcementRegistration.getUniteCheck()); lawRarams.setIsReg(0); 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 cbdd202f..ded84a16 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 @@ -333,7 +333,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat // 检查编号为空:说明没有选择关联那条联合检查; hasUnion==1: 说明开启了联合检查, 那么就是新开一条联合检查 if (StringUtils.isEmpty(enforcementRegistration.getUnionNo()) && 1 == enforcementRegistration.getHasUnion()) { enforcementRegistration.setHasUnion(0); // 新开的联合检查先设置为0, 以为不确定后面来的人会不会与其关联, 如果都不关联, 只有它一条数据, 则不算联合检查 - enforcementRegistration.setUnionNo(IdUtil.simpleUUID()); + String unionNo = IdUtil.simpleUUID(); + enforcementRegistration.setUnionNo(unionNo); + enforcementRegistration.setCheckCss(unionNo); // 为了适应来代码中的联合执法编码 } // 新增检查登记 resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index d24eaf56..06039a61 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -106,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and unite_check = #{uniteCheck} and check_category = #{checkCategory} and check_css = #{checkCss} + and union_no = #{unionNo} and has_union = #{hasUnion} and has_auto = #{hasAuto}