|
@@ -469,7 +469,7 @@ func CalculateProportion(deptNameMap map[string]interface{}) int64 {
|
|
|
sum(1) as count
|
|
sum(1) as count
|
|
|
FROM
|
|
FROM
|
|
|
order_work a
|
|
order_work a
|
|
|
- INNER JOIN approval_record b ON a.creator_time > "%s"
|
|
|
|
|
|
|
+ INNER JOIN approval_record b ON a.creator_time >= "%s"
|
|
|
AND FIND_IN_SET( a.department_no , "%s")
|
|
AND FIND_IN_SET( a.department_no , "%s")
|
|
|
AND a.work_order_no = b.work_order_no
|
|
AND a.work_order_no = b.work_order_no
|
|
|
and (b.new_status!= 1 or b.new_status is null )
|
|
and (b.new_status!= 1 or b.new_status is null )
|
WH01243