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
2021-12-07 09:21:14 +08:00
committed by zhaokaiyao@91isoft.com
parent 0e68e431ea
commit 4478fecf73
3 changed files with 15 additions and 4 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
+9 -2
View File
@@ -379,7 +379,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE","(select count(*) from sar_stand_unqualified" +
" where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ",
" where STAND_ID = r.stand_id and CLOSE_STATE = '1' ) as unCount ","(select count(*) from sar_stand_unqualified" +
" where STAND_ID = r.stand_id and CLOSE_STATE = '2' ) as counts ",
"(select GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) from sar_stand_unqualified where " +
" STAND_ID = r.stand_id and CLOSE_STATE = '1' AND PLAN_CLOSE_TIME is NOT NULL ) as endTimes ");
wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'");
@@ -408,7 +409,13 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setStandName(s.getStandName());
p.setStandType(s.getStandType());
p.setStandEnName(s.getStandEnName());
p.setUnCount(s.getUnCount());
if (s.getUnCount()==0L && s.getCounts()>0L) {
p.setUnCount(s.getUnCount());
}else if (s.getUnCount() == 0L && s.getCounts()==0L){
p.setUnCount(2L);
}else {
p.setUnCount(1L);
}
p.setEndTimes(s.getEndTimes());
for (SarStandAttrInfo a:list2){
if(s.getId().equals(a.getStandId())){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+4
View File
@@ -146,6 +146,10 @@ public class SarStandardsInfo extends BaseEntity {
@TableField(exist = false)
private Long unCount;
@ApiModelProperty(value = "为符合数量")
@TableField(exist = false)
private Long counts;
@ApiModelProperty(value = "整改完成时间")
@TableField(exist = false)
private String endTimes;