fix

controller/census/income_list.go

@@ -14,6 +14,7 @@ import (
 	"hongze/fms_api/services/alarm_msg"
 	"hongze/fms_api/utils"
 	"net/http"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -1568,7 +1569,7 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 				baseData.SetList(respItems[start:end])
 			}
 		} else {
-			resultList := make([]*fms.IncomeSummaryItem, 0)
+			resultList := make(fms.IncomeSummaryItemList, 0)
 			//旧查询
 
 			results, e := fms.GetIncomeHistory(histrtyCond, historyPars)
@@ -1609,6 +1610,7 @@ func getCensusIncomeList(ch chan base.BaseData, req fms.IncomeListReq) (baseData
 				}
 				resultList = append(resultList, results...)
 			}
+			sort.Sort(resultList)
 
 			// 货币列表
 			currencyOB := new(fms.CurrencyUnit)

models/fms/invoice_payment_summary.go

@@ -294,19 +294,19 @@ type NotInvoicePaymentCensusResp struct {
 	NotPaymentCurrencyTotal []*InvoiceListCurrencyTotal `json:"not_payment_currency_total" description:"未开票-分币种总金额"`
 }
 
-type IncomeSummaryItemList []*IncomeSummaryRespItem
+type IncomeSummaryItemList []*IncomeSummaryItem
-
+
-//func (c IncomeSummaryItemList) Len() int {
+func (c IncomeSummaryItemList) Len() int {
-//	return len(c)
+	return len(c)
-//}
+}
-//
+
-//func (c IncomeSummaryItemList) Less(i, j int) bool {
+func (c IncomeSummaryItemList) Less(i, j int) bool {
-//	return c[i].InvoiceDate.Before(c[j].InvoiceDate)
+	return c[i].InvoiceDate.Before(c[j].InvoiceDate)
-//}
+}
-//
+
-//func (c IncomeSummaryItemList) Swap(i, j int) {
+func (c IncomeSummaryItemList) Swap(i, j int) {
-//	c[i], c[j] = c[j], c[i]
+	c[i], c[j] = c[j], c[i]
-//}
+}
 
 type NotInvoicePaymentSummaryItem struct {
 	SummaryId                    int       `json:"summary_id" description:"汇总ID"`