'供应商评价接口'

src/dashoo.cn/backend/api/business/oilcontract/contractEvaluationItems/contractEvaluationItems.go

@@ -6,6 +6,7 @@ import (
 
 type OilContractEvaluationItems struct {
 	Id              int       `json:"Id" xorm:"not null pk autoincr comment('ID') INT(11) 'Id'"`
+	Category        int       `json:"Category" xorm:"default 0 comment('0二级单位创建1专业处创建') INT(11) 'Category'"`
 	ContentReviewId int       `json:"ContentReviewId" xorm:"default 0 comment('评价ID') INT(11) 'ContentReviewId'"`
 	ParentId        int       `json:"ParentId" xorm:"not null default 0 comment('上级节点ID') INT(11) 'ParentId'"`
 	SequenceNo      string    `json:"SequenceNo" xorm:"default '0' comment('序号') VARCHAR(50) 'SequenceNo'"`
@@ -18,3 +19,20 @@ type OilContractEvaluationItems struct {
 	ModifiedUserId  int       `json:"ModifiedUserId" xorm:"INT(11) 'ModifiedUserId'"`
 	ModifiedBy      string    `json:"ModifiedBy" xorm:"VARCHAR(50) 'ModifiedBy'"`
 }
+type EvaluationItems struct {
+	Id             int       `json:"Id"`
+	ParentId       int       `json:"ParentId"`
+	SequenceNo     string    `json:"SequenceNo"`
+	Content        string    `json:"content"`
+	NormalScore    string    `json:"NormalScore"`
+	LevelCode      int       `json:"LevelCode"`
+	Remark         string    `json:"Remark"`
+	IsDelete       int       `json:"IsDelete"`
+	CreateOn       time.Time `json:"CreateOn"`
+	CreateUserId   int       `json:"CreateUserId"`
+	CreateBy       string    `json:"CreateBy"`
+	ModifiedOn     time.Time `json:"ModifiedOn"`
+	ModifiedUserId int       `json:"ModifiedUserId"`
+	ModifiedBy     string    `json:"ModifiedBy"`
+	Child		   []EvaluationItems
+}

src/dashoo.cn/backend/api/controllers/oilcontract/contractEvaluationItems.go

@@ -2,6 +2,7 @@ package oilcontract
 
 import (
 	"encoding/json"
+	"strconv"
 	"time"
 
 	"dashoo.cn/backend/api/business/baseUser"
@@ -108,6 +109,60 @@ func (this *OilContractEvaluationItemsController) GetEntityList() {
 	this.ServeJSON()
 }
 
+func (this *OilContractEvaluationItemsController) GetTreeList() {
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	orderby := "Id"
+	where := " ParentId = 0 "
+	Id      := this.GetString("ContentReviewId")      // 评价主表ID
+	Category:= this.GetString("Category","0")   // 类型  0 二级部门创建  1 专业处创建
+	if Id != "" {
+		where = where + " and ContentReviewId = '" + Id + "'"
+	}
+	if Category != "" {
+		where = where + " and Category = '" + Category + "'"
+	}
+	svc := contractEvaluationItems.GetOilContractEvaluationItemsService(utils.DBE)
+	var list []contractEvaluationItems.OilContractEvaluationItems
+	var result []contractEvaluationItems.EvaluationItems
+	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, true, &list, where)
+	for _, value := range list {
+		var firstTmp contractEvaluationItems.EvaluationItems
+		firstTmp.Content = value.Content
+		firstTmp.ParentId = value.ParentId
+		firstTmp.Id = value.Id
+		firstTmp.SequenceNo = value.SequenceNo
+		firstTmp.NormalScore = value.NormalScore
+		firstTmp.Remark = value.Remark
+		firstTmp.LevelCode = value.LevelCode
+
+		var list1 []contractEvaluationItems.EvaluationItems
+		where1 := " ParentId = " + strconv.Itoa(value.Id)
+		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, true, &list1, where1)
+		for _, v := range list1 {
+			var secTmp contractEvaluationItems.EvaluationItems
+			secTmp.Content = v.Content
+			secTmp.Content = v.Content
+			secTmp.ParentId = v.ParentId
+			secTmp.Id = v.Id
+			secTmp.SequenceNo = v.SequenceNo
+			secTmp.NormalScore = v.NormalScore
+			secTmp.Remark = v.Remark
+			secTmp.LevelCode = v.LevelCode
+			firstTmp.Child = append(firstTmp.Child, secTmp)
+		}
+		result = append(result, firstTmp)
+	}
+	var datainfo DataInfo
+	datainfo.Items = result
+	datainfo.CurrentItemCount = total
+	//datainfo.PageIndex = page.CurrentPage
+	//datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+
 // @Title 获取字典列表
 // @Description get user by token
 // @Success 200 {object} map[string]interface{}

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -34,13 +34,13 @@ func (this *OilContractReviewController) GetEntityList() {
 	page := this.GetPageInfoForm()
 	where := " 1=1 "
 	orderby := "Id"
-	asc := "desc"
+	asc := " desc "
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
 	if Order != "" && Prop != "" {
 		orderby = Prop
 		if Order == "asc" {
-			asc = "asc"
+			asc = " asc "
 		}
 	}
 	Id := this.GetString("Id")
@@ -177,6 +177,7 @@ func (this *OilContractReviewController) AddEntity() {
 		fmt.Print(i)
 		var temp contractEvaluationItems.OilContractEvaluationItems
 		temp.ContentReviewId = reviewMode.Id
+		temp.Category = 0
 		temp.ParentId = v.ParentId
 		temp.SequenceNo = v.SequenceNo
 		temp.Content = v.Content
@@ -285,6 +286,7 @@ func (this *OilContractReviewController) UpdateEntity() {
 		fmt.Print(i)
 		var temp contractEvaluationItems.OilContractEvaluationItems
 		temp.ContentReviewId = reviewMode.Id
+		temp.Category = 0
 		temp.ParentId = v.ParentId
 		temp.SequenceNo = v.SequenceNo
 		temp.Content = v.Content

src/dashoo.cn/backend/api/routers/router.go

@@ -489,6 +489,12 @@ func init() {
 				&oilcontract.OilContractReviewController{},
 			),
 		),
+		// 合同评价明细
+		beego.NSNamespace("/contract-evaluation",
+			beego.NSInclude(
+				&oilcontract.OilContractEvaluationItemsController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }