Merge remote-tracking branch 'origin/master'

value

2023-09-01 4800caf0bc511a26624da1b9a9cf34275b6c2c4a

 inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java

@@ -10,7 +10,6 @@
import com.yuanchu.limslaboratory.service.NonConformanceReviewService;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;

/**
@@ -27,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);