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 18:09:44 +08:00
parent 6dc14af762
commit bf0f7b7f4c
1 changed files with 14 additions and 9 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
+14 -9
View File
@@ -41,12 +41,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
@Override
public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper
.like("stand_id",sarStandUnqualifiedPage.getStandId())
.like("stand_name",sarStandUnqualifiedPage.getStandId());
if(sarStandUnqualifiedPage.getStandId()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
}
if (sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
}
//仅查询未关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",1);
if(sarStandUnqualifiedPage.getProductName()!=null){
@@ -72,11 +73,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
@Override
public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null || sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId())
.like("stand_name",sarStandUnqualifiedPage.getStandId());
if(sarStandUnqualifiedPage.getStandId()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
}
if (sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
}
//仅查询关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",2);
@@ -122,10 +125,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
public List<SarStandUnqualified> getStandUnqualifiedExcelData(StandUnqualifiedExcelVO standUnqualifiedExcelVO) {
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
sarStandUnqualifiedQueryWrapper.eq("close_state",1);
if(standUnqualifiedExcelVO.getIds()!=null&&standUnqualifiedExcelVO.getIds().size()>0){
if(standUnqualifiedExcelVO.getIds()!=null && standUnqualifiedExcelVO.getIds().size()>0){
sarStandUnqualifiedQueryWrapper.in("id",standUnqualifiedExcelVO.getIds());
}
return sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
List<SarStandUnqualified> stand = sarStandUnqualifiedDao.selectList(sarStandUnqualifiedQueryWrapper);
List<SarStandUnqualified> a = stand;
return a;
}
private boolean closeSarStandUnqualified(String standUnqualifiedId){