|
@@ -105,7 +105,7 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
|
|
|
default PageResult<MuseumFlowDO> selectPageMuseumFlowFormIntel(MuseumFlowPageVO pageVO) {
|
|
|
LambdaQueryWrapperX<MuseumFlowDO> queryWrapper = new LambdaQueryWrapperX<>();
|
|
|
queryWrapper
|
|
|
-// .inIfPresent(MuseumFlowDO::getSampleName,pageVO.getSampleName())
|
|
|
+ .likeIfPresent(MuseumFlowDO::getSampleName,pageVO.getSampleName())
|
|
|
.betweenIfPresent(MuseumFlowDO::getApplyTime, pageVO.getApplyTime())
|
|
|
.eqIfPresent(MuseumFlowDO::getOutboundPerson, pageVO.getOutboundPerson())
|
|
|
.eqIfPresent(MuseumFlowDO::getState, pageVO.getState())
|
|
@@ -113,14 +113,14 @@ public interface MuseumFlowMapper extends BaseMapperX<MuseumFlowDO> {
|
|
|
if (pageVO.getNumber()!=null &&!pageVO.getNumber().isEmpty()) {
|
|
|
queryWrapper.apply("JSON_CONTAINS(number, CAST({0} AS JSON))", pageVO.getNumber());
|
|
|
}
|
|
|
- if (pageVO.getSampleName() != null &&!pageVO.getSampleName().isEmpty()) {
|
|
|
-// String inValues = Arrays.stream(pageVO.getSampleName().toArray())
|
|
|
-// .map(String::valueOf)
|
|
|
-// .reduce((a, b) -> a + "," + b)
|
|
|
-// .orElse("");
|
|
|
-// queryWrapper.apply("exists (select 1 from json_table(sample_name, '$[*]' columns (value int path '$') where value in ({0}))", inValues);
|
|
|
- queryWrapper.apply("JSON_CONTAINS(sample_name, JSON_ARRAY(#{number })", pageVO.getSampleName());
|
|
|
- }
|
|
|
+// if (pageVO.getSampleName() != null &&!pageVO.getSampleName().isEmpty()) {
|
|
|
+//// String inValues = Arrays.stream(pageVO.getSampleName().toArray())
|
|
|
+//// .map(String::valueOf)
|
|
|
+//// .reduce((a, b) -> a + "," + b)
|
|
|
+//// .orElse("");
|
|
|
+//// queryWrapper.apply("exists (select 1 from json_table(sample_name, '$[*]' columns (value int path '$') where value in ({0}))", inValues);
|
|
|
+// queryWrapper.apply("JSON_CONTAINS(sample_name, JSON_ARRAY(#{number })", pageVO.getSampleName());
|
|
|
+// }
|
|
|
return selectPage(pageVO, queryWrapper);
|
|
|
}
|
|
|
|