feat:完善项目

This commit is contained in:
henry
2021-11-16 11:46:44 +08:00
parent 78128277ff
commit 978918e5aa
14 changed files with 193 additions and 19 deletions

View File

@ -1,11 +1,41 @@
package model
import "ArmedPolice/app/common/model"
import (
"ArmedPolice/app/common/model"
"ArmedPolice/serve/orm"
"fmt"
)
type ManageSupplier struct {
*model.ManageSupplier
}
type ManageSupplierEvaluateInfo struct {
Name string `json:"name"`
Praise int `json:"praise"`
Middle int `json:"middle"`
Negative int `json:"negative"`
}
// Evaluate 评分统计
// Deprecated: Test
func (m *ManageSupplier) Evaluate(kind model.ManageSupplierKind, limit int) ([]*ManageSupplierEvaluateInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS s").
Select("s.name", "e.praise", "e.middle", "e.negative").
Joins(fmt.Sprintf("LEFT JOIN %s AS e ON s.id = e.supplier_id AND e.is_deleted = %d",
model.NewManageSupplierEvaluate().TableName(), model.DeleteStatusForNot)).
Where("s.is_deleted = ?", model.DeleteStatusForNot).
Where("s.kind = ?", kind).
Where("e.id > ?", 0)
out := make([]*ManageSupplierEvaluateInfo, 0)
err := db.Order("e.praise " + model.OrderModeToDesc).Order("e.negative " + model.OrderModeToAsc).
Limit(limit).Scan(&out).Error
return out, err
}
func NewManageSupplier() *ManageSupplier {
return &ManageSupplier{model.NewManageSupplier()}
}

View File

@ -0,0 +1,13 @@
package model
import (
"ArmedPolice/app/common/model"
)
type ManageSupplierEvaluate struct {
*model.ManageSupplierEvaluate
}
func NewManageSupplierEvaluate() *ManageSupplierEvaluate {
return &ManageSupplierEvaluate{model.NewManageSupplierEvaluate()}
}

View File

@ -20,6 +20,10 @@ type WorkRepairInfo struct {
BreakdownTitle string `json:"breakdown_title"`
}
type WorkRepairEvaluateInfo struct {
Name string `json:"name"`
}
// Repairs 维修工单信息
func (m *WorkRepair) Repairs(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*WorkRepairInfo, error) {
db := orm.GetDB().Table(m.TableName()+" r").