fix:[试验管理][物资管理]

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);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyRoomServiceImpl.java

@@ -50,10 +50,10 @@ public class StudyRoomServiceImpl extends ServiceImpl
         LambdaQueryWrapper<StudyRoom> 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());

hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.GspMapper">
     <select id="queryStudyList" resultType="com.hxhq.business.dto.gsp.GspListDto">
-        select t.id,t.mc,t.bh, t.ph, t.gg,t.ggdw, t.yxq,t.kc,t.kcdw,t.zjzt, t.cczt,
+        select t.id,t.mc,t.bh, t.ph, t.gg,t.ggdw, t.yxq,t.kc,t.kcdw,t.zjzt, t.cczt
         FROM  `t_gsp` t
         join  `t_study_gsp` ts on t.id=ts.resource_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">