feat：完善项目

app/model/manage_equipment_material.go

@@ -0,0 +1,34 @@
+package model
+
+import (
+	"ArmedPolice/app/common/model"
+	"ArmedPolice/serve/orm"
+	"fmt"
+)
+
+type ManageEquipmentMaterial struct {
+	*model.ManageEquipmentMaterial
+}
+type ManageEquipmentMaterialInfo struct {
+	ID uint64 `json:"id"`
+	ManageMaterialBasic
+}
+
+// Materials 器材信息
+func (m *ManageEquipmentMaterial) Materials(equipmentID uint64) ([]*ManageEquipmentMaterialInfo, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS e").
+		Select("e.id", "m.code", "m.title", "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.supplier_id = s.id", model.NewManageSupplier().TableName())).
+		Where("e.equipment_id = ? AND e.is_deleted = ?", equipmentID, model.DeleteStatusForNot)
+
+	out := make([]*ManageEquipmentMaterialInfo, 0)
+
+	err := db.Scan(&out).Error
+
+	return out, err
+}
+
+func NewManageEquipmentMaterial() *ManageEquipmentMaterial {
+	return &ManageEquipmentMaterial{model.NewManageEquipmentMaterial()}
+}

app/model/manage_material.go

@@ -10,10 +10,19 @@ type ManageMaterial struct {
 	*model.ManageMaterial
 }
 
-type ManageMaterialInfo struct {
-	*model.ManageMaterial
-	SupplierName string `json:"supplier_name"`
-}
+type (
+	// ManageMaterialBasic 基本信息
+	ManageMaterialBasic struct {
+		Code             string `json:"code"`
+		Title            string `json:"title"`
+		Unit             int    `json:"unit"`
+		ManufacturerName string `json:"manufacturer_name"`
+	}
+	ManageMaterialInfo struct {
+		*model.ManageMaterial
+		SupplierName string `json:"supplier_name"`
+	}
+)
 
 func (m *ManageMaterial) Materials(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ManageMaterialInfo, error) {
 	db := orm.GetDB().Table(m.TableName()+" AS m").