Merge branch 'dev' of http://124.70.149.18:10880/sunsheng/box-cost into dev

boxcost/api/supplier.go

@@ -117,6 +117,28 @@ func GetPlanSuppliers(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		List:  []map[string]interface{}{},
 	}
 	listOut := []map[string]interface{}{}
+	if len(query) == 0 {
+		option := &repo.PageSearchOptions{
+			CollectName: repo.CollectionSupplier,
+			Query:       query,
+			Page:        page,
+			Size:        size,
+			Sort:        bson.M{"createTime": -1},
+		}
+		return repo.RepoPageSearch(apictx.CreateRepoCtx(), option)
+	}
+
+	if cate, ok := query["category"]; ok {
+		delete(query, "category")
+		option := &repo.PageSearchOptions{
+			CollectName: repo.CollectionSupplier,
+			Query:       repo.Map{"categorys": bson.M{"$in": []string{cate.(string)}}},
+			Page:        page,
+			Size:        size,
+			Sort:        bson.M{"createTime": -1},
+		}
+		return repo.RepoPageSearch(apictx.CreateRepoCtx(), option)
+	}
 
 	if query["matId"] != nil {
 		matId := query["matId"].(string)

boxcost/db/model/pack.go

@@ -45,7 +45,8 @@ type PackComponent struct {
 
 type ComponentStage struct {
 	Id     string             `bson:"id,omitempty" json:"id"`
-	TypeId primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
+	TypeId primitive.ObjectID `bson:"typeId,omitempty" json:"typeId"`
+
 	// 预算价格
 	OrderPrice float64 `bson:"orderPrice,omitempty" json:"orderPrice"`