修复问题

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java

@@ -210,10 +210,9 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
         //分页
         Page<TSampleLaboratorysheet> page = new Page<>();
         LambdaQueryWrapper<TSampleLaboratorysheet> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(TSampleLaboratorysheet::getSysj,TSampleLaboratorysheet::getYh);
-        queryWrapper.like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getSysj,tSampleLaboratorysheetQuery.getSearch())
-                    .or()
-                    .like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getYh,tSampleLaboratorysheetQuery.getSearch());
+        //TODO 根据收样时间筛选
+        queryWrapper.select(TSampleLaboratorysheet::getYh);
+        queryWrapper.like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getYh,tSampleLaboratorysheetQuery.getSearch());
         //查询
         Page<TSampleLaboratorysheet> tSampleLaboratorysheetPage = baseMapper.selectPage(page, queryWrapper);
         return R.ok(tSampleLaboratorysheetPage);

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java

@@ -63,17 +63,18 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
                 ProjectEnum.TSampleListType.SYR.getLabel(),
                 ProjectEnum.TSampleListType.SYRQ.getLabel()
         );
-        String startDate = tSampleListQuery.getSearch() + "00:00:00";
-        String endDate = tSampleListQuery.getSearch() + "23:59:59";
+//        String startDate = tSampleListQuery.getSearch() + "00:00:00";
+//        String endDate = tSampleListQuery.getSearch() + "23:59:59";
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TSampleListType.SYRQ.getLabel());
         queryWrapper
                 .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.YH.getLabel(), tSampleListQuery.getSearch())
                 .or()
-                .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.HOLES_ID.getLabel(), tSampleListQuery.getSearch())
-                .or()
-                .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(DateUtil.strToTime(startDate)))
-                .le(stringBuilder.toString(), DateUtil.getEndTimeStr(DateUtil.strToTime(endDate)));
+                .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.HOLES_ID.getLabel(), tSampleListQuery.getSearch());
+//TODO 根据时间筛选
+    //                .or()
+//                .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(DateUtil.strToTime(startDate)))
+//                .le(stringBuilder.toString(), DateUtil.getEndTimeStr(DateUtil.strToTime(endDate)));
         //查询
         Page<TSampleList> tSampleListPage = baseMapper.selectPage(page, queryWrapper);
         return R.ok(tSampleListPage);