gdxz/hospital-admin-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改时间搜索条件

Browse Source
This commit is contained in:
wucongxing 2023-09-15 14:12:02 +08:00
parent 04ff1d9ee5
commit 95769e6e90
2 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
api/dao/orderInquiry.go
View File

@ -147,6 +147,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry
if len(payTime) == 2 { if len(payTime) == 2 {
startTime, _ := time.Parse("2006-01-02", payTime[0]) startTime, _ := time.Parse("2006-01-02", payTime[0])
endTime, _ := time.Parse("2006-01-02", payTime[1]) endTime, _ := time.Parse("2006-01-02", payTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -157,6 +162,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry
if len(receptionTime) == 2 { if len(receptionTime) == 2 {
startTime, _ := time.Parse("2006-01-02", receptionTime[0]) startTime, _ := time.Parse("2006-01-02", receptionTime[0])
endTime, _ := time.Parse("2006-01-02", receptionTime[1]) endTime, _ := time.Parse("2006-01-02", receptionTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("reception_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("reception_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -167,6 +177,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry
if len(completeTime) == 2 { if len(completeTime) == 2 {
startTime, _ := time.Parse("2006-01-02", completeTime[0]) startTime, _ := time.Parse("2006-01-02", completeTime[0])
endTime, _ := time.Parse("2006-01-02", completeTime[1]) endTime, _ := time.Parse("2006-01-02", completeTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("complete_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("complete_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -177,6 +192,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry
if len(finishTime) == 2 { if len(finishTime) == 2 {
startTime, _ := time.Parse("2006-01-02", finishTime[0]) startTime, _ := time.Parse("2006-01-02", finishTime[0])
endTime, _ := time.Parse("2006-01-02", finishTime[1]) endTime, _ := time.Parse("2006-01-02", finishTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("finish_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("finish_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -192,6 +212,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry
if len(cancelTime) == 2 { if len(cancelTime) == 2 {
startTime, _ := time.Parse("2006-01-02", cancelTime[0]) startTime, _ := time.Parse("2006-01-02", cancelTime[0])
endTime, _ := time.Parse("2006-01-02", cancelTime[1]) endTime, _ := time.Parse("2006-01-02", cancelTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -202,6 +227,11 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry
if len(createdAt) == 2 { if len(createdAt) == 2 {
startTime, _ := time.Parse("2006-01-02", createdAt[0]) startTime, _ := time.Parse("2006-01-02", createdAt[0])
endTime, _ := time.Parse("2006-01-02", createdAt[1]) endTime, _ := time.Parse("2006-01-02", createdAt[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime) query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime)
} }
} }

25
api/dao/orderProduct.go
View File

@ -181,6 +181,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
if len(deliveryTime) == 2 { if len(deliveryTime) == 2 {
startTime, _ := time.Parse("2006-01-02", deliveryTime[0]) startTime, _ := time.Parse("2006-01-02", deliveryTime[0])
endTime, _ := time.Parse("2006-01-02", deliveryTime[1]) endTime, _ := time.Parse("2006-01-02", deliveryTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("delivery_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("delivery_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -191,6 +196,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
if len(cancelTime) == 2 { if len(cancelTime) == 2 {
startTime, _ := time.Parse("2006-01-02", cancelTime[0]) startTime, _ := time.Parse("2006-01-02", cancelTime[0])
endTime, _ := time.Parse("2006-01-02", cancelTime[1]) endTime, _ := time.Parse("2006-01-02", cancelTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -201,6 +211,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
if len(payTime) == 2 { if len(payTime) == 2 {
startTime, _ := time.Parse("2006-01-02", payTime[0]) startTime, _ := time.Parse("2006-01-02", payTime[0])
endTime, _ := time.Parse("2006-01-02", payTime[1]) endTime, _ := time.Parse("2006-01-02", payTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -211,6 +226,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
if len(reportPreTime) == 2 { if len(reportPreTime) == 2 {
startTime, _ := time.Parse("2006-01-02", reportPreTime[0]) startTime, _ := time.Parse("2006-01-02", reportPreTime[0])
endTime, _ := time.Parse("2006-01-02", reportPreTime[1]) endTime, _ := time.Parse("2006-01-02", reportPreTime[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("report_pre_time BETWEEN ? AND ?", startTime, endTime) query = query.Where("report_pre_time BETWEEN ? AND ?", startTime, endTime)
} }
} }
@ -221,6 +241,11 @@ func (r *OrderProductDao) GetOrderProductPageSearch(req requests.GetOrderProduct
if len(createdAt) == 2 { if len(createdAt) == 2 {
startTime, _ := time.Parse("2006-01-02", createdAt[0]) startTime, _ := time.Parse("2006-01-02", createdAt[0])
endTime, _ := time.Parse("2006-01-02", createdAt[1]) endTime, _ := time.Parse("2006-01-02", createdAt[1])
if startTime == endTime {
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
}
query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime) query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime)
} }
} }