From 2ea245c784a0d46350ff52cd46cf72a1af2adbae Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Thu, 30 Jul 2026 14:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/enforcement/AppEnfCpTaskController.java | 4 ++-- .../domain/bo/EfcodeCpNoticeBo.java | 4 ++++ .../domain/bo/EfcodeCpReserveBo.java | 6 +++++- .../domain/bo/EnforcementInspectionProgramBo.java | 5 +++++ .../mapper/EfcodeCpReserveMapper.java | 3 ++- .../mapper/EfcodeCpTaskMapper.java | 2 +- .../service/IEfcodeCpTaskService.java | 2 +- .../service/impl/EfcodeCpNoticeServiceImpl.java | 15 ++++++++++++++- .../service/impl/EfcodeCpReserveServiceImpl.java | 3 ++- .../service/impl/EfcodeCpTaskServiceImpl.java | 4 ++-- .../enforcementcode/EfcodeCpReserveMapper.xml | 10 ++++++++++ .../mapper/enforcementcode/EfcodeCpTaskMapper.xml | 9 +++++++++ .../EnforcementInspectionProgramMapper.xml | 8 ++++---- 13 files changed, 61 insertions(+), 14 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpTaskController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpTaskController.java index 7b36f279..badd3768 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpTaskController.java +++ b/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> 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 list = cpTaskService.queryMyTaskList(userId, planDate); + List list = cpTaskService.queryMyTaskList(userId, planDate, searchValue); return R.ok(list); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java index f66b23cf..a51ac72a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpNoticeBo.java +++ b/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; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java index 45261697..5f18c34c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EfcodeCpReserveBo.java +++ b/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; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementInspectionProgramBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementInspectionProgramBo.java index 67d3ae93..1759fd0e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementInspectionProgramBo.java +++ b/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 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java index 5dbe4548..997eee61 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpReserveMapper.java @@ -21,7 +21,8 @@ public interface EfcodeCpReserveMapper extends BaseMapperPlus page, @Param("resFrom") Long resFrom, @Param("opStatus") Long opStatus, - @Param("currentUserId") String currentUserId + @Param("currentUserId") String currentUserId, + @Param("searchValue") String searchValue ); /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java index 6fe60384..d2d30cdb 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EfcodeCpTaskMapper.java @@ -23,7 +23,7 @@ public interface EfcodeCpTaskMapper extends BaseMapperPlus selectMyTaskList(@Param("userId") Long userId, @Param("planDate") Date planDate); + List selectMyTaskList(@Param("userId") Long userId, @Param("planDate") Date planDate,@Param("searchValue") String searchValue); /** * 查询指定月份中有任务的日期列表（用于日历打点） diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpTaskService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpTaskService.java index 31c7f1f3..c7e7f9d1 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEfcodeCpTaskService.java +++ b/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 queryMyTaskList(Long userId, Date planDate); + List queryMyTaskList(Long userId, Date planDate,String searchValue); /** * 查询指定月份中有任务的日期列表（用于日历打点） diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java index 1c9964d7..05e37188 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java +++ b/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; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java index cc08b699..8094e78d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpReserveServiceImpl.java +++ b/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); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpTaskServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpTaskServiceImpl.java index 254d8515..5a59c3eb 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpTaskServiceImpl.java +++ b/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 queryMyTaskList(Long userId, Date planDate) { - return baseMapper.selectMyTaskList(userId, planDate); + public List queryMyTaskList(Long userId, Date planDate,String searchValue) { + return baseMapper.selectMyTaskList(userId, planDate,searchValue); } /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml index d4f78c81..1ad4b6be 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpReserveMapper.xml @@ -52,6 +52,16 @@ AND (r.receiver_id = #{currentUserId} OR r.sender_id = #{currentUserId}) + + + 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}, '%') + ) + ORDER BY r.reserve_time DESC diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml index b188e536..94bd226b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpTaskMapper.xml @@ -34,6 +34,15 @@ AND p.plan_date = #{planDate} + + + AND ( + t.task_name LIKE CONCAT('%', #{searchValue}, '%') + OR p.enforce_content LIKE CONCAT('%', #{searchValue}, '%') + OR p.enterprise_name LIKE CONCAT('%', #{searchValue}, '%') + ) + + ORDER BY p.plan_time ASC, p.plan_date ASC diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml index bb195737..ad20ed18 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementInspectionProgramMapper.xml @@ -205,10 +205,10 @@ ) - - AND (plan_name LIKE CONCAT('%', #{bo.searchText}, '%') - OR enforcement_department LIKE CONCAT('%', #{bo.searchText}, '%') - OR bureau_dept_name LIKE CONCAT('%', #{bo.searchText}, '%')) + + AND (plan_name LIKE CONCAT('%', #{bo.searchValue}, '%') + OR enforcement_department LIKE CONCAT('%', #{bo.searchValue}, '%') + OR bureau_dept_name LIKE CONCAT('%', #{bo.searchValue}, '%')) ORDER BY create_time DESC