2
3
baichengfei 5 лет назад
Родитель
Сommit
c7e1b3acbb
1 измененных файлов с 22 добавлено и 0 удалено
  1. 22 0
      src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

+ 22 - 0
src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

@@ -284,6 +284,8 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		wfNames = workflow.OIL_SUPPLIER_VERIFY
 		wfNames = workflow.OIL_SUPPLIER_VERIFY
 	} else if stype == "9" {
 	} else if stype == "9" {
 		wfNames = workflow.OIL_Catalog
 		wfNames = workflow.OIL_Catalog
+	} else if stype == "10" {
+		wfNames = workflow.OIL_DAILY_CONTRACT_EVALUATION
 	}
 	}
 
 
 	var todoliststemp []todolist.TodoList
 	var todoliststemp []todolist.TodoList
@@ -435,6 +437,26 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.CreateTime = item.CreateTime
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
 				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)
+			}
 		}
 		}
 
 
 	}
 	}