2
3
Yikoo 5 лет назад
Родитель
Сommit
b96834455a

+ 1 - 0
src/dashoo.cn/backend/api/business/oilcontract/contractEvaluationItems/contractEvaluationItems.go

@@ -24,6 +24,7 @@ type OilContractEvaluationItems struct {
 }
 type EvaluationItems struct {
 	Id             int       `json:"Id"`
+	Category       int       `json:"Category"`
 	Type           int       `json:"Type"`
 	ItemId         int       `json:"ItemId"`
 	ParentId       int       `json:"ParentId"`

+ 4 - 2
src/dashoo.cn/backend/api/controllers/oilcontract/contractEvaluationItems.go

@@ -138,7 +138,7 @@ func (this *OilContractEvaluationItemsController) GetTreeList() {
 		var firstTmp contractEvaluationItems.EvaluationItems
 		firstTmp.Content = value.Content
 		firstTmp.ParentId = value.ParentId
-		firstTmp.Id = value.Id
+		firstTmp.Id = value.ItemId
 		firstTmp.SequenceNo = value.SequenceNo
 		firstTmp.NormalScore = value.NormalScore
 		firstTmp.Remark = value.Remark
@@ -147,6 +147,7 @@ func (this *OilContractEvaluationItemsController) GetTreeList() {
 		firstTmp.Type = value.Type
 		firstTmp.Value = value.Value
 		firstTmp.ItemId = value.ItemId
+		firstTmp.Category = value.Category
 
 		var list1 []contractEvaluationItems.OilContractEvaluationItems
 		where1 := "ContentReviewId ='" + Id +"' AND ParentId = " + strconv.Itoa(value.ItemId)
@@ -162,7 +163,7 @@ func (this *OilContractEvaluationItemsController) GetTreeList() {
 			secTmp.Content  = v.Content
 			secTmp.Score    = v.Score
 			secTmp.ParentId = v.ParentId
-			secTmp.Id       = v.Id
+			secTmp.Id       = v.ItemId
 			secTmp.SequenceNo = v.SequenceNo
 			secTmp.NormalScore = v.NormalScore
 			secTmp.Remark = v.Remark
@@ -170,6 +171,7 @@ func (this *OilContractEvaluationItemsController) GetTreeList() {
 			secTmp.Type = v.Type
 			secTmp.Value = v.Value
 			secTmp.ItemId = v.ItemId
+			secTmp.Category=v.Category
 			firstTmp.Son = append(firstTmp.Son, secTmp)
 		}
 		result = append(result, firstTmp)