执法端-增加查询参数

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

@@ -42,9 +42,9 @@ public class AppEnfCpTaskController extends EfcodeCpTaskController {
      */
     @GetMapping("/myList")
     public R<List<EfcodeCpTaskVo>> myList(
-            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date planDate) {
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date planDate,String searchValue) {
         Long userId = LoginHelper.getUserId();
-        List<EfcodeCpTaskVo> list = cpTaskService.queryMyTaskList(userId, planDate);
+        List<EfcodeCpTaskVo> list = cpTaskService.queryMyTaskList(userId, planDate, searchValue);
         return R.ok(list);
     }
 

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java

@@ -160,4 +160,8 @@ public class EfcodeCpNoticeBo extends BaseEntity {
     private String remark;
 
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java

@@ -98,5 +98,9 @@ public class EfcodeCpReserveBo extends BaseEntity {
     @NotNull(message = "来自:系统匹配=1,手动匹配=0不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long resFrom;
 
-
+    /**
+     * 搜索值
+     *
+     * */
+    private String searchValue;
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementInspectionProgramBo.java

@@ -114,6 +114,11 @@ public class EnforcementInspectionProgramBo extends BaseEntity {
      */
     private String searchText;
 
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
     /**
      * 搜索类型 plan 或 notice
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java

@@ -21,7 +21,8 @@ public interface EfcodeCpReserveMapper extends BaseMapperPlus<EfcodeCpReserve, E
         @Param("page") Page<EfcodeCpReserveVo> page,
         @Param("resFrom") Long resFrom,
         @Param("opStatus") Long opStatus,
-        @Param("currentUserId") String currentUserId
+        @Param("currentUserId") String currentUserId,
+        @Param("searchValue") String searchValue
     );
 
     /**

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java

@@ -23,7 +23,7 @@ public interface EfcodeCpTaskMapper extends BaseMapperPlus<EfcodeCpTask, EfcodeC
      * @param planDate 计划执行日期（可为null）
      * @return 任务列表
      */
-    List<EfcodeCpTaskVo> selectMyTaskList(@Param("userId") Long userId, @Param("planDate") Date planDate);
+    List<EfcodeCpTaskVo> selectMyTaskList(@Param("userId") Long userId, @Param("planDate") Date planDate,@Param("searchValue") String searchValue);
 
     /**
      * 查询指定月份中有任务的日期列表（用于日历打点）

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

@@ -77,7 +77,7 @@ public interface IEfcodeCpTaskService {
      * @param planDate 计划执行日期（可为null）
      * @return 任务列表
      */
-    List<EfcodeCpTaskVo> queryMyTaskList(Long userId, Date planDate);
+    List<EfcodeCpTaskVo> queryMyTaskList(Long userId, Date planDate,String searchValue);
 
     /**
      * 查询指定月份中有任务的日期列表（用于日历打点）

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

@@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import com.zdxt.enforcementcode.common.commonenum.MsgSourceTypeEnum;
+import com.zdxt.enforcementcode.domain.bean.EnforcementEducationServices;
 import com.zdxt.enforcementcode.domain.bo.thirdparty.YuGaoMsgParamBo;
 import com.zdxt.enforcementcode.service.ISysMessageViewLogService;
 import com.zdxt.enforcementcode.service.thirdparty.ISIQService;
@@ -252,6 +253,8 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
      * 发布预告时自动生成系统提示消息
      */
     private void generateSystemMessage(EfcodeCpNotice notice) {
+
+
         String enforceTimeText = switch (notice.getEnforceTime() == null ? 0 : notice.getEnforceTime().intValue()) {
             case 1 -> "上午";
             case 2 -> "下午";
@@ -266,7 +269,7 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
         msg.setId(IdUtil.getSnowflakeNextIdStr());
         msg.setNoticeId(notice.getId());
         msg.setUserId("0");
-        msg.setUserName("系统");
+        msg.setUserName(LoginHelper.getUsername());
         msg.setMsgFrom(0L);
         msg.setMsgType(2);
         msg.setMessage(message);
@@ -288,6 +291,16 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
         lqw.like(StringUtils.isNotBlank(bo.getEnterpriseName()), EfcodeCpNotice::getEnterpriseName, bo.getEnterpriseName());
         lqw.eq(bo.getStatus() != null, EfcodeCpNotice::getStatus, bo.getStatus());
         lqw.eq(bo.getIsDelete() != null, EfcodeCpNotice::getIsDelete, bo.getIsDelete());
+
+        // 搜索值（多字段模糊匹配）
+        if (StringUtils.isNotBlank(bo.getSearchValue())) {
+            String sv = bo.getSearchValue();
+            lqw.and(wrapper -> wrapper
+                .like(StringUtils.isNotBlank(bo.getBureauDeptName()), EfcodeCpNotice::getBureauDeptName, sv)
+                .or().like(StringUtils.isNotBlank(bo.getEnterpriseName()), EfcodeCpNotice::getEnterpriseName, sv)
+                .or().like(StringUtils.isNotBlank(bo.getEnforceContent()), EfcodeCpNotice::getEnforceContent, sv)
+            );
+        }
         return lqw;
     }
 

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

@@ -75,7 +75,8 @@ public class EfcodeCpReserveServiceImpl implements IEfcodeCpReserveService {
             pageQuery.build(),
             bo.getResFrom(),
             bo.getOpStatus(),
-            bo.getCreateBy() != null ? String.valueOf(bo.getCreateBy()) : null
+            bo.getCreateBy() != null ? String.valueOf(bo.getCreateBy()) : null,
+            bo.getSearchValue()
         );
         return TableDataInfo.build(result);
     }

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

@@ -143,8 +143,8 @@ public class EfcodeCpTaskServiceImpl implements IEfcodeCpTaskService {
      * 查询我的任务列表
      */
     @Override
-    public List<EfcodeCpTaskVo> queryMyTaskList(Long userId, Date planDate) {
-        return baseMapper.selectMyTaskList(userId, planDate);
+    public List<EfcodeCpTaskVo> queryMyTaskList(Long userId, Date planDate,String searchValue) {
+        return baseMapper.selectMyTaskList(userId, planDate,searchValue);
     }
 
     /**

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

@@ -52,6 +52,16 @@
             <if test="currentUserId != null">
                 AND (r.receiver_id = #{currentUserId} OR r.sender_id = #{currentUserId})
             </if>
+
+            <if test="searchValue != null">
+                AND (
+                    p.enterprise_name LIKE CONCAT('%', #{searchValue}, '%')
+                    OR p.enforce_content LIKE CONCAT('%', #{searchValue}, '%')
+                    OR p.enforce_user_names LIKE CONCAT('%', #{searchValue}, '%')
+                    OR p.enforce_user_tels LIKE CONCAT('%', #{searchValue}, '%')
+                    OR p2.enterprise_name LIKE CONCAT('%', #{searchValue}, '%')
+                )
+            </if>
         </where>
         ORDER BY r.reserve_time DESC
     </select>

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

@@ -34,6 +34,15 @@
             <if test="planDate != null">
                 AND p.plan_date = #{planDate}
             </if>
+
+            <if test="searchValue != null and searchValue !=''">
+                AND (
+                    t.task_name LIKE CONCAT('%', #{searchValue}, '%')
+                    OR p.enforce_content LIKE CONCAT('%', #{searchValue}, '%')
+                    OR p.enterprise_name LIKE CONCAT('%', #{searchValue}, '%')
+                )
+            </if>
+
         </where>
         ORDER BY p.plan_time ASC, p.plan_date ASC
     </select>

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

@@ -205,10 +205,10 @@
                 )
 
                 <!-- 搜索条件 -->
-                <if test="bo.searchText != null and bo.searchText != ''">
-                    AND (plan_name LIKE CONCAT('%', #{bo.searchText}, '%')
-                    OR enforcement_department LIKE CONCAT('%', #{bo.searchText}, '%')
-                    OR bureau_dept_name LIKE CONCAT('%', #{bo.searchText}, '%'))
+                <if test="bo.searchValue != null and bo.searchValue != ''">
+                    AND (plan_name LIKE CONCAT('%', #{bo.searchValue}, '%')
+                    OR enforcement_department LIKE CONCAT('%', #{bo.searchValue}, '%')
+                    OR bureau_dept_name LIKE CONCAT('%', #{bo.searchValue}, '%'))
                 </if>
             </where>
             ORDER BY create_time DESC