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:
zzy
2021-07-30 17:56:09 +08:00
parent ed4dd5ae23 43e37e3d47
commit dd7f18f6d9
5 changed files with 65 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/controller/SarStandUnqualifiedController.java
+4 -3
View File
@@ -58,16 +58,17 @@ public class SarStandUnqualifiedController extends BaseController<SarStandUnqual
/** /**
* 分页查询未符合项 * 分页查询未符合项
* @param sarStandUnqualifiedPage ：筛选、分页信息 * @param sarStandUnqualifiedPage：筛选、分页信息
* @return ResponseMessage<IPage<SarStandUnqualified>> * @return ResponseMessage<IPage<SarStandUnqualified>>
*/ */
@ApiOperation("分页查询未符合项") @ApiOperation("分页查询未符合项")
@GetMapping @GetMapping
public ResponseMessage<IPage<SarStandUnqualifiedPage>> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){ public ResponseMessage<IPage<SarStandUnqualified>> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage){
IPage<SarStandUnqualifiedPage> sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage); IPage<SarStandUnqualified> sarStandUnqualifiedIPage=sarStandUnqualifiedService.getSarStandUnqualifiedPage(sarStandUnqualifiedPage);
return Result.success(sarStandUnqualifiedIPage); return Result.success(sarStandUnqualifiedIPage);
} }
/** /**
* 分页查询未符合项历史数据 * 分页查询未符合项历史数据
* @param sarStandUnqualifiedPage：筛选、分页信息 * @param sarStandUnqualifiedPage：筛选、分页信息
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java
+15 -14
View File
@@ -36,7 +36,7 @@ public class SarStandUnqualified extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelProperty("标准编号") @ExcelProperty("标准ID")
@ApiModelProperty(value = "标准ID") @ApiModelProperty(value = "标准ID")
@TableField("STAND_ID") @TableField("STAND_ID")
private String standId; private String standId;
@@ -46,17 +46,18 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("STAND_NAME") @TableField("STAND_NAME")
private String standName; private String standName;
@ApiModelProperty(value = "标准编号") // @ExcelProperty("标准编号")
@TableField("STAND_NUMBER") // @ApiModelProperty(value = "标准编号")
private String standNumber; // @TableField("STAND_NUMBER")
// private String standNumber;
@ApiModelProperty(value = "标准类别") //
@TableField("STAND_SORT") // @ApiModelProperty(value = "标准类别")
private String standSort; // @TableField("STAND_SORT")
// private String standSort;
@ApiModelProperty(value = "标准年份") //
@TableField("STAND_YEAR") // @ApiModelProperty(value = "标准年份")
private String standYear; // @TableField("STAND_YEAR")
// private String standYear;
@ExcelProperty("条款号") @ExcelProperty("条款号")
@ApiModelProperty(value = "条款号") @ApiModelProperty(value = "条款号")
@@ -138,8 +139,8 @@ public class SarStandUnqualified extends BaseEntity {
@TableField("DUTY_ENGINEER") @TableField("DUTY_ENGINEER")
private String dutyEngineer; private String dutyEngineer;
@ExcelProperty("标准编号组合") @ExcelProperty("标准编号")
@ApiModelProperty(value = "标准编号组合") @ApiModelProperty(value = "标准编号")
@TableField("STAND_SERIAL_NUMBER") @TableField("STAND_SERIAL_NUMBER")
private String standSerialNumber; private String standSerialNumber;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualifiedPage.java
+9 -9
View File
@@ -45,7 +45,7 @@ public class SarStandUnqualifiedPage {
@ApiModelProperty(value = "计划关闭时间") @ApiModelProperty(value = "计划关闭时间")
private Timestamp planCloseTime; private Timestamp planCloseTime;
@ApiModelProperty(value = "标准编号组合") @ApiModelProperty(value = "标准编号")
private String standSerialNumber; private String standSerialNumber;
@ApiModelProperty(value = "质量工程师") @ApiModelProperty(value = "质量工程师")
@@ -90,13 +90,13 @@ public class SarStandUnqualifiedPage {
@ApiModelProperty("每页条数") @ApiModelProperty("每页条数")
private Integer size; private Integer size;
@ApiModelProperty(value = "标准编号") // @ApiModelProperty(value = "标准编号")
private String standNumber; // private String standNumber;
//
@ApiModelProperty(value = "标准类别") // @ApiModelProperty(value = "标准类别")
private String standSort; // private String standSort;
//
@ApiModelProperty(value = "标准年份") // @ApiModelProperty(value = "标准年份")
private String standYear; // private String standYear;
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/ISarStandUnqualifiedService.java
+2 -2
View File
@@ -21,10 +21,10 @@ public interface ISarStandUnqualifiedService extends IService<SarStandUnqualifie
/** /**
* 分页查询未符合项 * 分页查询未符合项
* @param sarStandUnqualifiedPage ：筛选、分页信息 * @param sarStandUnqualifiedPage：筛选、分页信息
* @return：IPage<SarStandUnqualified> * @return：IPage<SarStandUnqualified>
*/ */
IPage<SarStandUnqualifiedPage> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage); IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage);
/** /**
* 分页查询未符合项历史数据 * 分页查询未符合项历史数据
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+35 -48
View File
@@ -35,32 +35,47 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
private SarStandUnqualifiedDao sarStandUnqualifiedDao; private SarStandUnqualifiedDao sarStandUnqualifiedDao;
@Resource @Resource
private SarStandardsInfoDao SarStandardsInfoDao; private SarStandardsInfoDao sarStandardsInfoDao;
// @Resource
// private SarStandardsInfoDao SarStandardsInfoDao;
/** /**
* 分页查询未符合项 * 分页查询未符合项
* @param sarStandUnqualifiedPage ：筛选、分页信息 * @param sarStandUnqualifiedPage ：筛选、分页信息
* @return：IPage<SarStandUnqualified> * @return：IPage<SarStandUnqualified>
*/ */
@Override @Override
public IPage<SarStandUnqualifiedPage> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { public IPage<SarStandUnqualified> getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandardsInfo> wrapper = new QueryWrapper<>(); QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
wrapper.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR"); wrapper1.select("STAND_NUMBER","STAND_SORT","STAND_YEAR");
wrapper.last("INNER JOIN sar_stand_unqualified r ON r.STAND_ID = sar_standards_info.ID WHERE r.STAND_ID ='"+ sarStandUnqualifiedPage.getStandId()+"'"); 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> page = new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); Page<SarStandardsInfo> page1 = new Page<>();
IPage<SarStandardsInfo> userIPage = SarStandardsInfoDao.selectPage(page, wrapper); IPage<SarStandardsInfo> userIPage1 = sarStandardsInfoDao.selectPage(page1,wrapper1);
List<SarStandUnqualifiedPage> list = new ArrayList<>(); List<SarStandardsInfo> list1 = userIPage1.getRecords();
List<SarStandardsInfo> list1 = userIPage.getRecords();
for(SarStandardsInfo s : list1){ QueryWrapper<SarStandUnqualified> wrapper = new QueryWrapper<>();
SarStandUnqualifiedPage p = new SarStandUnqualifiedPage(); // wrapper1.like("stand_number",null);
p.setStandSerialNumber(s.getStandSort()+s.getStandNumber()+s.getStandYear()); wrapper.select("STAND_SERIAL_NUMBER");
Page<SarStandUnqualified> page = new Page<>();
IPage<SarStandUnqualified> userIPage = sarStandUnqualifiedDao.selectPage(page,wrapper);
List<SarStandUnqualified> list = userIPage.getRecords();
for (SarStandardsInfo s : list1){
for (SarStandUnqualified a : list){
a.setStandSerialNumber(s.getStandSort()+" "+s.getStandNumber()+"-"+s.getStandYear());
}
} }
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());//查询详情页所需的标准ID sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
} }
if (sarStandUnqualifiedPage.getStandSerialNumber()!=null){ if (sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("STAND_SERIAL_NUMBER",sarStandUnqualifiedPage.getStandSerialNumber()); sarStandUnqualifiedQueryWrapper.like("stand_number",sarStandUnqualifiedPage.getStandName());
} }
if (sarStandUnqualifiedPage.getStandName()!=null){ if (sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName()); sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
@@ -79,39 +94,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
&& sarStandUnqualifiedPage.getSize()!=null){ && sarStandUnqualifiedPage.getSize()!=null){
standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize()); standUnqualifiedPage=new Page<>(sarStandUnqualifiedPage.getCurrent(),sarStandUnqualifiedPage.getSize());
} }
List<SarStandUnqualified> list2 = sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper).getRecords(); return sarStandUnqualifiedDao.selectPage(standUnqualifiedPage,sarStandUnqualifiedQueryWrapper);
for (SarStandardsInfo s : list1){
SarStandUnqualifiedPage p = new SarStandUnqualifiedPage();
p.setStandNumber(s.getStandNumber());
p.setStandSort(s.getStandSort());
p.setStandYear(s.getStandYear());
for (SarStandUnqualified a : list2){
if (s.getId().equals(a.getStandId())){
p.setCreateDeptId(a.getCreateDeptId());
p.setCreateById(a.getCreateById());
p.setCreateTime((Timestamp)a.getCreateTime());
p.setCloseState(a.getCloseState());
p.setActualCloseTime((Timestamp)a.getActualCloseTime());
p.setPlanCloseTime((Timestamp)a.getPlanCloseTime());
p.setQaEngineer(a.getQaEngineer());
p.setDutyEngineer(a.getDutyEngineer());
p.setResponsibleUnit(a.getResponsibleUnit());
p.setProductName(a.getProductName());
p.setProductLine(a.getProductLine());
p.setProductType(a.getProductType());
p.setItemsName(a.getItemsName());
p.setItemsNum(a.getItemsNum());
p.setStandName(a.getStandName());
p.setStandId(a.getStandId());
p.setId(a.getId());
p.setStandSerialNumber(a.getStandSerialNumber());
}
}
list.add(p);
}
IPage<SarStandUnqualifiedPage> userIPage1 = new Page<>();
userIPage1.setRecords(list);
return userIPage1;
} }
/** /**
@@ -122,10 +105,14 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
@Override @Override
public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { public IPage<SarStandUnqualified> getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
if(sarStandUnqualifiedPage.getStandId()!=null){ if(sarStandUnqualifiedPage.getStandId()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId()); sarStandUnqualifiedQueryWrapper.like("stand_id",sarStandUnqualifiedPage.getStandId());
// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
} }
if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber());
}
if (sarStandUnqualifiedPage.getStandName()!=null){ if (sarStandUnqualifiedPage.getStandName()!=null){
sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName()); sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());
} }