From 4ef8c28cd2b876fce71714ed2e26dccec8746ad1 Mon Sep 17 00:00:00 2001 From: jun Date: Tue, 10 Dec 2024 11:43:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=8A=A5job=EF=BC=8C=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E4=BA=A7=E7=BA=BF=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java index e0af0cf..e8d2775 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesProductionRecordImpl.java @@ -41,7 +41,11 @@ public class MesProductionRecordImpl implements IMesProductionRecordDao { if (!CollectionUtils.isEmpty(workCenterList)) { hql.append(" and record.workCenterCode not in (:workCenterList)"); } - hql.append(" order by record.reportStatus asc,record.createDatetime asc "); + if(MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == workOrderType){ + hql.append(" order by record.reportStatus asc,record.modifyDatetime asc "); + }else{ + hql.append(" order by record.modifyDatetime asc "); + } Query hqlQuery = entityManager.createQuery(hql.toString(), MesProductionRecord.class); hqlQuery.setParameter("organizeCode", organizeCode); hqlQuery.setParameter("isValid", CommonEnumUtil.VALID);