联合检查 历史也得标和详情页的恢复

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);

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);

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -106,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="uniteCheck != null  and uniteCheck != ''"> and unite_check = #{uniteCheck}</if>
             <if test="checkCategory != null  and checkCategory != ''"> and check_category = #{checkCategory}</if>
             <if test="checkCss != null  and checkCss != ''"> and check_css = #{checkCss}</if>
+            <if test="unionNo != null  and unionNo != ''"> and union_no = #{unionNo}</if>
             <if test="hasUnion != null  and hasUnion != ''"> and has_union = #{hasUnion}</if>
             <if test="hasAuto != null  and hasAuto != ''"> and has_auto = #{hasAuto}</if>