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:
zhangjun
2022-09-08 16:55:25 +08:00
parent 8b82bfac9f
commit d63ec599cc
3 changed files with 34 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/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+24
View File
@@ -464,6 +464,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
"(select count(*) from sar_stand_unqualified ssu " +
"inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
" where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '1' and pn.id = '" + standId + "') as unCount ",
"(select count(*) from sar_standard_compliance_product_assess ssu " +
"inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
" where ssu.STAND_ID = r.stand_id and ssu.no_involve is not null and pn.id = '" + standId + "') as isOverCount ",
"(select count(*) from sar_standard_compliance_product_assess ssu " +
"inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
" where ssu.STAND_ID = r.stand_id and ssu.no_involve is null and pn.id = '" + standId + "') as isCount ",
"(select count(*) from sar_stand_unqualified ssu " +
"inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
" where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '2' and pn.id = '" + standId + "') as counts ",
@@ -484,6 +493,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
"(select count(*) from sar_stand_unqualified ssu " +
"inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
" where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '1' and pn.id = '" + standId + "') as unCount, "+
"(select count(*) from sar_standard_compliance_product_assess ssu " +
"inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
" where ssu.STAND_ID = r.stand_id and ssu.no_involve is not null and pn.id = '" + standId + "') as isOverCount, "+
"(select count(*) from sar_standard_compliance_product_assess ssu " +
"inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
" where ssu.STAND_ID = r.stand_id and ssu.no_involve is null and pn.id = '" + standId + "') as isCount, "+
"(select count(*) from sar_stand_unqualified ssu " +
"inner join sar_stand_project_library pn on pn.project_number = ssu.product_id" +
" where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '2' and pn.id = '" + standId + "') as counts, "+
@@ -555,6 +571,14 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
if(StringUtils.equals(s.getStandType(),"BUSINESS_STAND")){
p.setSSRQ(s.getIssueTime());
}
if (0L == s.getUnCount()) {
if (s.getIsCount() != 0L) {
p.setUnCount(0L);
}
if (s.getIsOverCount() != 0L) {
p.setUnCount(-1L);
}
}
list.add(p);
}
IPage<StandAttrInfoDto> userIPage = new Page<>();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+8
View File
@@ -158,6 +158,14 @@ public class SarStandardsInfo extends BaseEntity {
@TableField(exist = false)
private String endTimes;
@ApiModelProperty(value = "符合数量")
@TableField(exist = false)
private Long isCount;
@ApiModelProperty(value = "不涉及数量")
@TableField(exist = false)
private Long isOverCount;
// 以下为非表中字段
@TableField(exist = false)