Compare commits

..

No commits in common. "df93919c37a94dae399999292f5c0740ca0f527d" and "f7f649f51d6b036ea877cdb5f2a990bc6b057708" have entirely different histories.

View File

@ -156,8 +156,6 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid").
Where("cast_work.status = 9").
Where("cwe.cost_type = 1").
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
@ -174,8 +172,6 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid").
Where("cast_work.status = 9").
Where("cwe.cost_type != 1").
Where("cast_work.submit_time >= ?", req.Start+" 00:00:00").
Where("cast_work.submit_time <= ?", req.End+" 23:59:59").
Where("cast_work.deleted_at = 0")
if req.BundleUuid != "" {
query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)