瀏覽代碼

feature(结算): 结算状态的查询

likai 4 年之前
父節點
當前提交
db54a7531d
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. 2 1
      model/account/settle_account_main.go
  2. 4 1
      service/settle_account_main/settle_account_main.go

+ 2 - 1
model/account/settle_account_main.go

@@ -23,7 +23,8 @@ type SettleAccountMainReq struct {
 	AppointUserId int `json:"appointUserId"`
 	AppointUser      string `json:"appointUser"`
 	Status      string `json:"status"`
-	SettleStatus      string `json:"settleStatus"`
+	SettleStatus      string `json:"settleStatus"` // 确认状态
+	AccountStatus     string `json:"accountStatus"`// 结算状态
 	SettleUser      string `json:"settleUser"`
 	FeeType   string `json:"feeType"`
 	AppointStartDate string `json:"appointStartDate"`

+ 4 - 1
service/settle_account_main/settle_account_main.go

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