From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java
index 99ac92f..9744fa9 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java
@@ -1,18 +1,15 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.mapper.NonConformanceReviewMapper;
import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
import com.yuanchu.limslaboratory.pojo.NonConformanceReview;
-import com.yuanchu.limslaboratory.pojo.NonConformingFeedback;
import com.yuanchu.limslaboratory.pojo.vo.NonConformanceReviewVo;
import com.yuanchu.limslaboratory.service.NonConformanceReviewService;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-
import javax.annotation.Resource;
/**
@@ -29,13 +26,13 @@
public NonConformanceReviewVo getNonConformanceReviewVo(NonConformingFeedbackDto nonConformingFeedbackDto) {
QueryWrapper<NonConformanceReview>queryWrapper= new QueryWrapper<>();
if (StringUtils.hasText(nonConformingFeedbackDto.getMaterialCode())){
- queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getMaterialCode,nonConformingFeedbackDto.getMaterialCode()));
+ queryWrapper.lambda().and(a->a.like(NonConformanceReview::getMaterialCode,nonConformingFeedbackDto.getMaterialCode()));
}
if (StringUtils.hasText(nonConformingFeedbackDto.getMaterialName())){
- queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getMaterialName,nonConformingFeedbackDto.getMaterialName()));
+ queryWrapper.lambda().and(a->a.like(NonConformanceReview::getMaterialName,nonConformingFeedbackDto.getMaterialName()));
}
if (StringUtils.hasText(nonConformingFeedbackDto.getInspectionCode())){
- queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getInspectionCode,nonConformingFeedbackDto.getInspectionCode()));
+ queryWrapper.lambda().and(a->a.like(NonConformanceReview::getInspectionCode,nonConformingFeedbackDto.getInspectionCode()));
}
Page<NonConformanceReview> page = new Page<>(nonConformingFeedbackDto.getCurrentPage(), nonConformingFeedbackDto.getPageNum(), true);
IPage<NonConformanceReview> iPage = mapper.selectPage(page, queryWrapper);
--
Gitblit v1.9.3