登记时加入联合执法和委托执法选项

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));
+    }
+
     /**
      * 修改执法端-执法登记
      */

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: [
                 {

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

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java

@@ -143,4 +143,18 @@ public interface EnforcementRegistrationMapper
      */
     List<EnforcementRegistration>selectUniteNotItself(EnforcementRegistration enforcementRegistration);
 
+    /**
+     * 用来
+     * @param enforcementRegistration
+     * @return
+     */
+    List<EnforcementRegistration> selectEnforcementRegistrationByUnion(EnforcementRegistration enforcementRegistration);
+
+    /**
+     * 根据联合检查
+     *
+     * @param enforcementRegistration 执法端-执法登记
+     * @return 结果
+     */
+    int updateRegToUnionFlag(EnforcementRegistration enforcementRegistration);
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java

@@ -119,4 +119,6 @@ public interface IEnforcementRegistrationService
     List<EnforcementRegistration> untieCheck1Make(List<EnforcementRegistration> enforcementRegistrationList);
 
     List<EnforcementRegistration> untieCheck1MakeAndDetail(List<EnforcementRegistration> enforcementRegistrationList);
+
+    List<Map<String, Object>> queryUnionByHour(String enterpriseNumber);
 }

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<Map<String, Object>> 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<EnforcementRegistration> enforcementRegistrations = enforcementRegistrationMapper.selectEnforcementRegistrationByUnion(er);
+        // 分组操作
+        Map<String, List<EnforcementRegistration>> groupedByNo = enforcementRegistrations.stream()
+                .collect(Collectors.groupingBy(EnforcementRegistration::getUnionNo));
+
+        // 转换为 List<Map<String, String>>
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Map.Entry<String, List<EnforcementRegistration>> entry : groupedByNo.entrySet()) {
+            Map<String, Object> map = new HashMap<>();
+            for (EnforcementRegistration e : entry.getValue()) {
+                map.put(e.getId(), e);
+            }
+            result.add(map);
+        }
+        return result;
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java

@@ -796,8 +796,5 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS
 
     }
 
-
-
-
 }
 

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

@@ -49,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lawText"    column="law_text"    />
         <result property="numLeft"    column="numLeft"    />
         <result property="numRight"    column="numRight"    />
+        <result property="unionNo"    column="union_no"    />
+        <result property="hasUnion"    column="has_union"    />
+        <result property="hasAuto"    column="has_auto"    />
     </resultMap>
 
     <resultMap type="com.zdxt.code.domain.EnforceRegCount" id="EnforceRegCountResult">
@@ -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
     </sql>
 
@@ -103,6 +106,8 @@ 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="hasUnion != null  and hasUnion != ''"> and has_union = #{hasUnion}</if>
+            <if test="hasAuto != null  and hasAuto != ''"> and has_auto = #{hasAuto}</if>
 
             <if test="searchValue != null and searchValue != ''">
                 and (law_enforcement_item_text  like concat(concat('%',#{searchValue}),'%')
@@ -458,6 +463,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
             <if test="isComplaint != null "> and is_complaint = #{isComplaint}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="hasUnion != null  and hasUnion != ''"> and has_union = #{hasUnion}</if>
+            <if test="hasAuto != null  and hasAuto != ''"> and has_auto = #{hasAuto}</if>
             <if test="lawEnforcementCode != null  and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
             <if test="searchValue != null and searchValue != ''">
                 and (law_enforcement_item_text  like concat(concat('%',#{searchValue}),'%')
@@ -569,6 +576,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEvaluate != null"> is_evaluate,</if>
             <if test="lawId != null and lawId != ''"> law_id,</if>
             <if test="lawText != null and lawText != ''"> law_text,</if>
+            <if test="unionNo != null  and unionNo != ''"> union_no,</if>
+            <if test="hasUnion != null  and hasUnion != ''"> has_union,</if>
+            <if test="hasAuto != null  and hasAuto != ''"> has_auto,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -613,6 +623,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEvaluate != null"> #{isEvaluate},</if>
             <if test="lawId != null and lawId != ''"> #{lawId},</if>
             <if test="lawText != null and lawText != ''"> #{lawText},</if>
+            <if test="unionNo != null  and unionNo != ''"> #{unionNo},</if>
+            <if test="hasUnion != null  and hasUnion != ''"> #{hasUnion},</if>
+            <if test="hasAuto != null  and hasAuto != ''"> #{hasAuto},</if>
          </trim>
     </insert>
 
@@ -659,6 +672,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEvaluate != null"> is_evaluate = #{isEvaluate},</if>
             <if test="lawId != null and lawId != ''"> law_id = #{lawId},</if>
             <if test="lawText != null and lawText != ''"> law_text = #{lawText},</if>
+            <if test="hasUnion != null  and hasUnion != ''"> has_union = #{hasUnion}</if>
+            <if test="hasAuto != null  and hasAuto != ''"> has_auto = #{hasAuto}</if>
         </trim>
         where id = #{id}
     </update>
@@ -1051,4 +1066,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by i.enterprise_address
     </select>
+
+
+    <select id="selectEnforcementRegistrationByUnion" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
+        <include refid="selectEnforcementRegistrationVo"/>
+        <where>
+            <if test="enterpriseNumber != null  and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                and enforcement_time &gt;= #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                and enforcement_time &lt;= #{endTime}
+            </if>
+            and union_no is not null
+        </where>
+        order by enforcement_time desc
+    </select>
+
+
+    <update id="updateRegToUnionFlag" parameterType="EnforcementRegistration">
+        update enforcement_registration
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="hasUnion != null  and hasUnion != ''"> has_union = #{hasUnion}</if>
+        </trim>
+        where union_no = #{unionNo}
+    </update>
 </mapper>