update

boxcost/api/bill-produce.go

@@ -53,10 +53,13 @@ func ProduceReview(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	if !isManager(user.Roles) {
 		return nil, errors.New("该用户没有权限")
 	}
-	// 更改状态为已审核
+	// 更改状态为已审核 并签字
+	signs := make([]primitive.ObjectID, 0)
+	signs = append(signs, userId)
 	produce := model.ProduceBill{
 		Reviewed:   1,
 		UpdateTime: time.Now(),
+		SignUsers:  signs,
 	}
 	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionBillProduce, _id, &produce)
 
@@ -89,6 +92,9 @@ func CreateProduceBill(c *gin.Context, apictx *ApiSession) (interface{}, error)
 	}
 
 	bill.Status = "created"
+	if bill.Reviewed == 0 {
+		bill.Reviewed = -1
+	}
 	bill.CreateTime = time.Now()
 	bill.UpdateTime = time.Now()
 

boxcost/api/bill.go

@@ -53,11 +53,15 @@ func PurchaseReview(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	if !isManager(user.Roles) {
 		return nil, errors.New("该用户没有权限")
 	}
-	// 更改状态为已审核
+	// 更改状态为已审核 并签字
+	signs := make([]primitive.ObjectID, 0)
+	signs = append(signs, userId)
 	purchase := model.PurchaseBill{
 		Reviewed:   1,
 		UpdateTime: time.Now(),
+		SignUsers:  signs,
 	}
+
 	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionBillPurchase, _id, &purchase)
 
 }
@@ -97,6 +101,9 @@ func CreateBill(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	}
 
 	bill.Status = "created"
+	if bill.Reviewed == 0 {
+		bill.Reviewed = -1
+	}
 	bill.CreateTime = time.Now()
 	bill.UpdateTime = time.Now()
 

boxcost/db/model/bill.go

@@ -108,7 +108,7 @@ type ProduceBill struct {
 	//类别
 	Type string `bson:"type,omitempty" json:"type"`
 
-	// 进行中 created  已完成 complete 已弃用 deprecated  已审核 reviewed
+	// 进行中 created  已完成 complete 已弃用 deprecated
 	Status     string               `bson:"status,omitempty" json:"status"`
 	Reviewed   int                  `bson:"reviewed,omitempty" json:"reviewed"`   // -1 代表未审核 1已审核
 	SignUsers  []primitive.ObjectID `bson:"signUsers,omitempty" json:"signUsers"` // 多个签名人