...
|
...
|
@@ -81,16 +81,20 @@ func (repository *ExchangeCashActivityRepository) Find(queryOptions map[string]i |
|
|
var exchangeCashActivityModels []*models.ExchangeCashActivity
|
|
|
exchangeCashActivities := make([]*domain.ExchangeCashActivity, 0)
|
|
|
query := tx.Model(&exchangeCashActivityModels)
|
|
|
fmt.Printf("查询:%+v\n", queryOptions)
|
|
|
if companyId, ok := queryOptions["companyId"]; ok {
|
|
|
query = query.Where(`exchange_cash_activity.company_id = ?`, companyId)
|
|
|
}
|
|
|
if activityNameMatch, ok := queryOptions["activityNameMatch"]; ok && (activityNameMatch != "") {
|
|
|
query = query.Where(`exchange_cash_activity.activity_name LIKE ?`, fmt.Sprintf("%%%s%%", activityNameMatch.(string)))
|
|
|
}
|
|
|
if deadline, ok := queryOptions["deadline"]; ok && !deadline.(time.Time).IsZero() {
|
|
|
var t = deadline.(time.Time)
|
|
|
newDeadline := time.Date(t.Year(), t.Month(), t.Day(), 23, 59, 59, 0, time.Now().Location())
|
|
|
query = query.Where(`exchange_cash_activity.deadline >= ?`, newDeadline)
|
|
|
if deadline, ok := queryOptions["deadline"]; ok && deadline != "" {
|
|
|
fmt.Print(deadline, "\n")
|
|
|
t, _ := time.ParseInLocation("2006-01-02", deadline.(string), time.UTC)
|
|
|
fmt.Print(t, "\n")
|
|
|
//newDeadline := time.Date(t.Year(), t.Month(), t.Day(), 23, 59, 59, 0, time.UTC)
|
|
|
//fmt.Print(newDeadline, "\n")
|
|
|
query = query.Where(`exchange_cash_activity.deadline >= ?`, t)
|
|
|
}
|
|
|
if offset, ok := queryOptions["offset"]; ok {
|
|
|
offset := offset.(int)
|
...
|
...
|
|