Просмотр исходного кода

fix(账单): 对时间的搜索添加相等判断

likai 4 лет назад
Родитель
Сommit
84771d338c

+ 2 - 2
service/settle_account_bill/settle_account_bill.go

@@ -45,7 +45,7 @@ func (s Service)  List(req model.ListReq, user request.UserInfo) ([]accountModel
 		if entity.SettleDate != "" {
 			timelist := strings.Split(entity.SettleDate,",")
 			if len(timelist) == 2 {
-				where += fmt.Sprintf(" AND SettleDate>'%v' AND SettleDate<'%v'", timelist[0],timelist[1])
+				where += fmt.Sprintf(" AND SettleDate>='%v' AND SettleDate<='%v'", timelist[0],timelist[1])
 			}
 		}
 		if entity.SettleUser != "" {
@@ -55,7 +55,7 @@ func (s Service)  List(req model.ListReq, user request.UserInfo) ([]accountModel
 			where += fmt.Sprintf(" AND MainUser LIKE '%%%v%%'", entity.MainUser)
 		}
 		if entity.StartDate != "" && entity.EndDate != "" {
-			where += fmt.Sprintf(" AND StartDate>'%v' AND EndDate<'%v'", entity.StartDate, entity.EndDate)
+			where += fmt.Sprintf(" AND StartDate>='%v' AND EndDate<='%v'", entity.StartDate, entity.EndDate)
 		}
 		if entity.IsSelf != "1" {  // 1 查看全部;其他 查看自己
 			where += fmt.Sprintf(" AND MainUserId='%v'", user.Id)

+ 4 - 4
service/settle_account_main/settle_account_main.go

@@ -90,18 +90,18 @@ func (s Service) List(req model.ListReq, user request.UserInfo) ([]accountModel.
 			where += fmt.Sprintf(" AND BillId='%v'", entity.BillId)
 		}
 		if entity.AppointStartDate != "" && entity.AppointEndDate != "" {
-			where += fmt.Sprintf(" AND AppointStartDate>'%v' AND AppointEndDate<'%v'", entity.AppointStartDate, entity.AppointEndDate)
+			where += fmt.Sprintf(" AND AppointStartDate>='%v' AND AppointEndDate<='%v'", entity.AppointStartDate, entity.AppointEndDate)
 		}
 		if entity.ActualStartDate != "" && entity.ActualEndDate != "" {
-			where += fmt.Sprintf(" AND ActualStartDate>'%v' AND ActualEndDate<'%v'", entity.ActualStartDate, entity.ActualEndDate)
+			where += fmt.Sprintf(" AND ActualStartDate>='%v' AND ActualEndDate<='%v'", entity.ActualStartDate, entity.ActualEndDate)
 		}
 		if entity.SettleStartDate != "" && entity.SettleEndDate != "" {
-			where += fmt.Sprintf(" AND SettleDate>'%v' AND SettleDate<'%v'", entity.SettleStartDate, entity.SettleEndDate)
+			where += fmt.Sprintf(" AND SettleDate>='%v' AND SettleDate<='%v'", entity.SettleStartDate, entity.SettleEndDate)
 		}
 		if entity.VerificationDate != "" {
 			timelist := strings.Split(entity.VerificationDate,",")
 			if len(timelist) == 2 {
-				where += fmt.Sprintf(" AND VerificationDate>'%v' AND VerificationDate<'%v'", timelist[0],timelist[1])
+				where += fmt.Sprintf(" AND VerificationDate>='%v' AND VerificationDate<='%v'", timelist[0],timelist[1])
 			}
 		}
 	}