问题修改
This commit is contained in:
parent
8eb5b65d45
commit
dec049e11c
2
pom.xml
2
pom.xml
|
|
@ -346,7 +346,9 @@
|
|||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>gz_aqgqj</finalName>
|
||||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
|
|
|
|||
|
|
@ -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},'%')
|
||||
</if>
|
||||
GROUP BY spa.project_id
|
||||
ORDER BY spa.create_time DESC
|
||||
<if test="status!=null and status!=''">
|
||||
<if test='status=="0"'>
|
||||
HAVING (SUM(spa.ck_num)+sum(spa.lk_num))=0
|
||||
HAVING (SUM(outDetail.ck_num)+sum(outDetail.lk_num))=0
|
||||
</if>
|
||||
<if test='status=="1"'>
|
||||
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
|
||||
)
|
||||
</if>
|
||||
<if test='status=="2"'>
|
||||
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))
|
||||
</if>
|
||||
</if>
|
||||
ORDER BY spa.create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="getProMoney" resultType="java.lang.String">
|
||||
|
|
|
|||
Loading…
Reference in New Issue