diff --git a/pom.xml b/pom.xml index 8798e6f..81e3561 100644 --- a/pom.xml +++ b/pom.xml @@ -346,7 +346,9 @@ + gz_aqgqj + org.springframework.boot spring-boot-maven-plugin diff --git a/src/main/resources/mappers/business/backstage/PurchaseMapper.xml b/src/main/resources/mappers/business/backstage/PurchaseMapper.xml index ccc23a8..5d6784d 100644 --- a/src/main/resources/mappers/business/backstage/PurchaseMapper.xml +++ b/src/main/resources/mappers/business/backstage/PurchaseMapper.xml @@ -137,12 +137,11 @@ ROUND((SUM(outDetail.ck_num)+sum(outDetail.lk_num))*100/ SUM(spa.need_num),2) progress from st_plan_apply spa left join( - SELECT SUM(spod.cg_num) ck_num,sum(spod.lk_num) lk_num ,spo.apply_id plan_detail_id,spod.model_id,spod.id + SELECT SUM(spod.cg_num) ck_num,sum(spod.lk_num) lk_num ,spo.apply_id plan_detail_id from st_plan_out spo left join st_plan_out_details spod on spo.id=spod.out_id - GROUP BY spo.apply_id,spod.model_id + GROUP BY spo.apply_id )outDetail on outDetail.plan_detail_id=spa.id - left join bm_project pro on pro.bid_id=spa.project_id LEFT JOIN bm_company bc on bc.ID=pro.COMPANY_ID where spa.status_type=1 @@ -153,20 +152,20 @@ and pro.name like concat('%',#{proName},'%') GROUP BY spa.project_id - ORDER BY spa.create_time DESC - HAVING (SUM(spa.ck_num)+sum(spa.lk_num))=0 + HAVING (SUM(outDetail.ck_num)+sum(outDetail.lk_num))=0 - HAVING (SUM(spa.need_num)>(SUM(spa.ck_num)+sum(spa.lk_num)) - and (SUM(spa.ck_num)+sum(spa.lk_num))!=0 + HAVING (SUM(spa.need_num)>(SUM(outDetail.ck_num)+sum(outDetail.lk_num)) + and (SUM(outDetail.ck_num)+sum(outDetail.lk_num))!=0 ) - HAVING ((SUM(spa.ck_num)+sum(spa.lk_num) )>=SUM(spa.need_num)) + HAVING ((SUM(outDetail.ck_num)+sum(outDetail.lk_num) )>=SUM(spa.need_num)) + ORDER BY spa.create_time DESC