bug状态修改
This commit is contained in:
parent
380ef770d0
commit
f0ec2beda5
|
|
@ -115,12 +115,19 @@
|
|||
COUNT(ANY_VALUE(IF(cpa.dispatch_num = 0, 1, null))) AS noDispatchPlanNum,
|
||||
IFNULL(SUM(ANY_VALUE(cpa.need_num)),0) AS shouldDispatchNum,
|
||||
IFNULL(SUM(ANY_VALUE(cpa.dispatch_num)),0) AS dispatchNum,
|
||||
SUM(IFNULL( cpo.dispatch_num,0)) dispatch_num,SUM(IFNULL(cpo.money,0)) money,
|
||||
ANY_VALUE(bp.bmname) AS companyName,
|
||||
CASE WHEN SUM(ANY_VALUE(cpa.dispatch_num)) = 0 OR SUM(ANY_VALUE(cpa.dispatch_num)) IS NULL THEN '2'
|
||||
WHEN SUM(ANY_VALUE(cpa.dispatch_num)) = SUM(ANY_VALUE(cpa.need_num)) THEN '3'
|
||||
ELSE '1' END AS dispatchStatus
|
||||
FROM car_plan_apply cpa
|
||||
LEFT JOIN bm_project bp ON cpa.pro_id = bp.bid_id
|
||||
left join(
|
||||
SELECT sum(dispatch_num) dispatch_num,sum(money) money,cpo.apply_id
|
||||
FROM car_plan_out cpo
|
||||
where cpo.status=1
|
||||
GROUP BY cpo.apply_id
|
||||
)cpo on cpo.apply_id=cpa.id
|
||||
<where>
|
||||
<if test="yearMonth!=null and yearMonth!=''">
|
||||
AND DATE_FORMAT(cpa.create_time,'%Y-%m') = #{yearMonth}
|
||||
|
|
@ -159,9 +166,16 @@
|
|||
cpa.user_name AS userName,
|
||||
cpa.remark,
|
||||
cpa.dispatch_num AS dispatchNum,
|
||||
cpa.type AS typeName
|
||||
cpa.type AS typeName,
|
||||
IFNULL( cpo.dispatch_num,0) dispatch_num,IFNULL(cpo.money,0) money
|
||||
FROM car_plan_apply cpa
|
||||
LEFT JOIN bm_project bp ON cpa.pro_id = bp.bid_id
|
||||
left join(
|
||||
SELECT sum(dispatch_num) dispatch_num,sum(money) money,cpo.apply_id
|
||||
FROM car_plan_out cpo
|
||||
where cpo.status=1
|
||||
GROUP BY cpo.apply_id
|
||||
)cpo on cpo.apply_id=cpa.id
|
||||
<where>
|
||||
AND cpa.pro_id = #{proId}
|
||||
<if test="code!=null and code!=''">
|
||||
|
|
|
|||
Loading…
Reference in New Issue