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 5586f1a..6a7dae4 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 @@ -93,7 +93,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i queryWrapper.and(p -> p.apply("t.rkrq>={0}", form.getStartDateRk())); } if (StringUtils.isNoneBlank(form.getEndDateRk())) { - queryWrapper.apply("t.rkrq>={0}", 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())); 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 1defcf0..cc731c6 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 @@ -90,7 +90,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl queryWrapper.and(p -> p.apply("t.rkrq>={0}", form.getStartDateRk())); } if (StringUtils.isNoneBlank(form.getEndDateRk())) { - queryWrapper.apply("t.rkrq>={0}", 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()));