From dde937a6cda1d25de685844fad41b10a7f716cdf Mon Sep 17 00:00:00 2001
From: yanyang <rainieyanic@outlook.com>
Date: Wed, 22 Mar 2023 14:10:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packing/service/impl/WoCompensationPowerServiceBizImpl.java | 2 +-
 .../cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java | 1 +
 .../service/impl/WoPackagingBoxSubstrateServiceBizImpl.java     | 2 +-
 .../cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java
index ec21503..11303fc 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java
@@ -48,7 +48,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
     @Override
     public PageData<WoCompensationPowerDTO> page (Map<String, Object> params){
         IPage<WoCompensationPower> page = baseDao.selectPage(
-                getPage(params, WoCompensationPower.ID, true),
+                getPage(params, WoCompensationPower.CREATE_TIME, false),
                 getWrapper(params)
         );
         return getPageData(page, WoCompensationPowerDTO.class);
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
index 5571455..02bdf31 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
@@ -142,6 +142,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
         WoPackagingBoxDTO dto = ConvertUtils.sourceToTarget(entity, WoPackagingBoxDTO.class);
         QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo());
+        wrapper.orderByDesc(WoPackagingBoxSubstrate.CREATE_TIME);
         List<WoPackagingBoxSubstrate> woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper);
         dto.setSubstrateList(woPackagingBoxSubstrateList);
         return dto;
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
index 2907860..220235f 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
@@ -58,7 +58,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
     @Override
     public PageData<WoPackagingBoxSubstrateDTO> page (Map<String, Object> params){
         IPage<WoPackagingBoxSubstrate> page = baseDao.selectPage(
-                getPage(params, WoPackagingBoxSubstrate.SLOT, true),
+                getPage(params, WoPackagingBoxSubstrate.CREATE_TIME, false),
                 getWrapper(params)
         );
         return getPageData(page, WoPackagingBoxSubstrateDTO.class);
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java
index 8f81ca9..4aadef9 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java
@@ -48,7 +48,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
     @Override
     public PageData<WoPowerLevelDTO> page (Map<String, Object> params){
         IPage<WoPowerLevel> page = baseDao.selectPage(
-                getPage(params, WoPowerLevel.ID, true),
+                getPage(params, WoPowerLevel.CREATE_TIME, false),
                 getWrapper(params)
         );
         return getPageData(page, WoPowerLevelDTO.class);