daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-10 16:07:09 +08:00
parent 863edee71c
commit 5ffb79b4fa
10 changed files with 170 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/model/manage_material.go
View File

@ -13,18 +13,41 @@ type ManageMaterial struct {
type (
// ManageMaterialBasic 基本信息
ManageMaterialBasic struct {
Code string `json:"code"`
Title string `json:"title"`
Unit int `json:"unit"`
ManufacturerName string `json:"manufacturer_name"`
ID uint64 `json:"id"`
Code string `json:"code"`
Title string `json:"title"`
Price float64 `json:"price"`
ManufacturerName string `json:"manufacturer_name"`
}
ManageMaterialInfo struct {
*model.ManageMaterial
ManufacturerName string `json:"manufacturer_name"`
SupplierName string `json:"supplier_name"`
ManufacturerName string `json:"manufacturer_name"` // 制造商
SupplierName string `json:"supplier_name"` // 合作商
}
)
// Basic 器材信息
func (m *ManageMaterial) Basic(where ...*model.ModelWhere) ([]*ManageMaterialBasic, error) {
mManageSupplier := model.NewManageSupplier()
db := orm.GetDB().Table(m.TableName()+" AS m").
Select("m.id", "m.code", "m.title", "m.price", "manufacturer.name AS manufacturer_name").
Joins(fmt.Sprintf("LEFT JOIN %s AS manufacturer ON m.manufacturer_id = manufacturer.id", mManageSupplier.TableName()))
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
}
out := make([]*ManageMaterialBasic, 0)
if err := db.Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// Materials 器材信息
func (m *ManageMaterial) Materials(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ManageMaterialInfo, error) {
mManageSupplier := model.NewManageSupplier()
@ -32,9 +55,9 @@ func (m *ManageMaterial) Materials(page, pageSize int, count *int64, where ...*m
db := orm.GetDB().Table(m.TableName()+" AS m").
Select("m.*", "manufacturer.name AS manufacturer_name", "s.name AS supplier_name").
Joins(fmt.Sprintf("LEFT JOIN %s AS manufacturer ON m.manufacturer_id = manufacturer.id", mManageSupplier.TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS m_d ON m.id = m_d.material_id AND m_d.is_deleted = %d",
model.NewManageEquipmentMaterial().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS s ON m_d.supplier_id = s.id", mManageSupplier.TableName()))
Joins(fmt.Sprintf("LEFT JOIN %s AS m_s ON m.id = m_s.material_id AND m_s.is_deleted = %d",
model.NewManageMaterialSupplier().TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS s ON m_s.supplier_id = s.id", mManageSupplier.TableName()))
if len(where) > 0 {
for _, wo := range where {