|
|
@@ -70,9 +70,12 @@ func (s Service) List(req model.ListReq, user request.UserInfo) ([]accountModel.
|
|
|
if entity.Status != "" {
|
|
|
where += fmt.Sprintf(" AND Status='%v'", entity.Status)
|
|
|
}
|
|
|
- if entity.SettleStatus != "" {
|
|
|
+ if entity.SettleStatus != "" { // 确认状态
|
|
|
where += fmt.Sprintf(" AND SettleStatus='%v'", entity.SettleStatus)
|
|
|
}
|
|
|
+ if entity.AccountStatus != "" { // 结算状态
|
|
|
+ where += fmt.Sprintf(" AND AccountStatus='%v'", entity.AccountStatus)
|
|
|
+ }
|
|
|
if entity.SettleUser != "" {
|
|
|
where += fmt.Sprintf(" AND SettleUser LIKE '%%%v%%'", entity.SettleUser)
|
|
|
}
|