From feb347e6c4f94fa7becf9072a685d3ce0c3464fd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 11 十月 2026 11:08:24 +0800
Subject: [PATCH] 天津-奇缘恒艺 录数据需求更改
---
src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml
index 69446e0..3738019 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerRecordMapper.xml
@@ -7,7 +7,8 @@
SELECT
t1.id,
t1.user_id,
- t1.user_name,
+ <!-- user_name 瀛樼殑鏄櫥褰曡处鍙凤紝杩欓噷鏀瑰彇鐢ㄦ埛鏄电О锛涘彇涓嶅埌鏃跺洖閫�涓哄師鍊� -->
+ IFNULL(su.nick_name, t1.user_name) AS user_name,
t2.code,
t2.name,
t2.model,
@@ -17,6 +18,7 @@
FROM
measuring_instrument_ledger_record t1
left join measuring_instrument_ledger t2 on t1.measuring_instrument_ledger_id = t2.id
+ left join sys_user su on t1.user_id = su.user_id
<where>
<!-- 鏌ヨ鏉′欢鍚屼笂 -->
<if test="req.code != null and req.code != ''">
@@ -32,13 +34,14 @@
AND t1.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
</if>
</where>
- ORDER BY t1.update_time DESC
+ ORDER BY t1.create_time DESC
</select>
<select id="list" resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord">
SELECT
t1.id,
t1.user_id,
- t1.user_name,
+ <!-- user_name 瀛樼殑鏄櫥褰曡处鍙凤紝杩欓噷鏀瑰彇鐢ㄦ埛鏄电О锛涘彇涓嶅埌鏃跺洖閫�涓哄師鍊� -->
+ IFNULL(su.nick_name, t1.user_name) AS user_name,
t2.code,
t2.name,
t2.model,
@@ -48,6 +51,7 @@
FROM
measuring_instrument_ledger_record t1
left join measuring_instrument_ledger t2 on t1.measuring_instrument_ledger_id = t2.id
+ left join sys_user su on t1.user_id = su.user_id
<where>
<!-- 鏌ヨ鏉′欢鍚屼笂 -->
<if test="req.code != null and req.code != ''">
@@ -65,4 +69,4 @@
</where>
ORDER BY t1.update_time DESC
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3