集中评审总数 年审交费金额

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

@@ -1001,7 +1001,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 				paysvc := paymentinfo.GetPaymentService(utils.DBE)
 				var Amount float64
 				asvc := oilcostmanage.GetOilCostManageService(utils.DBE)
-				Amount = asvc.GetAmount("APPEND",list.SupplierTypeName)
+				Amount = asvc.GetAmount("ANNUAL",list.SupplierTypeName)
 				var payinfo paymentinfo.OilPaymentInfo
 				payinfo.SupplierId = list.SupplierId
 				payinfo.SrcId = list.Id

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

@@ -56,6 +56,15 @@ func (this *TodoListController) GetMyTaskEntityList() {
 	pagingResult = actisvc.GetMyAllTypePagingTasksWithTime(this.User.Id, page.CurrentPage, page.Size, wfNames, supplierTypeCode, supplierName)
 	myTasksRetWithTimes = pagingResult.TaskList
 
+	var jzpsCount int64 = 0 // 准入集中评审的数量
+	for _,item := range myTasksRetWithTimes {
+		wfName := strings.Split(item.ProcessDefinitionId, ":")[0]
+		if (item.TaskName == "集中评审") && (wfName == workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY || wfName == workflow.OIL_ENUSER_SUPPLIER_APPLY ||
+			wfName == workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY || wfName == workflow.OIL_SUPPLIER_INSTORE || wfName ==  workflow.OIL_SECOND_OTHER_SUPPLIER_APPLY) {
+			jzpsCount ++
+		}
+	}
+	pagingResult.Total = pagingResult.Total - jzpsCount
 	//取出各种类型的ID
 	for _,item := range myTasksRetWithTimes {
 		idx := strings.Index(item.BusinessKey, "-")