From 89073cd746a04766c5b595a8a27f7d88b425b295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?=
 <11918452+yang-haihang@user.noreply.gitee.com>
Date: Wed, 2 Apr 2025 11:30:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A7=94=E6=89=98=E4=B9=A6=E6=97=B6=EF=BC=8C=E4=B8=8D=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9Edocx=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BD=9C=E4=BA=8E=E6=96=87=E4=B9=A6=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entrustment/service/impl/EntrustmentServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
index f1e666d..e050c17 100644
--- a/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java
@@ -936,7 +936,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         Entrustment entrustment = this.getById(entrustId);
         switch (whatBook) {
             case "entrust":
-                retBookName = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustId + "/" + "鉴定委托书-" + entrustment.getEntrustmentNo() + ("docx".equals(docType) ? ".docx" : ".pdf");
+                retBookName = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + entrustId + "/" + "鉴定委托书-" + entrustment.getEntrustmentNo() + (StringUtils.isNotBlank(docType) ? "." + docType : ".docx");
                 break;
             case "identItemBook":
                 retBookName = OSSDirectoryConstants.IDENTIFY_BOOK_DIRECTORY + "/" + entrustment.getId() + "/" + "鉴定事项确认书-" + entrustment.getEntrustmentNo() + ".docx";
@@ -2513,7 +2513,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
     /**
      * 处理推送数据并更新委托书和确认书
      *
-     * @param entrustId      委托id
+     * @param entrustId 委托id
      */
     private void processPushDataAndUpdateDoc(String entrustId) {
         // 保存当前请求上下文到 RequestContextHolder
@@ -3450,8 +3450,8 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                         .or()
                         .like("c.case_name", keywords))
                 .eq("status", status)
-                .orderByDesc("CAST(SUBSTRING_INDEX(accept_no, '-', 1) AS UNSIGNED)",   // 按年份降序
-                        "CAST(SUBSTRING_INDEX(accept_no, '-', -1) AS UNSIGNED)") // 按流水号降序
+                .last("ORDER BY CAST(SUBSTRING_INDEX(e.accept_no, '-', 1) AS UNSIGNED) DESC, " +
+                        "CAST(SUBSTRING_INDEX(e.accept_no, '-', -1) AS UNSIGNED) DESC") // 按年份降序，再按流水号降序
         );
 
         List<EntrustmentVO> records = voPage.getRecords();