待办已办合同评审展示

src/dashoo.cn/backend/api/business/todolist/todolist.go

@@ -27,4 +27,6 @@ const (
 	// STORAGE string = "7" // 入库
 	INVOICE string = "8" //待开发票
 	INCOME  string = "9" // 收入业务
+	DAILY  string = "10" // 合同日常
+	ANNUAL  string = "11" // 合同年审
 )

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -120,6 +120,7 @@ const (
 	// 目录管理审批流程
 	OIL_Catalog string = "oil_catalog"
 
+
 	/*//企业用户 2 一级物资准入流程图  4 战略合作准入 6外部市场准入
 		OIL_FIRST_ENUSER_SUPPLIER_APPLY string = "oil_first_enuser_supplier_apply"
 		//企业用户准入流程图 1评审准入 5内部多元准入

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

@@ -2,6 +2,8 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/invoiceinfo"
+	"dashoo.cn/backend/api/business/oilcontract/contract"
+	"dashoo.cn/backend/api/business/oilcontract/contractReview"
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/oilcatalog"
@@ -36,7 +38,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 	supplierTypeCode := this.GetString("SupplierTypeCode")
 	supplierName := this.GetString("SupplierName")
 	wfNames := ""
-	wfNames = workflow.OIL_ENUSER_SUPPLIER_APPLY  + "," + workflow.OIL_ENUSER_APPEND_APPLY + "," + workflow.OIL_INFO_CHANGE + "," + workflow.OIL_AUDIT_APPLY + "," + workflow.OIL_SUPPLIER_VERIFY
+	wfNames = workflow.OIL_ENUSER_SUPPLIER_APPLY  + "," + workflow.OIL_ENUSER_APPEND_APPLY + "," + workflow.OIL_INFO_CHANGE + "," + workflow.OIL_AUDIT_APPLY + "," + workflow.OIL_SUPPLIER_VERIFY+ "," + workflow.OIL_DAILY_CONTRACT_EVALUATION
 
 	var todoliststemp []todolist.TodoList
 
@@ -199,6 +201,26 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
 			}
+		} else if wfName == workflow.OIL_DAILY_CONTRACT_EVALUATION {
+			// 合同日常评审
+			var todo todolist.TodoList
+			conRev := contractReview.GetOilContractReviewService(utils.DBE)
+			var contractReviewEntity contractReview.OilContractReview
+			has = conRev.GetEntityById(id, &contractReviewEntity)
+			contractSvc := contract.GetOilContractService(utils.DBE)
+			var contractEntity contract.OilContract
+			contractSvc.GetEntityById(contractReviewEntity.ContractId, &contractEntity)
+			if has {
+				todo.Id = contractReviewEntity.Id
+				todo.Type = todolist.DAILY
+				todo.TaskName = item.TaskName
+				todo.UserName = this.User.Realname
+				todo.CreateTime = item.CreateTime
+				todo.SupplierTypeCode = contractEntity.ContractClass
+				todo.SupplierName = contractEntity.SupplierName
+				todo.Status = contractReviewEntity.Status
+				todoliststemp = append(todoliststemp, todo)
+			}
 		}
 	}