diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java index 20e12009..6a8319f6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpNoticeController.java @@ -1,5 +1,6 @@ package com.zdxt.enforcementcode.controller.app.enforcement; +import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.domain.bo.EfcodeCpNoticeBo; import com.zdxt.enforcementcode.domain.bo.EfcodeCpNoticeMessageBo; import com.zdxt.enforcementcode.domain.vo.EfcodeCpNoticeMessageVo; @@ -37,6 +38,7 @@ public class AppEnfCpNoticeController { * 查询我的预告列表（分页，只返回当前用户创建的预告） * 通过status区分tab：0=草稿, 1=待执法(已发布), 3=历史(已执行) */ + @SaIgnore @GetMapping("/myList") public TableDataInfo myList(EfcodeCpNoticeBo bo, PageQuery pageQuery) { return efcodeCpNoticeService.queryMyPageList(bo, pageQuery); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java index 4cd262d7..573758e7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfTodoItemController.java @@ -71,6 +71,7 @@ public class AppEnfTodoItemController extends BaseController { * 获取待办个数 * 返回普法服务、执法评价、执法预告的未读个数及总数 */ + @SaIgnore @GetMapping("/statisticsUnReadCount") public R statisticsUnReadCount() { TodoStatisticsVo statistics = new TodoStatisticsVo(); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementEducationServicesBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementEducationServicesBo.java index 80845129..7a06b4a2 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementEducationServicesBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementEducationServicesBo.java @@ -123,4 +123,8 @@ public class EnforcementEducationServicesBo extends BaseEntity { */ private Date endTime; + /** + * 搜索值 + */ + private String searchValue; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java index 8dcb685b..70bfd765 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java @@ -326,4 +326,9 @@ public class EnforcementRegistrationBo extends BaseEntity { */ private String otherReasons; + /** + * 搜索值 + */ + private 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 437c1d2e..92fd899d 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 @@ -84,7 +84,7 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService { LambdaQueryWrapper lqw = buildQueryWrapper(bo); // 只看自己发布的预告 Long userId = LoginHelper.getUserId(); - lqw.eq(EfcodeCpNotice::getCreateBy, userId); + lqw.eq(userId != null, EfcodeCpNotice::getCreateBy, userId); // 过滤已删除 lqw.eq(EfcodeCpNotice::getIsDelete, 0); // 按创建时间倒序 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java index 4605989c..83115638 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementEducationServicesServiceImpl.java @@ -2,6 +2,7 @@ package com.zdxt.enforcementcode.service.impl; import com.zdxt.enforcementcode.common.commonenum.MsgSourceTypeEnum; import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums; +import com.zdxt.enforcementcode.domain.EnforcementRegistration; import com.zdxt.enforcementcode.domain.bean.EnforcementEducationServices; import com.zdxt.enforcementcode.domain.vo.ZdxtFileVo; import com.zdxt.enforcementcode.service.ISysMessageViewLogService; @@ -268,6 +269,19 @@ public class EnforcementEducationServicesServiceImpl implements IEnforcementEduc lqw.like(StringUtils.isNotBlank(bo.getUpdateByName()), EnforcementEducationServices::getUpdateByName, bo.getUpdateByName()); lqw.eq(bo.getIsDelete() != null, EnforcementEducationServices::getIsDelete, bo.getIsDelete()); + // 搜索值（多字段模糊匹配） + if (StringUtils.isNotBlank(bo.getSearchValue())) { + String sv = bo.getSearchValue(); + lqw.and(wrapper -> wrapper + .like(EnforcementEducationServices::getTitle, sv) + .or().like(EnforcementEducationServices::getForwardUrl, sv) + .or().like(EnforcementEducationServices::getContent, sv) + .or().like(EnforcementEducationServices::getCreateByName, sv) + .or().like(EnforcementEducationServices::getUpdateByName, sv) + .or().like(EnforcementEducationServices::getRemark, sv) + ); + } + // 创建时间范围筛选 if (bo.getStartTime() != null && bo.getEndTime() != null) { lqw.between(EnforcementEducationServices::getCreateTime, bo.getStartTime(), bo.getEndTime()); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index 38301fba..28889573 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -815,9 +815,31 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat // 是否自动 lqw.eq(bo.getHasAuto() != null, EnforcementRegistration::getHasAuto, bo.getHasAuto()); - // 搜索值（企业名称） - lqw.like(StringUtils.isNotBlank(bo.getSearchValue()), - EnforcementRegistration::getEnterpriseName, bo.getSearchValue()); + // 搜索值（多字段模糊匹配） + if (StringUtils.isNotBlank(bo.getSearchValue())) { + String sv = bo.getSearchValue(); + lqw.and(wrapper -> wrapper + .like(EnforcementRegistration::getEnterpriseNumber, sv) + .or().like(EnforcementRegistration::getEnterpriseAddress, sv) + .or().like(EnforcementRegistration::getEnterpriseName, sv) + .or().like(EnforcementRegistration::getLawEnforcementCode, sv) + .or().like(EnforcementRegistration::getLawEnforcement, sv) + .or().like(EnforcementRegistration::getBureauDeptName, sv) + .or().like(EnforcementRegistration::getLawEnforcer, sv) + .or().like(EnforcementRegistration::getLawEnforcerTwo, sv) + .or().like(EnforcementRegistration::getLawEnforcementItemText, sv) + .or().like(EnforcementRegistration::getLawEnforcementBasis, sv) + .or().apply("DATE_FORMAT(enforcement_time, '%Y-%m-%d') LIKE CONCAT('%',{0},'%')", sv) + .or().like(EnforcementRegistration::getCheckCss, sv) + .or().like(EnforcementRegistration::getCheckCategory, sv) + .or().like(EnforcementRegistration::getEnforceReason, sv) + .or().like(EnforcementRegistration::getRemark, sv) + .or().like(EnforcementRegistration::getLawEnforcementBasisText, sv) + .or().like(EnforcementRegistration::getLawText, sv) + .or().like(EnforcementRegistration::getEnforce, sv) + .or().like(EnforcementRegistration::getLawEnforcementItem, sv) + ); + } // 日期搜索（年月） if (StringUtils.isNotBlank(bo.getDateSearch())) { diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpNoticeMessageMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpNoticeMessageMapper.xml index 892b38c8..724a6de4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpNoticeMessageMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeCpNoticeMessageMapper.xml @@ -8,7 +8,7 @@ SELECT COUNT(1) FROM efcode_cp_reserve r - LEFT JOIN efcode_cp_plan p ON r.plan_id = p.id - LEFT JOIN efcode_cp_plan p2 ON r.plan_group_id = p2.id - WHERE r.sender_id != 'manual_system_sender' - AND NOT EXISTS ( - SELECT 1 - FROM sys_message_view_log smvl - WHERE smvl.source_id = p.id - AND smvl.create_by = #{userId} - AND smvl.source_type = #{sourceType} - AND smvl.is_delete = 0 - ) + LEFT JOIN efcode_cp_plan p ON r.plan_id = p.id + LEFT JOIN efcode_cp_plan p2 ON r.plan_group_id = p2.id + WHERE r.sender_id != 'manual_system_sender' and r.create_by = #{userId} + AND NOT EXISTS ( + SELECT 1 + FROM sys_message_view_log smvl + WHERE smvl.source_id = p.id + AND smvl.create_by = #{userId} + AND smvl.source_type = #{sourceType} + AND smvl.is_delete = 0 + ) 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 8dea7e78..b188e536 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 @@ -87,7 +87,7 @@ SELECT COUNT(1) FROM efcode_cp_plan p INNER JOIN efcode_cp_task t ON t.id = p.task_id - AND p.is_delete = 0 + AND p.is_delete = 0 and p.create_by = #{userId} AND NOT EXISTS ( SELECT 1 FROM sys_message_view_log smvl