#97314 排序问题

models/wrTrade2.go

@@ -11,6 +11,7 @@ import (
 	"mtp2_if/db"
 	"mtp2_if/mtpcache"
 	"mtp2_if/utils"
+	"sort"
 	"strings"
 )
 
@@ -1836,7 +1837,7 @@ func (r *WrStandardFactoryItem) buildSql() string {
 		" where dp.isvalid = 1" +
 		"   and di.isvalid = 1"
 	sqlId.And("t.WRSTANDARDID", r.WRSTANDARDID)
-	sqlId.Join(" order by t.dgfactoryitemtypeid, t.dgfactoryitemid")
+	sqlId.Join(" order by t.dgfactoryitemtypeid, di.dgfactoryitemvalue")
 	return sqlId.String()
 }
 
@@ -1883,6 +1884,9 @@ func (r *WrStandardFactoryItemEx) GetDataEx() (interface{}, error) {
 			for _, ex := range mapLst {
 				sData = append(sData, ex)
 			}
+			sort.Slice(sData, func(i, j int) bool {
+				return sData[i].DGFACTORYITEMTYPEID < sData[j].DGFACTORYITEMTYPEID
+			})
 		}
 	}
 	return sData, nil
@@ -2098,6 +2102,7 @@ func (r *WrFinanceBuyApply) buildSql() string {
 		"       t.TRADEPRICE," +
 		"       t.TRADEAMOUNT," +
 		"       t.DELIVERYMONTH," +
+		"       t.FINANCETYPE," +
 		"       f.PRODUCTNAME," +
 		"       p.FINANCINGDAYS," +
 		"       p.MARGINRATIO," +