执法端-联合执法

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnforcementRegistrationController.java

@@ -246,7 +246,7 @@ public class AppEnforcementRegistrationController extends BaseController {
      */
     @SaIgnore
     @GetMapping("/queryUnionByHour")
-    public R<List<UnionEnforcementGroupVo>> queryUnionByHour(EnforcementRegistrationBo bo)
+    public R<List<EnforcementRegistrationVo>> queryUnionByHour(EnforcementRegistrationBo bo)
     {
         return R.ok(enforcementRegistrationService.queryUnionByHour(bo));
     }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java

@@ -128,7 +128,16 @@ public interface IEnforcementRegistrationService {
      * @param bo 查询条件
      * @return 联合执法分组列表
      */
-    List<UnionEnforcementGroupVo> queryUnionByHour(EnforcementRegistrationBo bo);
+    /*List<UnionEnforcementGroupVo> queryUnionByHour(EnforcementRegistrationBo bo);*/
+
+    /**
+     * 根据企业统一信用号, 搜索出该企业前推一小时内的联合执法
+     * 用于用户自行进行关联
+     *
+     * @param bo 查询条件
+     * @return 执法登记列表（已过滤超时数据）
+     */
+    List<EnforcementRegistrationVo> queryUnionByHour(EnforcementRegistrationBo bo);
 
     /**
      * 执法端-查询执法登记详情

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java

@@ -982,13 +982,10 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
      * 执法端-查询联合执法
      */
     @Override
-    public List<UnionEnforcementGroupVo> queryUnionByHour(EnforcementRegistrationBo bo) {
-        // 定义时间格式
+    public List<EnforcementRegistrationVo> queryUnionByHour(EnforcementRegistrationBo bo) {
         DateTimeFormatter time_formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-        // 获取当前时间
         LocalDateTime now_tmp = LocalDateTime.now();
-        // 正常登记为一个小时范围, 补录为为单天
         if ("9".equals(bo.getCheckCss())) {
             bo.setCheckCss(bo.getEnforcementTime().toString());
         } else if ("edit".equals(bo.getCheckCss())) {
@@ -1029,23 +1026,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             }
         }
 
-        Iterator<EnforcementRegistration> iterator = enforcementRegistrations.iterator();
-        while (iterator.hasNext()) {
-            EnforcementRegistration obj = iterator.next();
-            if (outNos.contains(obj.getUnionNo())) {
-                iterator.remove();
-            }
-        }
-
-        Map<String, List<EnforcementRegistration>> groupedByNo = enforcementRegistrations.stream()
-            .collect(Collectors.groupingBy(EnforcementRegistration::getUnionNo));
-
-        List<UnionEnforcementGroupVo> result = new ArrayList<>();
-        for (Map.Entry<String, List<EnforcementRegistration>> entry : groupedByNo.entrySet()) {
-            UnionEnforcementGroupVo groupVo = new UnionEnforcementGroupVo();
-            groupVo.setUnionNo(entry.getKey());
-
-            List<EnforcementRegistrationVo> voList = entry.getValue().stream()
+        List<EnforcementRegistrationVo> result = enforcementRegistrations.stream()
+            .filter(reg -> !outNos.contains(reg.getUnionNo()))
             .map(reg -> {
                 EnforcementRegistrationVo vo = new EnforcementRegistrationVo();
                 org.springframework.beans.BeanUtils.copyProperties(reg, vo);
@@ -1053,10 +1035,6 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             })
             .collect(Collectors.toList());
 
-            groupVo.setRegistrations(voList);
-            result.add(groupVo);
-        }
-
         return result;
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/ComprehensiveAnalysisMapper.xml

@@ -50,7 +50,8 @@
             and r.check_category is not null
             and r.law_enforce_category is not null
             and r.is_submit=1
-            <if test="userId != null and userId != '' ">and( r.law_enforcer_id=#{userId} or
+            <if test="userId != null and userId != '' ">
+                and( r.law_enforcer_id=#{userId} or
                 r.law_enforcer_id_two like concat('%',#{userId}, '%'))
             </if>
             <if test="bureauDeptId != null and bureauDeptId != '' ">and r.bureau_dept_id=#{bureauDeptId}</if>