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

不一致项 查询 加standType

Browse Source
This commit is contained in:
yanyizhou
2021-08-25 17:02:59 +08:00
parent fe25f43063
commit 51055e0374
5 changed files with 96 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
+5
View File
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* <p>
* Mapper 接口
@@ -20,5 +22,8 @@ import org.apache.ibatis.annotations.Mapper;
public interface SarStandUnqualifiedDao extends BaseMapper<SarStandUnqualified> {
IPage<SarStandUnqualified> getAllDatasByPage(Page page,@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
List<SarStandUnqualified> getSarStandUnqualifiedPage(@Param("start")Integer start, @Param("end")Integer end, @Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
Integer getSarStandUnqualifiedCount(@Param("sar") SarStandUnqualifiedPage sarStandUnqualified);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+4
View File
@@ -166,5 +166,9 @@ public class SarStandUnqualified extends BaseEntity {
@TableField(exist=false)
private String dutyEngineerName;
@ApiModelProperty(value = "国内OR海外")
@TableField(exist=false)
private String standType;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+28 -26
View File
@@ -47,7 +47,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
@Override
public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR");
wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_TYPE");
wrapper1.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE sar_standards_info.ID='"+sarStandUnqualifiedPage.getStandId()+"'");
Page<SarStandardsInfo> page1 = new Page<>();
IPage<SarStandardsInfo> userIPage1 = sarStandardsInfoDao.selectPage(page1,wrapper1);
@@ -66,33 +66,35 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
}
}
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null){
sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
}
//仅查询未关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",1);
//根据 项目名称 进行查询
if(sarStandUnqualifiedPage.getProductName()!=null){
sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
}
//根据 责任部门 进行查询
if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
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()+"%')");
}
// QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
// if(sarStandUnqualifiedPage.getStandId()!=null){
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
// }
// //仅查询未关闭的
// sarStandUnqualifiedQueryWrapper.eq("close_state",1);
// //根据 项目名称 进行查询
// if(sarStandUnqualifiedPage.getProductName()!=null){
// sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
// }
// //根据 责任部门 进行查询
// if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
// 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<>();
//判断前端是否提供页码和每页条数
if(sarStandUnqualifiedPage.getCurrent()!=null
&& sarStandUnqualifiedPage.getSize()!=null){
standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
}
return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper);
List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);
Integer total=sarStandUnqualifiedDao.getSarStandUnqualifiedCount(sarStandUnqualifiedPage);
standUnqualifiedPage.setRecords(sarStandUnqualifieds);
standUnqualifiedPage.setTotal(total);
standUnqualifiedPage.setCurrent(sarStandUnqualifiedPage.getCurrent());
standUnqualifiedPage.setSize(sarStandUnqualifiedPage.getSize());
return standUnqualifiedPage;
}
/**