Commit 96cf036e authored by brent's avatar brent

modify

parent 27f834c2
...@@ -148,7 +148,8 @@ func (server *TaskController) BillDetails() { ...@@ -148,7 +148,8 @@ func (server *TaskController) BillDetails() {
queryQB, _ := orm.NewQueryBuilder("mysql") queryQB, _ := orm.NewQueryBuilder("mysql")
queryQB.Select("id", "fee", "type", "time", "result"). queryQB.Select("id", "fee", "type", "time", "result").
From("bills").Where("worker_acc != ''") From("bills").Where("worker_acc != ''").
And("uid != ''")
if info.Role != 1 && info.Role != 2 { if info.Role != 1 && info.Role != 2 {
countQB.And(fmt.Sprintf("uid = '%d'", info.UserID)) countQB.And(fmt.Sprintf("uid = '%d'", info.UserID))
...@@ -350,7 +351,7 @@ func (server *TaskController) Tasks() { ...@@ -350,7 +351,7 @@ func (server *TaskController) Tasks() {
ApiPath: apiPath, ApiPath: apiPath,
Model: model, Model: model,
BaseModel: baseModel, BaseModel: baseModel,
Kind: kind, Kind: models.TaskKind(kind).EnString(),
//Desc: desc, //Desc: desc,
Workload: task.Workload, Workload: task.Workload,
ProfitAcc: task.ProfitAcc, ProfitAcc: task.ProfitAcc,
......
...@@ -176,7 +176,7 @@ type Bills struct { ...@@ -176,7 +176,7 @@ type Bills struct {
//Key int `orm:"column(key);auto"` //Key int `orm:"column(key);auto"`
Id string `json:"id";orm:"column(id)"` Id string `json:"id";orm:"column(id)"`
Type string `json:"type";orm:"column(type)"` Type string `json:"type";orm:"column(type)"`
Kind int `json:"kind,omitempty"` Kind string `json:"kind,omitempty"`
Uid string `json:"uid";orm:"column(uid)"` Uid string `json:"uid";orm:"column(uid)"`
ProfitAcc string `json:"profit_acc";orm:"column(profit_acc)"` ProfitAcc string `json:"profit_acc";orm:"column(profit_acc)"`
Fee string `json:"fee";orm:"column(fee)"` Fee string `json:"fee";orm:"column(fee)"`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment