diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 4184aaa..2983bc3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -646,10 +646,10 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi queryWrapper.and(p -> p.like("t.`bh`", form.getBh())); } if (StringUtils.isNoneBlank(form.getStartDate())) { - queryWrapper.apply("t.sxrq>={0}", form.getStartDate()); + queryWrapper.apply("t.sxr>={0}", form.getStartDate()); } if (StringUtils.isNoneBlank(form.getEndDate())) { - queryWrapper.apply("t.sxrq<{0}", form.getEndDate()); + queryWrapper.apply("t.sxr<{0}", form.getEndDate()); } queryWrapper.orderByDesc("ts.id"); return baseMapper.queryStudyList(queryWrapper); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyRoomServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyRoomServiceImpl.java index 25b8a08..5456c12 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyRoomServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyRoomServiceImpl.java @@ -50,10 +50,10 @@ public class StudyRoomServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(StudyRoom::getStudyId, form.getStudyId()); if(StringUtils.isNotEmpty(form.getSyjh())) { - queryWrapper.eq(StudyRoom::getSyjh, form.getSyjh()); + queryWrapper.like(StudyRoom::getSyjh, form.getSyjh()); } if(StringUtils.isNotEmpty(form.getSyqy())) { - queryWrapper.eq(StudyRoom::getSyqy, form.getSyqy()); + queryWrapper.like(StudyRoom::getSyqy, form.getSyqy()); } if(StringUtils.isNotEmpty(form.getQyrMc())) { queryWrapper.like(StudyRoom::getQyrMc, form.getQyrMc()); diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml index 17f738c..8830a12 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">