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

275-bug修改

Browse Source
This commit is contained in:
liyawei
2022-11-07 17:47:34 +08:00
parent b8bfa39b88
commit 20f76b5f83
1 changed files with 10 additions and 7 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
+10 -7
View File
@@ -478,8 +478,10 @@ 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 = '2' and pn.id = '" + standId + "') 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 ");
"(select GROUP_CONCAT( DISTINCT DATE_FORMAT( ssu.PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY ssu.PLAN_CLOSE_TIME ) 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 ssu.PLAN_CLOSE_TIME is NOT NULL and pn.id = '" + standId + "') as endTimes ");
wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='" + standId + "'" +
"union all " +
"SELECT " +
@@ -507,13 +509,14 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
" where ssu.STAND_ID = r.stand_id and ssu.CLOSE_STATE = '2' and pn.id = '" + standId + "') as counts, "+
"(" +
"SELECT " +
"GROUP_CONCAT( DISTINCT DATE_FORMAT( PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY PLAN_CLOSE_TIME ) " +
"GROUP_CONCAT( DISTINCT DATE_FORMAT( ssu.PLAN_CLOSE_TIME, '%Y-%m-%d' ) ORDER BY ssu.PLAN_CLOSE_TIME ) " +
"FROM " +
"sar_stand_unqualified " +
"sar_stand_unqualified ssu inner join sar_stand_project_library pn on pn.project_number = ssu.product_id " +
"WHERE " +
"STAND_ID = r.stand_id " +
"AND CLOSE_STATE = '1' " +
"AND PLAN_CLOSE_TIME IS NOT NULL " +
"ssu.STAND_ID = r.stand_id " +
"AND ssu.CLOSE_STATE = '1' " +
"AND ssu.PLAN_CLOSE_TIME IS NOT NULL " +
"AND pn.id = '" + standId + "' " +
") AS endTimes " +
"FROM " +
"sar_bussioness_stand " +