From e0f032a00a8bd3f436077e27d4a9b0eef188b9ef Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 23 Jan 2026 15:43:55 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E9=BA=BB=E7=B2=BE=E8=8D=AF?= =?UTF-8?q?=EF=BC=8C=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82]=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hxhq/business/form/gyzj/FfjlSearchForm.java | 12 ++++++------ .../java/com/hxhq/business/form/mjy/FfjlSearchForm.java | 13 +++++++------ .../com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java | 12 ++++++++---- .../com/hxhq/business/service/impl/MjyFfjlServiceImpl.java | 12 ++++++++---- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSearchForm.java index a54735d..a5f178d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfjlSearchForm.java @@ -29,8 +29,8 @@ public class FfjlSearchForm { /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; - /** 目的id */ - private Long mdId; + /** 目的 */ + private String mdMc; public String getMc() { return mc; @@ -96,11 +96,11 @@ public class FfjlSearchForm { this.jyzt = jyzt; } - public Long getMdId() { - return mdId; + public String getMdMc() { + return mdMc; } - public void setMdId(Long mdId) { - this.mdId = mdId; + public void setMdMc(String mdMc) { + this.mdMc = mdMc; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java index a9eed32..f0cc5ad 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlSearchForm.java @@ -29,8 +29,9 @@ public class FfjlSearchForm { /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; - /** 目的id */ - private Long mdId; + + /** 目的 */ + private String mdMc; public String getMc() { return mc; @@ -96,11 +97,11 @@ public class FfjlSearchForm { this.jyzt = jyzt; } - public Long getMdId() { - return mdId; + public String getMdMc() { + return mdMc; } - public void setMdId(Long mdId) { - this.mdId = mdId; + public void setMdMc(String mdMc) { + this.mdMc = mdMc; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index 5b1884f..a002ae6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java @@ -99,8 +99,10 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i if (StringUtils.isNoneBlank(form.getEndDateRk())) { queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk()); } - if (form.getMdId() != null && form.getMdId().intValue() > 0) { - queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId())); + if (StringUtils.isNoneBlank(form.getMdMc())) { + queryWrapper.and(p -> p.like("t.md_other", form.getMdMc()) + .or().apply(" exists(select s.* from t_study s where find_in_set(s.id, t.`md_ids`) and s.name like CONCAT('%', {0}, '%'))",form.getMdMc()) + ); } queryWrapper.orderByDesc("t.id"); return baseMapper.queryList(queryWrapper); @@ -537,8 +539,10 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i if (StringUtils.isNoneBlank(form.getEndDateRk())) { queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk()); } - if (form.getMdId() != null && form.getMdId().intValue() > 0) { - queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId())); + if (StringUtils.isNoneBlank(form.getMdMc())) { + queryWrapper.and(p -> p.like("t.md_other", form.getMdMc()) + .or().apply(" exists(select s.* from t_study s where find_in_set(s.id, t.`md_ids`) and s.name like CONCAT('%', {0}, '%'))",form.getMdMc()) + ); } queryWrapper.orderByDesc("t.id"); return baseMapper.queryList(queryWrapper); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java index 5903310..3bbb815 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java @@ -94,8 +94,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl if (StringUtils.isNoneBlank(form.getEndDateRk())) { queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk()); } - if (form.getMdId() != null && form.getMdId().intValue() > 0) { - queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId())); + if (StringUtils.isNoneBlank(form.getMdMc())) { + queryWrapper.and(p -> p.like("t.md_other", form.getMdMc()) + .or().apply(" exists(select s.* from t_study s where find_in_set(s.id, t.`md_ids`) and s.name like CONCAT('%', {0}, '%'))",form.getMdMc()) + ); } queryWrapper.orderByDesc("t.id"); return baseMapper.queryList(queryWrapper); @@ -534,8 +536,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl if (StringUtils.isNoneBlank(form.getEndDateRk())) { queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk()); } - if (form.getMdId() != null && form.getMdId().intValue() > 0) { - queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId())); + if (StringUtils.isNoneBlank(form.getMdMc())) { + queryWrapper.and(p -> p.like("t.md_other", form.getMdMc()) + .or().apply(" exists(select s.* from t_study s where find_in_set(s.id, t.`md_ids`) and s.name like CONCAT('%', {0}, '%'))",form.getMdMc()) + ); } queryWrapper.orderByDesc("t.id"); return baseMapper.queryList(queryWrapper);