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-04 11:59:33 +08:00
parent 0234324e60
commit 288c74dc41
4 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/model/manage_material.go
View File

@ -20,14 +20,21 @@ type (
}
ManageMaterialInfo struct {
*model.ManageMaterial
SupplierName string `json:"supplier_name"`
ManufacturerName string `json:"manufacturer_name"`
SupplierName string `json:"supplier_name"`
}
)
// Materials 器材信息
func (m *ManageMaterial) Materials(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ManageMaterialInfo, error) {
mManageSupplier := model.NewManageSupplier()
db := orm.GetDB().Table(m.TableName()+" AS m").
Select("m.*", "s.name AS supplier_name").
Joins(fmt.Sprintf("LEFT JOIN %s AS s ON m.supplier_id = s.id", model.NewManageSupplier().TableName()))
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()))
if len(where) > 0 {
for _, wo := range where {