2887 气瓶管理-出库记录，关键字查询结果与显示数据不符（操作人，联系电话，气体名称）

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbInOutRecordController.java

@@ -54,10 +54,6 @@ public class DbInOutRecordController extends AbstractController {
     public ResultData list(@RequestBody DbInOutRecordParam dbInOutRecordParam) {
         //查询条件
         LambdaQueryWrapper<DbInOutRecord> queryWrapper = new LambdaQueryWrapper<>();
-        //操作人 联系电话 气瓶编号 气瓶名称
-        if (StringUtils.isNotBlank(dbInOutRecordParam.getSearchValue())) {
-            queryWrapper.like(DbInOutRecord::getGasName, dbInOutRecordParam.getSearchValue()).or().like(DbInOutRecord::getOperator, dbInOutRecordParam.getSearchValue()).or().like(DbInOutRecord::getPhone, dbInOutRecordParam.getSearchValue());
-        }
         if (Objects.nonNull(dbInOutRecordParam.getType())) {
             queryWrapper.eq(DbInOutRecord::getType, dbInOutRecordParam.getType());
         }
@@ -67,6 +63,12 @@ public class DbInOutRecordController extends AbstractController {
         if (Objects.nonNull(dbInOutRecordParam.getStartTime()) && Objects.nonNull(dbInOutRecordParam.getEndTime())) {
             queryWrapper.between(DbInOutRecord::getCreateTime, dbInOutRecordParam.getStartTime(), dbInOutRecordParam.getEndTime());
         }
+        //操作人 联系电话 气瓶编号 气瓶名称
+        if (StringUtils.isNotBlank(dbInOutRecordParam.getSearchValue())) {
+            queryWrapper.and(wrapper -> {
+                wrapper.like(DbInOutRecord::getGasName, dbInOutRecordParam.getSearchValue()).or().like(DbInOutRecord::getOperator, dbInOutRecordParam.getSearchValue()).or().like(DbInOutRecord::getPhone, dbInOutRecordParam.getSearchValue());
+            });
+        }
         //倒叙
         queryWrapper.orderByDesc(DbInOutRecord::getId);
         IPage<DbInOutRecord> result = dbInOutRecordService.page(PageUtil.getQuery(dbInOutRecordParam.getPageNum(), dbInOutRecordParam.getPageSize()), queryWrapper);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStockController.java

@@ -230,7 +230,9 @@ public class DbStockController extends AbstractController {
         LambdaQueryWrapper<DbStock> queryWrapper = new LambdaQueryWrapper<>();
         //气瓶编号 气瓶名称 实验室名称
         if (StringUtils.isNotBlank(dbStockParam.getSearchValue())) {
-            queryWrapper.like(DbStock::getGasName, dbStockParam.getSearchValue()).or().like(DbStock::getSubjectName, dbStockParam.getSearchValue());
+            queryWrapper.and(wrapper -> {
+                wrapper.like(DbStock::getGasName, dbStockParam.getSearchValue()).or().like(DbStock::getSubjectName, dbStockParam.getSearchValue());
+            });
         }
         if (Objects.nonNull(dbStockParam.getCollegeId())) {
             queryWrapper.eq(DbStock::getCollegeId, dbStockParam.getCollegeId());

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbUsageRecordController.java

@@ -110,7 +110,9 @@ public class DbUsageRecordController extends AbstractController {
         LambdaQueryWrapper<DbUsageRecord> queryWrapper = new LambdaQueryWrapper<>();
         //气瓶编号 气瓶名称 实验室名称
         if (StringUtils.isNotBlank(dbUsageRecordBo.getSearchValue())) {
-            queryWrapper.like(DbUsageRecord::getGasName, dbUsageRecordBo.getSearchValue()).or().like(DbUsageRecord::getSubjectName, dbUsageRecordBo.getSearchValue());
+            queryWrapper.and(wrapper ->{
+                wrapper.like(DbUsageRecord::getGasName, dbUsageRecordBo.getSearchValue()).or().like(DbUsageRecord::getSubjectName, dbUsageRecordBo.getSearchValue());
+            });
         }
         if (Objects.nonNull(dbUsageRecordBo.getCollegeId())) {
             queryWrapper.eq(DbUsageRecord::getCollegeId, dbUsageRecordBo.getCollegeId());