From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面

---
 cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml b/cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml
index 45e16f2..e793981 100644
--- a/cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml
+++ b/cnas-manage/src/main/resources/mapper/ManageDocumentCancelMapper.xml
@@ -24,9 +24,12 @@
 
     <select id="pageManageDocumentCancel" resultMap="BaseResultMap">
         select * from (select mdc.*,
-        u.name createUserName
+        u1.name createUserName,
+        u2.name checkUserName
         from cnas_manage_document_cancel mdc
-        left join user u on mdc.create_user = u.id)A
+        left join user u1 on mdc.create_user = u1.id
+        left join user u2 on mdc.check_user = u2.id
+        )A
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>

--
Gitblit v1.9.3