FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改未符合项bug

Browse Source
This commit is contained in:
Wanghong
2021-07-28 09:23:44 +08:00
parent 0540325f35
commit 2428b39e79
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+6 -6
View File
@@ -1,5 +1,6 @@
package com.adc.da.slrs.sarStandUnqualified.service.impl;
import com.adc.da.att.entity.AttFileEO;
import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified;
import com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao;
import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualifiedPage;
@@ -17,9 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* <p>
@@ -42,7 +41,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
@Override
public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null){
if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper
.like("stand_id",sarStandUnqualifiedPage.getStandId())
.like("stand_name",sarStandUnqualifiedPage.getStandId());
@@ -73,8 +72,9 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
@Override
public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null){
sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name",sarStandUnqualifiedPage.getStandId()));
if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId())
.like("stand_name",sarStandUnqualifiedPage.getStandId());
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
}