Browse Source

提交代码

陈少旭 3 months ago
parent
commit
e6076140f2
1 changed files with 3 additions and 3 deletions
  1. 3 3
      service/export_data_service.go

+ 3 - 3
service/export_data_service.go View File

224
 		psn_cash_pay AS 现金支付
224
 		psn_cash_pay AS 现金支付
225
 	`).Where("user_org_id = ?", 10726).
225
 	`).Where("user_org_id = ?", 10726).
226
 		Where("order_status = ?", 2).
226
 		Where("order_status = ?", 2).
227
-		Where("setl_time >= ?", start_time).
228
-		Where("setl_time <= ?", end_time).
227
+		Where("setl_time >= ?", start_time+" 00:00:00").
228
+		Where("setl_time <= ?", end_time+" 23:59:59").
229
 		Where("is_medicine_insurance = ?", 1).
229
 		Where("is_medicine_insurance = ?", 1).
230
 		Where("status = ?", 1).
230
 		Where("status = ?", 1).
231
 		Scan(&result)
231
 		Scan(&result)
255
 			SUM(psn_cash_pay) AS 现金支付
255
 			SUM(psn_cash_pay) AS 现金支付
256
 		`).
256
 		`).
257
 		Where("user_org_id = ? AND order_status = ? AND setl_time >= ? AND setl_time <= ? AND is_medicine_insurance = ? AND status = ?",
257
 		Where("user_org_id = ? AND order_status = ? AND setl_time >= ? AND setl_time <= ? AND is_medicine_insurance = ? AND status = ?",
258
-			10726, 2, start_time, end_time, 1, 1).
258
+			10726, 2, start_time+" 00:00:00", end_time+" 23:59:59", 1, 1).
259
 		Group("insutype").
259
 		Group("insutype").
260
 		Scan(&result).Error
260
 		Scan(&result).Error
261
 	return result, err
261
 	return result, err