From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml
index 106206c..e6bec02 100644
--- a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml
@@ -3,10 +3,16 @@
<mapper namespace="com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursTemporaryMapper">
<!-- 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏 -->
+
<select id="getWorkingHoursByOrderId"
- resultType="com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary">
+ resultType="com.ruoyi.performance.dto.AuxiliaryOutputWorkingHoursTemporaryDto">
select *
- from auxiliary_output_working_hours_temporary
+ from (select aowh.*,
+ user.name,
+ ip.cable_tag
+ FROM auxiliary_output_working_hours_temporary aowh
+ left join ins_product ip on ip.id = aowh.ins_product_id
+ left join user on user.id=aowh.`check`) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3