合同年审去掉合同id

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

@@ -1,7 +1,6 @@
 package oilcontract
 
 import (
-	"dashoo.cn/backend/api/business/oilcontract/contract"
 	//"dashoo.cn/backend/api/business/oilcontract/contractReview"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/workflow"
@@ -490,11 +489,6 @@ func (this *OilContractSumScoreController) UnitAuditEntity() {
 	var contractSumEntity contractSumScore.OilContractSumScore
 	conRev.GetEntityById(Id, &contractSumEntity)
 
-	//取出合同表
-	contractSvc := contract.GetOilContractService(utils.DBE)
-	var contractEntity contract.OilContract
-	contractSvc.GetEntityById(contractSumEntity.ContractId, &contractEntity)
-
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	//启动工作流
 	businessKey := contractSumEntity.Businesskey
@@ -503,7 +497,7 @@ func (this *OilContractSumScoreController) UnitAuditEntity() {
 	if processInstanceId == "" {
 		//启动工作流
 		businessKey = Id + "-" + strconv.Itoa(contractSumEntity.AuditIndex)
-		processInstanceId = svcActiviti.StartProcess2(workflow.OIL_ANNUAL_CONTRACT_EVALUATION, businessKey, this.User.Id, "1", contractEntity.ContractClass, contractEntity.SupplierName)
+		processInstanceId = svcActiviti.StartProcess2(workflow.OIL_ANNUAL_CONTRACT_EVALUATION, businessKey, this.User.Id, "1", contractSumEntity.ContractClass, contractSumEntity.SupplierName)
 		if len(processInstanceId) <= 0 {
 			panic("工作流启动失败！")
 		}

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

@@ -229,17 +229,14 @@ func (this *TodoListController) GetMyTaskEntityList() {
 			var contractSumEntity contractSumScore.OilContractSumScore
 			has = conRev.GetEntityById(id, &contractSumEntity)
 
-			contractSvc := contract.GetOilContractService(utils.DBE)
-			var contractEntity contract.OilContract
-			contractSvc.GetEntityById(contractSumEntity.ContractId, &contractEntity)
 			if has {
 				todo.Id = contractSumEntity.Id
 				todo.Type = todolist.ANNUAL
 				todo.TaskName = item.TaskName
 				todo.UserName = this.User.Realname
 				todo.CreateTime = item.CreateTime
-				todo.SupplierTypeCode = contractEntity.ContractClass
-				todo.SupplierName = contractEntity.SupplierName
+				todo.SupplierTypeCode = contractSumEntity.ContractClass
+				todo.SupplierName = contractSumEntity.SupplierName
 				todo.Status = contractSumEntity.Status
 				todoliststemp = append(todoliststemp, todo)
 			}
@@ -488,17 +485,14 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 			var contractSumEntity contractSumScore.OilContractSumScore
 			has = conRev.GetEntityById(id, &contractSumEntity)
 
-			contractSvc := contract.GetOilContractService(utils.DBE)
-			var contractEntity contract.OilContract
-			contractSvc.GetEntityById(contractSumEntity.ContractId, &contractEntity)
 			if has {
 				todo.Id = contractSumEntity.Id
 				todo.Type = todolist.ANNUAL
 				todo.TaskName = item.TaskName
 				todo.UserName = this.User.Realname
 				todo.CreateTime = item.CreateTime
-				todo.SupplierTypeCode = contractEntity.ContractClass
-				todo.SupplierName = contractEntity.SupplierName
+				todo.SupplierTypeCode = contractSumEntity.ContractClass
+				todo.SupplierName = contractSumEntity.SupplierName
 				todo.Status = contractSumEntity.Status
 				todoliststemp = append(todoliststemp, todo)
 			}