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_master' into develop_master

Browse Source
This commit is contained in:
zhangjun
2022-09-01 16:08:55 +08:00
parent 5b81a7e3e2 101fb1a063
commit 98278f1c37
1 changed files with 8 additions and 3 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
+8 -3
View File
@@ -460,7 +460,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
//cars传回值为1时判断是从车型项目库中调取
QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","(select count(*) from sar_stand_unqualified " +
wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","TEXT_STATUS","STAND_TYPE","ISSUE_TIME","(select count(*) from sar_stand_unqualified " +
" 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 " +
@@ -474,8 +474,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
"STAND_YEAR," +
"STAND_NAME," +
"STAND_EN_NAME," +
"'' as TEXT_STATUS," +
"'' as STAND_TYPE," +
"TEXT_STATUS_BUSS as TEXT_STATUS," +
"'BUSINESS_STAND' as STAND_TYPE," +
"ISSUE_TIME,"+
"( SELECT count( * ) FROM sar_stand_unqualified 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," +
"(" +
@@ -526,6 +527,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setStandType(s.getStandType());
p.setStandEnName(s.getStandEnName());
p.setTextStatus(s.getTextStatus());
if (s.getUnCount()==0L && s.getCounts()>0L) {
p.setUnCount(s.getUnCount());
}else if (s.getUnCount() == 0L && s.getCounts()==0L){
@@ -542,6 +544,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setZRBM(a.getZrbm());
}
}
if(StringUtils.equals(s.getStandType(),"BUSINESS_STAND")){
p.setSSRQ(s.getIssueTime());
}
list.add(p);
}
IPage<StandAttrInfoDto> userIPage = new Page<>();