Skip to content

D
data-acquisition
Commit 47cb6e96 authored by 罗贤顺's avatar 罗贤顺
Browse files
Options

修复问题

parent 50d2052b
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java
View file @ 47cb6e96
...@@ -210,10 +210,9 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora ...@@ -210,10 +210,9 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
//分页 //分页
Page<TSampleLaboratorysheet> page = new Page<>(); Page<TSampleLaboratorysheet> page = new Page<>();
LambdaQueryWrapper<TSampleLaboratorysheet> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TSampleLaboratorysheet> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(TSampleLaboratorysheet::getSysj,TSampleLaboratorysheet::getYh); //TODO 根据收样时间筛选
queryWrapper.like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getSysj,tSampleLaboratorysheetQuery.getSearch()) queryWrapper.select(TSampleLaboratorysheet::getYh);
.or() queryWrapper.like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getYh,tSampleLaboratorysheetQuery.getSearch());
.like(StringUtils.isNotBlank(tSampleLaboratorysheetQuery.getSearch()),TSampleLaboratorysheet::getYh,tSampleLaboratorysheetQuery.getSearch());
//查询 //查询
Page<TSampleLaboratorysheet> tSampleLaboratorysheetPage = baseMapper.selectPage(page, queryWrapper); Page<TSampleLaboratorysheet> tSampleLaboratorysheetPage = baseMapper.selectPage(page, queryWrapper);
return R.ok(tSampleLaboratorysheetPage); return R.ok(tSampleLaboratorysheetPage);
......
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java
View file @ 47cb6e96
...@@ -63,17 +63,18 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp ...@@ -63,17 +63,18 @@ public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSamp
ProjectEnum.TSampleListType.SYR.getLabel(), ProjectEnum.TSampleListType.SYR.getLabel(),
ProjectEnum.TSampleListType.SYRQ.getLabel() ProjectEnum.TSampleListType.SYRQ.getLabel()
); );
String startDate = tSampleListQuery.getSearch() + "00:00:00"; // String startDate = tSampleListQuery.getSearch() + "00:00:00";
String endDate = tSampleListQuery.getSearch() + "23:59:59"; // String endDate = tSampleListQuery.getSearch() + "23:59:59";
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TSampleListType.SYRQ.getLabel()); stringBuilder.append(ProjectEnum.TableAlias.A.getLabel()).append(ProjectEnum.TSampleListType.SYRQ.getLabel());
queryWrapper queryWrapper
.like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.YH.getLabel(), tSampleListQuery.getSearch()) .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.YH.getLabel(), tSampleListQuery.getSearch())
.or() .or()
.like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.HOLES_ID.getLabel(), tSampleListQuery.getSearch()) .like(StringUtils.isNotBlank(tSampleListQuery.getSearch()), ProjectEnum.TSampleListType.HOLES_ID.getLabel(), tSampleListQuery.getSearch());
.or() //TODO 根据时间筛选
.ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(DateUtil.strToTime(startDate))) // .or()
.le(stringBuilder.toString(), DateUtil.getEndTimeStr(DateUtil.strToTime(endDate))); // .ge(stringBuilder.toString(), DateUtil.getBeginTimeStr(DateUtil.strToTime(startDate)))
// .le(stringBuilder.toString(), DateUtil.getEndTimeStr(DateUtil.strToTime(endDate)));
//查询 //查询
Page<TSampleList> tSampleListPage = baseMapper.selectPage(page, queryWrapper); Page<TSampleList> tSampleListPage = baseMapper.selectPage(page, queryWrapper);
return R.ok(tSampleListPage); return R.ok(tSampleListPage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment