From b16f982650e7ac31bf92a1ecc3715df7e2119d67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Wed, 25 Jun 2025 13:35:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BA=A7=E5=93=81=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/pojo/request/ProductHonorAddRequest.java       | 8 ++++++++
 .../src/main/resources/mapper/ProductIntroMapper.xml      | 2 +-
 .../src/main/resources/mapper/ProductModelMapper.xml      | 2 +-
 .../src/main/resources/mapper/ProductTypeMapper.xml       | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductHonorAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductHonorAddRequest.java
index 9780f11d..a81b659d 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductHonorAddRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/ProductHonorAddRequest.java
@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Objects;
 
 @Data
 public class ProductHonorAddRequest {
@@ -15,6 +16,13 @@ public class ProductHonorAddRequest {
      */
     private LocalDate obtainingTime;
 
+    public LocalDate getObtainingTime() {
+        if(Objects.isNull(obtainingTime)){
+            return null;
+        }
+        return obtainingTime.plusDays(1);
+    }
+
     /**
      * 批次号
      */
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductIntroMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductIntroMapper.xml
index 7d926c4b..65d709ca 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductIntroMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductIntroMapper.xml
@@ -19,7 +19,7 @@
                 AND pi.publish_time&lt;=#{request.endTime}
             </if>
         </where>
-        ORDER BY pi.state,pi.sort,pi.dictionary_item_id DESC,pi.publish_time DESC,pi.id DESC
+        ORDER BY pi.state,pi.publish_time DESC,pi.dictionary_item_id DESC,pi.id DESC
     </select>
 
     <select id="get" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductIntroVO">
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
index c6a2f242..456e27ae 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelMapper.xml
@@ -40,7 +40,7 @@
                 AND pm.no LIKE CONCAT('%', #{request.no}, '%')
             </if>
         </where>
-        ORDER BY pm.state,pm.sort,pm.publish_time DESC
+        ORDER BY pm.state,pm.publish_time DESC,pm.series_number,pm.type_number,pm.id DESC
     </select>
 
     <select id="get" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductModelVO">
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
index 3ba47f01..60af77ca 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/ProductTypeMapper.xml
@@ -30,7 +30,7 @@
                 AND pt.name LIKE CONCAT('%', #{request.name}, '%')
             </if>
         </where>
-        ORDER BY pt.state,pt.sort,pt.series_number,pt.name,pt.publish_time DESC
+        ORDER BY pt.state,pt.publish_time DESC,pt.series_number,pt.id DESC
     </select>
 
     <select id="get" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductTypeVO">