From 15c3bb57348f257342d8f5c8d38bd59decea2c7a Mon Sep 17 00:00:00 2001
From: gongbaoxiong <DIMO1992>
Date: Fri, 31 May 2024 17:12:35 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/database/eas/dao/xml/AllocationBillMapper.xml | 2 +-
 .../eas/service/impl/AllocationBillServiceImpl.java      | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml
index 7c963d0..6b67741 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/dao/xml/AllocationBillMapper.xml
@@ -42,7 +42,7 @@
 
     <select id="allocationDetailPage" resultType="org.nl.wms.database.eas.dto.AllocationBillQuery">
         SELECT * FROM (
-                          SELECT V.*, ROW_NUMBER() OVER (ORDER BY V.CJSJ DESC) AS RNUM
+                          SELECT V.*, ROW_NUMBER() OVER (ORDER BY V.YWRQ DESC) AS RNUM
                           FROM EAS_NOBLE.V_UC_STOCKTRANSFERBILL V
                           WHERE V.DJID = #{djid}
                       )
diff --git a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
index eca64d8..17992ac 100644
--- a/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
+++ b/nlsso-server/src/main/java/org/nl/wms/database/eas/service/impl/AllocationBillServiceImpl.java
@@ -86,7 +86,14 @@ public class AllocationBillServiceImpl extends ServiceImpl<AllocationBillMapper,
         // 查询总记录数
         long totalCount = allocationBillMapper.getTotalCount(params.getDjid());
         List<AllocationBillQuery> allocationBillList = allocationBillMapper.allocationDetailPage(params.getPage(), params.getSize(), params.getDjid(), params.getFuzzy());
-        if (!allocationBillList.isEmpty()) {
+        if (allocationBillList.isEmpty()) {
+            allocationBillList = allocationBillList.stream().peek(r -> {
+                if (r.getJhdrrq().contains("/") || r.getJhdcrq().contains("/")) {
+                    r.setJhdrrq(LocalDateTime.parse(r.getJhdrrq(), DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")).toLocalDate().toString());
+                    r.setJhdcrq(LocalDateTime.parse(r.getJhdcrq(), DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss")).toLocalDate().toString());
+                }
+            }).collect(Collectors.toList());
+        } else {
             // 获取更新列表
             List<AllocationBill> updateList = allocationBillMapper.selectList(
                     new LambdaQueryWrapper<AllocationBill>().eq(AllocationBill::getDjid, allocationBillList.get(0).getDjid()));