From 899c7f1e25a9e27683e71f021c8a77af38751c7b Mon Sep 17 00:00:00 2001
From: zhangxin <xin.zhang@le-it.com.cn>
Date: Fri, 20 May 2022 09:53:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/jit/implments/PackOrder.dao.impl.go            |  5 ++++-
 services/pln/implments/CustOrder.Dashborad.impl.go | 10 ++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dao/jit/implments/PackOrder.dao.impl.go b/dao/jit/implments/PackOrder.dao.impl.go
index 15ccd93..ebfc8bb 100644
--- a/dao/jit/implments/PackOrder.dao.impl.go
+++ b/dao/jit/implments/PackOrder.dao.impl.go
@@ -455,9 +455,11 @@ func (impl *PackOrderDAOImplement) SelectClosedPackOrder(startDayTime string, en
 	}
 	datalist := make([]model.PackOrder, 0, 10)
 	packMap := make(map[string]model.PackOrder)
+	packOrderIdLi := make([]string, 0)
 	for _, v := range data {
 		_, ok := packMap[v.PackOrder.PackOrderId]
 		if !ok {
+			packOrderIdLi = append(packOrderIdLi, v.PackOrder.PackOrderId)
 			packOrder := v.PackOrder
 			packOrderItem := v.PackOrderItemLst
 			packOrderItem.SerialOrder = v.SerialOrder
@@ -471,7 +473,8 @@ func (impl *PackOrderDAOImplement) SelectClosedPackOrder(startDayTime string, en
 			packMap[v.PackOrder.PackOrderId] = packOrder
 		}
 	}
-	for _, packOrder := range packMap {
+	for _, packOrderId := range packOrderIdLi {
+		packOrder := packMap[packOrderId]
 		datalist = append(datalist, packOrder)
 	}
 	return datalist, nil
diff --git a/services/pln/implments/CustOrder.Dashborad.impl.go b/services/pln/implments/CustOrder.Dashborad.impl.go
index 3460903..918ad31 100644
--- a/services/pln/implments/CustOrder.Dashborad.impl.go
+++ b/services/pln/implments/CustOrder.Dashborad.impl.go
@@ -20,7 +20,6 @@ import (
 	"LAPP_ACURA_MOM_BACKEND/utils"
 	"container/list"
 	"errors"
-	"fmt"
 	"sort"
 	"strconv"
 	"sync"
@@ -309,7 +308,6 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s
 	//图例001
 	go func(wg *sync.WaitGroup) {
 		DashboardData.DashboardDataPic1, err1 = impl.SelectPic1(user, dayModel, workLineId)
-		fmt.Println("DashboardData.DashboardDataPic1:", DashboardData.DashboardDataPic1)
 		wg.Done() // 操作完成，减少一个计数
 	}(&wg)
 	//图例002
@@ -999,9 +997,9 @@ func (impl *CustOrderServiceImplement) SelectPic1(user *global.User, dayModel *b
 			usefulPackOrderLi = append(usefulPackOrderLi, packOrder)
 		}
 	}
-	sort.Slice(usefulPackOrderLi, func(i, j int) bool {
-		return usefulPackOrderLi[i].CloseTime.Restore().Unix() < usefulPackOrderLi[j].CloseTime.Restore().Unix()
-	})
+	//sort.Slice(usefulPackOrderLi, func(i, j int) bool {
+	//	return usefulPackOrderLi[i].CloseTime.Restore().Unix() < usefulPackOrderLi[j].CloseTime.Restore().Unix()
+	//})
 	custOrderMap := make(map[string]model.CustOrder)
 	displayHourMap := make(map[int]interface{})
 	displayHourLi := make([]int, 0, 24)
@@ -1084,7 +1082,7 @@ func (impl *CustOrderServiceImplement) SelectPic1(user *global.User, dayModel *b
 		for _, data := range hourData {
 			productDataLi = append(productDataLi, data)
 		}
-		impl.QuickSortProductData(productDataLi)
+		//impl.QuickSortProductData(productDataLi)
 		currentTime := todayStartTime.Add(time.Hour * time.Duration(hour))
 		var hourAllUsedTime int
 		for _, productFamilyProductData := range productDataLi {