|
@@ -1061,6 +1061,8 @@ func GetProductPlan(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
billIsSend := map[string]bool{}
|
|
|
billReviewed := map[string]int32{}
|
|
|
billIsAck := map[string]bool{}
|
|
|
+
|
|
|
+ billData := map[string]interface{}{}
|
|
|
if plan.Pack != nil && plan.Pack.Components != nil {
|
|
|
for _, comp := range plan.Pack.Components {
|
|
|
if comp.Stages != nil {
|
|
@@ -1084,8 +1086,10 @@ func GetProductPlan(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
ok, state := repo.RepoSeachDocMap(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
|
|
|
CollectName: collectName,
|
|
|
Query: repo.Map{"_id": stage.BillId},
|
|
|
- Project: []string{"status", "isSend", "reviewed", "isAck", "serialNumber", "sendTo", "remark"}})
|
|
|
+ // Project: []string{"status", "isSend", "reviewed", "isAck", "serialNumber", "sendTo", "remark"}
|
|
|
+ })
|
|
|
if ok {
|
|
|
+ billData[stage.BillId] = state
|
|
|
billStates[stage.BillId] = state["status"].(string)
|
|
|
billSerialNumber[stage.BillId] = state["serialNumber"].(string)
|
|
|
if v, ok := state["sendTo"]; ok {
|
|
@@ -1126,6 +1130,7 @@ func GetProductPlan(c *gin.Context, apictx *ApiSession) (interface{}, error) {
|
|
|
"billIsAck": billIsAck,
|
|
|
"billSerialNumber": billSerialNumber,
|
|
|
"billSendTo": billSendTo,
|
|
|
+ "billData": billData,
|
|
|
}, nil
|
|
|
}
|
|
|
|