后:2期bug

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

@@ -120,7 +120,7 @@ func (this *OilContractEvaluationItemsController) GetTreeList() {
 	where := " ParentId = 0 "
 	Id      := this.GetString("ContentReviewId")     // 评价主表ID
 	Category:= this.GetString("Category","0")   // 类型  0 二级部门创建  1 专业处创建
-	Type    := this.GetString("Type","1")       //  项类型 1分值 2布尔
+	Type    := this.GetString("Type","0")       //  项类型 1分值 2布尔
 	if Id != "" {
 		where = where + " and ContentReviewId = '" + Id + "'"
 	}

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

@@ -3,6 +3,7 @@ package oilcontract
 import (
 	"dashoo.cn/backend/api/business/oilcontract/contract"
 	"dashoo.cn/backend/api/business/oilcontract/contractEvaluationItems"
+	"dashoo.cn/backend/api/business/oilcontract/evaluationItems"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/business2/permission"
@@ -505,8 +506,10 @@ func (this *OilContractReviewController) UpdateEntity() {
 	for i,v := range modeVO.Items{
 		fmt.Print(i)
 		var temp contractEvaluationItems.OilContractEvaluationItems
+		var temp1 evaluationItems.OilEvaluationItems
+		svc.GetEntityById(v.ItemId, &temp1)
 		temp.ContentReviewId ,_ = strconv.Atoi(id)
-		temp.Type     = v.Category
+		temp.Type     = temp1.Category
 		temp.ItemId   = v.ItemId
 		temp.Category = 0
 		temp.ParentId = v.ParentId
@@ -533,7 +536,9 @@ func (this *OilContractReviewController) UpdateEntity() {
 		fmt.Print(i)
 		var temp2 contractEvaluationItems.OilContractEvaluationItems
 		temp2.ContentReviewId ,_ = strconv.Atoi(id)
-		temp2.Type     = v.Category
+		var temp1 evaluationItems.OilEvaluationItems
+		svc.GetEntityById(v.ItemId, &temp1)
+		temp2.Type     = temp1.Category
 		temp2.ItemId   = v.ItemId
 		temp2.Category = 1
 		temp2.ParentId = v.ParentId

src/dashoo.cn/backend/api/controllers/oilsupplier/invoiceinfo.go

@@ -267,7 +267,7 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else if invoiceJson.Status == "0000" && invoiceJson.Fpqqlsh != "" {
-		time.Sleep(time.Second * 5)
+		time.Sleep(time.Second * 10)
 		var sel SelectInvoiceJson
 		key := paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceKey64")
 		sel.Identity = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceIdentity")