From 65e6e4a2b2e3daba29d2bb6aafa587db4aa097cb Mon Sep 17 00:00:00 2001 From: zhangxin Date: Sat, 14 May 2022 18:18:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddashboard=E5=9B=BE?= =?UTF-8?q?=E4=BE=8B1=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/pln/implments/CustOrder.service.impl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/pln/implments/CustOrder.service.impl.go b/services/pln/implments/CustOrder.service.impl.go index 6f851fc..2ed68f0 100644 --- a/services/pln/implments/CustOrder.service.impl.go +++ b/services/pln/implments/CustOrder.service.impl.go @@ -1709,7 +1709,7 @@ func (impl *CustOrderServiceImplement) QuickSortProductData(values []model.HourP head, tail := 0, len(values)-1 for head < tail { iTime := values[i].LastDoneTime - if iTime.Before(midTime) { + if iTime.After(midTime) { values[i], values[tail] = values[tail], values[i] tail-- } else { From 66b13838889db41079e321cca1e36a5ef67036a6 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Mon, 16 May 2022 09:40:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=BC=BA=E9=99=B7=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A2=84=E8=A3=85=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/pln/implments/CustOrder.Dashborad.iimpl.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/pln/implments/CustOrder.Dashborad.iimpl.go b/services/pln/implments/CustOrder.Dashborad.iimpl.go index e48d6a8..4b7635c 100644 --- a/services/pln/implments/CustOrder.Dashborad.iimpl.go +++ b/services/pln/implments/CustOrder.Dashborad.iimpl.go @@ -699,6 +699,10 @@ func (impl *CustOrderServiceImplement) SelectDefectNumber(user *global.User, day delete(serialOrderMap, serialOrderId) continue } + if serialOrder.OrderType == baseModel.ORDER_TYPE_PRE { + delete(serialOrderMap, serialOrderId) + continue + } custOrder, exist := custOrderMap[serialOrder.CustOrderId] if !exist { custOrder, err = custOrderDao.SelectOne(serialOrder.CustOrderId)