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

Merge remote-tracking branch 'origin/develop_1' into develop_1

Browse Source
This commit is contained in:
yanyizhou
2021-08-04 09:58:36 +08:00
parent 65f7689dbc 4993e03aa1
commit b7f1016135
1 changed files with 5 additions and 10 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
+5 -10
View File
@@ -67,18 +67,8 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
} }
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber());
}
if(sarStandUnqualifiedPage.getStandId()!=null){ if(sarStandUnqualifiedPage.getStandId()!=null){
sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()); sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
}
if (sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_number",sarStandUnqualifiedPage.getStandName());
}
if (sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
} }
//仅查询未关闭的 //仅查询未关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",1); sarStandUnqualifiedQueryWrapper.eq("close_state",1);
@@ -88,6 +78,11 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit()); sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
} }
if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
// sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
"\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')");
}
Page<SarStandUnqualified> standUnqualifiedPage=new Page<>(); Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
//判断前端是否提供页码和每页条数 //判断前端是否提供页码和每页条数
if(sarStandUnqualifiedPage.getCurrent()!=null if(sarStandUnqualifiedPage.getCurrent()!=null