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-02-21 16:43:29 +08:00
parent 697f5722eb
commit 41dbca2772
5 changed files with 42 additions and 15 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
+15 -2
View File
@@ -184,6 +184,7 @@ public class SarStandardComplianceAssessResultController {
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("STAND_ID", eo.getStandId());
queryWrapper.eq("product_id", eo.getProductId());
queryWrapper.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.eq("no_involve","").or().isNull("no_involve"));
queryWrapper.isNotNull("research_completion_time");
queryWrapper.orderByAsc("product_name");
queryWrapper.orderByAsc("standard_item");
@@ -196,11 +197,23 @@ public class SarStandardComplianceAssessResultController {
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("STAND_ID", eo.getStandId());
queryWrapper1.eq("product_id", eo.getProductId());
queryWrapper1.ne("research_compliance","");
queryWrapper1.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("research_compliance","").or().isNotNull("research_compliance"));
queryWrapper1.orderByAsc("product_name");
queryWrapper1.orderByAsc("standard_item");
IPage<SarStandardComplianceProductAssess> page1 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper1);
map.put("fit",page1);
Page p2=new Page();
BeanUtils.copyProperties(page1,p2);
p2.setRecords(page1.getRecords());
p2.setTotal(page1.getTotal());
map.put("fit",p2);
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("STAND_ID", eo.getStandId());
queryWrapper2.eq("product_id", eo.getProductId());
queryWrapper2.and(sarStandardComplianceProductAssessQueryWrapper -> sarStandardComplianceProductAssessQueryWrapper.ne("no_involve","").and(sarStandardComplianceProductAssessQueryWrapper1 -> sarStandardComplianceProductAssessQueryWrapper1.isNotNull("no_involve")));
queryWrapper2.orderByAsc("product_name");
queryWrapper2.orderByAsc("standard_item");
IPage<SarStandardComplianceProductAssess> page2 = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper2);
map.put("noFit",page2);
return Result.success(map);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
+3
View File
@@ -132,6 +132,9 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
@TableField("evaluation_people_name")
private String evaluationPeopleName;
@ApiModelProperty(value = "不涉及理由")
@TableField("no_involve")
private String noInvolve;
private String id;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/unCountDTO.java
+6
View File
@@ -23,6 +23,10 @@ public class unCountDTO {
private String unCount;
private String unCounts;
private String allCounts;
private Long current;
private Long size;
@@ -32,4 +36,6 @@ public class unCountDTO {
private String type;
private String noInvolveReason;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarStandardComplianceProductAssessServiceImpl.java
+7 -2
View File
@@ -32,8 +32,13 @@ public class SarStandardComplianceProductAssessServiceImpl extends ServiceImpl<S
public IPage<unCountDTO> selectPages(Page pages, unCountDTO productAssess) {
IPage<unCountDTO> productAssessIPage= new Page<>();
List<unCountDTO> res=sarStandardComplianceProductAssessDao.selectPages(pages.getCurrent(),pages.getSize(),productAssess);
res.forEach(unCountDTO -> {unCountDTO.setStandId(productAssess.getStandId());
unCountDTO.setType(productAssess.getType());});
res.forEach(unCountDTO -> {
unCountDTO.setStandId(productAssess.getStandId());
unCountDTO.setType(productAssess.getType());
if (unCountDTO.getAllCounts().equals(unCountDTO.getUnCounts())){
unCountDTO.setUnCount("-1");
}
});
productAssessIPage.setRecords(res);
List<Integer> a=sarStandardComplianceProductAssessDao.selectPagesCount(productAssess);
if (null!=a) {