From 73e65add54f6af4a07b40e90d02e8b37835f5bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 2 Jun 2026 15:50:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(todo):=20=E6=B7=BB=E5=8A=A0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=9D=A5=E6=BA=90=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 QmsTodoItemMapper.xml 中添加字典项关联查询获取来源类型名称
- 为 QmsTodoItemVO 添加 sourceTypeName 字段存储来源类型名称
- 修改查询条件中的字段引用为带表别名的完整路径
- 更新排序规则为按主键 ID 降序排列
---
 .../wms/common/pojo/vo/QmsTodoItemVO.java     |  5 +++++
 .../resources/mapper/QmsTodoItemMapper.xml    | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java
index 3ec1bb0e..11538ea7 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java
@@ -27,6 +27,11 @@ public class QmsTodoItemVO {
      */
     private Long sourceTypeId;
 
+    /**
+     * 来源类型名称
+     */
+    private String sourceTypeName;
+
     /**
      * 来源ID
      */
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsTodoItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsTodoItemMapper.xml
index 24675e82..bf48061e 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsTodoItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsTodoItemMapper.xml
@@ -3,28 +3,29 @@
 <mapper namespace="com.nflg.wms.repository.mapper.QmsTodoItemMapper">
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.QmsTodoItemVO">
-        SELECT *
-        FROM qms_todo_item
+        SELECT qti.*,di.name as source_type_name
+        FROM qms_todo_item qti
+        LEFT JOIN dictionary_item di on qti.source_type_id=di.id
         WHERE 1=1
         <if test="request.isRead != null">
-            AND is_read = #{request.isRead}
+            AND qti.is_read = #{request.isRead}
         </if>
         <if test="request.sourceTypeId != null">
-            AND source_type_id = #{request.sourceTypeId}
+            AND qti.source_type_id = #{request.sourceTypeId}
         </if>
         <if test="request.sourceType != null">
-            AND source_type_id = #{request.sourceType}
+            AND qti.source_type_id = #{request.sourceType}
         </if>
         <if test="userId != null">
-            AND create_user_id = #{userId}
+            AND qti.create_user_id = #{userId}
         </if>
         <if test="request.startDate != null">
-            AND create_time &gt;= #{request.startDate}
+            AND qti.create_time &gt;= #{request.startDate}
         </if>
         <if test="request.endDate != null">
-            AND create_time &lt;= #{request.endDate}
+            AND qti.create_time &lt;= #{request.endDate}
         </if>
-        ORDER BY create_time DESC
+        ORDER BY qti.id DESC
     </select>
 
     <select id="getCount" resultType="com.nflg.wms.common.pojo.vo.TodoItemNotReadNumVO">