From af995cb29d795b453266a880501a8e94e24c591f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 26 七月 2023 10:22:01 +0800
Subject: [PATCH] fix add pageInfo, keyword to serverContract return list

---
 service/dataServer.go |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/service/dataServer.go b/service/dataServer.go
index d14e783..ab15917 100644
--- a/service/dataServer.go
+++ b/service/dataServer.go
@@ -100,16 +100,54 @@
 	reportSourceList, _ := ServiceGroup.GetReportSourceList()
 	data.ReportSource = reportSourceList
 
-
 	// get OrderType list
 	orderTypeList, _ := ServiceGroup.GetOrderTypeList()
 	data.OrderType = orderTypeList
 
-
 	// get ServiceContractStatus list
 	serviceContractStatusList, _ := ServiceGroup.GetServiceContractStatusList()
 	data.ServiceContractStatus = serviceContractStatusList
 
+	// get ServiceContractType list
+	serviceContractTypeList, _ := ServiceGroup.GetServiceContractTypeList()
+	data.ServiceContractType = serviceContractTypeList
+
+	// get RefundMethod list
+	refundMethodList, _ := ServiceGroup.GetRefundMethodList()
+	data.RefundMethod = refundMethodList
+
+	// get IsInvoice list
+	isInvoiceList, _ := ServiceGroup.GetIsInvoiceList()
+	data.IsInvoice = isInvoiceList
+
+	// get AccountId list
+	accountIdList, _ := ServiceGroup.GetAccountIdList()
+	data.AccountId = accountIdList
+
+	// get SalesReturnStatus list
+	salesReturnStatusList, _ := ServiceGroup.GetSalesReturnStatusList()
+	data.SalesReturnStatus = salesReturnStatusList
+
+	// get Repository list
+	repositoryList, _ := ServiceGroup.GetRepositoryList()
+	data.Repository = repositoryList
+
+	// get QuotationStatus list
+	quotationStatusList, _ := ServiceGroup.GetQuotationStatusList()
+	data.QuotationStatus = quotationStatusList
+
+	// get Possibility list
+	possibilityList, _ := ServiceGroup.GetPossibilityList()
+	data.Possibility = possibilityList
+
+	// get Status list
+	statusList, _ := ServiceGroup.GetStatusList()
+	data.Status = statusList
+
+	// get Currency list
+	currencyList, _ := ServiceGroup.GetCurrencyList()
+	data.Currency = currencyList
+
 
 	errCode = ecode.OK
 

--
Gitblit v1.8.0