Merge branch 'feat-hjj-ExportBat'

internal/dao/bundleMetrics.go

@@ -199,10 +199,11 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid").
 		Joins("INNER JOIN cast_work_log cwl on cwl.work_uuid = cast_work.uuid and cwl.work_status = 9").
 		Where("cwe.cost_type = 1").
+		Where("cast_work.work_category = 2").
 		Where("cwl.update_time >= ?", req.Start+" 00:00:00").
 		Where("cwl.update_time <= ?", req.End+" 23:59:59").
 		Where("cast_work.origin_uuid = ''").
-		Where("cast_work.deleted_at = 0 and ccl.deleted_at = 0 and cwe.deleted_at = 0")
+		Where("cast_work.deleted_at = 0 and ccl.deleted_at = 0 and cwe.deleted_at = 0 and cwl.deleted_at = 0")
 	if req.BundleUuid != "" {
 		query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
 	}
@@ -218,10 +219,11 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Joins("left join cast_cost_log ccl on ccl.work_uuid = cast_work.uuid").
 		Joins("INNER JOIN cast_work_log cwl on cwl.work_uuid = cast_work.uuid and cwl.work_status = 9").
 		Where("cwe.cost_type != 1").
+		Where("cast_work.work_category = 2").
 		Where("cwl.update_time >= ?", req.Start+" 00:00:00").
 		Where("cwl.update_time <= ?", req.End+" 23:59:59").
 		Where("cast_work.origin_uuid = ''").
-		Where("cast_work.deleted_at = 0 and ccl.deleted_at = 0 and cwe.deleted_at = 0")
+		Where("cast_work.deleted_at = 0 and ccl.deleted_at = 0 and cwe.deleted_at = 0 and cwl.deleted_at = 0")
 	if req.BundleUuid != "" {
 		query = query.Where("ccl.bundle_uuid = ?", req.BundleUuid)
 	}