From d7f70ff609b9fd55dccea5d0966e2ea7994c6211 Mon Sep 17 00:00:00 2001
From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com>
Date: Mon, 26 Jan 2026 13:43:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(mapper):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=BC=95=E7=94=A8=E5=92=8C=E6=8E=92=E5=BA=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 SrmAuditIndicatorTemplateDao.xml 中添加 template_id 排序
- 在 SrmAuditWorkOrderDao.xml 中添加 supplier_no 降序排序
- 在 SrmDocumentMapper.xml 中添加 document_type_id 排序
- 修复 SrmSupplierMapper.xml 中的 SQL Server 方括号语法问题
- 统一 SQL 查询中的字段引用格式
---
 .../resources/mapper/audit/SrmAuditIndicatorTemplateDao.xml | 1 +
 src/main/resources/mapper/audit/SrmAuditWorkOrderDao.xml    | 1 +
 src/main/resources/mapper/srm/SrmDocumentMapper.xml         | 2 ++
 src/main/resources/mapper/srm/SrmSupplierMapper.xml         | 6 +++---
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/audit/SrmAuditIndicatorTemplateDao.xml b/src/main/resources/mapper/audit/SrmAuditIndicatorTemplateDao.xml
index 1173f88..a58b02e 100644
--- a/src/main/resources/mapper/audit/SrmAuditIndicatorTemplateDao.xml
+++ b/src/main/resources/mapper/audit/SrmAuditIndicatorTemplateDao.xml
@@ -28,6 +28,7 @@
                 AND a.template_name LIKE '%' + #{query.templateName} + '%'
             </if>
         </where>
+        order by a.template_id
     </select>
 
     <!-- 根据主键查询审计指标 -->
diff --git a/src/main/resources/mapper/audit/SrmAuditWorkOrderDao.xml b/src/main/resources/mapper/audit/SrmAuditWorkOrderDao.xml
index faddcd1..ec6b2d0 100644
--- a/src/main/resources/mapper/audit/SrmAuditWorkOrderDao.xml
+++ b/src/main/resources/mapper/audit/SrmAuditWorkOrderDao.xml
@@ -55,6 +55,7 @@
                 AND #{query.endDate} >= a.plan_date
             </if>
         </where>
+        ORDER BY a.supplier_no DESC
     </select>
 
     <select id="getIndicatorsByTemplateId" resultType="com.xujie.modules.audit.entity.vo.SrmAuditIndicatorVo">
diff --git a/src/main/resources/mapper/srm/SrmDocumentMapper.xml b/src/main/resources/mapper/srm/SrmDocumentMapper.xml
index fa3861d..e7443d8 100644
--- a/src/main/resources/mapper/srm/SrmDocumentMapper.xml
+++ b/src/main/resources/mapper/srm/SrmDocumentMapper.xml
@@ -26,6 +26,8 @@
             AND a.document_type LIKE #{query.documentType}
         </if>
        </where>
+        order by
+        a.document_type_id
     </select>
 
     <select id="querySrmDocumentType" resultType="SrmDocumentTypeDefinitionData">
diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
index 7663ee3..f3c4107 100644
--- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml
+++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml
@@ -140,7 +140,7 @@
     <!-- 新增：用于MyBatis Plus内置分页的查询方法（无ORDER BY，避免SQL Server分页问题） -->
     <select id="queryPage" resultType="SrmSupplierGroupRequsetData">
         SELECT
-        a.id,a.site,a.request_no,a.request_date,a.supplier_no,a.old_supplier_group,a.new_supplier_group,a.reason,a.[status],
+        a.id,a.site,a.request_no,a.request_date,a.supplier_no,a.old_supplier_group,a.new_supplier_group,a.reason,a.status,
         a.create_date,a.create_by,a.update_date,a.update_by,dbo.plm_get_user_display(a.site,a.create_by) requestBy,b.supplier_name
         FROM srm_supplierGroupRequset a
         left join srm_supplier b on a.site=b.site and a.supplier_no=b.supplier_no
@@ -223,8 +223,8 @@
     </insert>
 
     <select id="getContractRequestList" resultType="SrmContractRequsetData">
-        select a.id,a.site,a.request_no,a.request_date,a.supplier_no,a.contractId,a.[status],a.create_date,a.create_by,a.update_date,
-               a.update_by ,b.supplier_name,c.contractNo,c.contractName,c.contractDetail
+        select a.id,a.site,a.request_no,a.request_date,a.supplier_no,a.contractId,a.status,a.create_date,a.create_by,a.update_date,
+        a.update_by ,b.supplier_name,c.contractNo,c.contractName,c.contractDetail
         from srm_contractRequset a
         left join srm_supplier b on a.site=b.site and a.supplier_no=b.supplier_no
         left join srm_supplierContract c on a.site=c.site and a.contractId=c.contractId