|
|
@@ -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])
|
|
|
}
|
|
|
}
|
|
|
}
|