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-18 18:28:34 +08:00
parent bcceef741b
commit ba423a2d19
20 changed files with 217 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/model/manage_equipment_material.go
View File

@ -13,7 +13,7 @@ type ManageEquipmentMaterial struct {
// Materials 器材信息
func (m *ManageEquipmentMaterial) Materials(equipmentID uint64) ([]*ManageMaterialBasic, error) {
db := orm.GetDB().Table(m.TableName()+" AS e").
Select("e.id", "m.code", "m.title", "m.unit", "s.name AS manufacturer_name").
Select("e.id", "e.material_id", "m.code", "m.title", "m.price", "m.unit", "s.name AS manufacturer_name").
Joins(fmt.Sprintf("LEFT JOIN %s AS m ON e.material_id = m.id", model.NewManageMaterial().TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS s ON m.manufacturer_id = s.id", model.NewManageSupplier().TableName())).
Where("e.equipment_id = ? AND e.is_deleted = ?", equipmentID, model.DeleteStatusForNot)