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

项目评估结果去重

Browse Source
This commit is contained in:
yuezhihang
2022-01-14 10:44:30 +08:00
parent 4e362e485b
commit bfa6f94452
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+9 -2
View File
@@ -59,7 +59,7 @@ public class SarStandardComplianceAssessResultController {
if (eo.getStandApplicationType() == 1) {
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE");
queryWrapper.select("distinct STAND_ID,STAND_NUMBER, STAND_NAME, STAND_TYPE");
if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
queryWrapper.like("STAND_NAME", eo.getStandName().trim());
}
@@ -70,8 +70,15 @@ public class SarStandardComplianceAssessResultController {
queryWrapper.like("type", eo.getType().trim());
}
IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
List<String> ids=new ArrayList<>();
page.getRecords().forEach(productAssess -> {ids.add(productAssess.getStandId());});
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper1 = new QueryWrapper<>();
IPage<SarStandardComplianceProductAssess> iPage1 = new Page<>(eo.getCurrent(), eo.getSize());
queryWrapper1.select(" STAND_ID,STAND_NUMBER, STAND_NAME, STAND_TYPE");
queryWrapper1.in("STAND_ID",ids);
IPage<SarStandardComplianceProductAssess> page2 = iSarStandardComplianceProductAssessService.page(iPage1, queryWrapper1);
while (page.getRecords().remove(null)) ;
while (page2.getRecords().remove(null)) ;
return Result.success(page);
} else {