From 36d430922c4a6f4c77db56e74a7ccee9a7af06a5 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期三, 22 十一月 2023 11:12:35 +0800
Subject: [PATCH] 20231122_qiuyh_修改钢筋笼打印制作人

---
 hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml |   55 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml b/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
index 927af88..ead721b 100644
--- a/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
+++ b/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
@@ -246,32 +246,39 @@
     </select>
 
     <select id="queryPipeInfoByPipeId" resultType="com.thhy.mobile.modules.biz.pipeinfo.entity.PipeInfoVo">
-        select tsp.produce_number as produceNumber,sp.pro_name as proName,su1.real_name as createUserName,su2.real_name as steelCheckUserName,tsp.quality_time as steelCheckTime,tsp.is_qualified as steelCheckResult,tsp.print_time as printTime,
-
-               sm.mould_num as mouldNum,sm.current_cycle_time as currentCycleTime,sm.max_cycle_time as maxCycleTime,sm.mould_code as mouldCode,
-
-               tpi.ring_num as ringNum,tpi.pipe_num as pipeNum,tpi.into_mod_time as intoModTime,
-               tpi.check_user as checkUser,su.real_name as pipeCheckUserName,tpi.check_time as pipeCheckTime,
-               sd1.dict_name as turnName,
-               sd2.dict_name as reinforcementName,
-               sd3.dict_name as groutingHolesName,
-               sd4.dict_name as blockNumName,
-               sd5.dict_name as sizeName,
-               sd6.dict_name as mouldTypeName
+        select
+            tsp.produce_number as produceNumber,
+            sp.pro_name as proName,
+            spu.real_name as createUserName,
+            su2.real_name as steelCheckUserName,
+            tsp.quality_time as steelCheckTime,
+            tsp.is_qualified as steelCheckResult,
+            tsp.print_time as printTime,
+            sm.mould_num as mouldNum,sm.current_cycle_time as currentCycleTime,sm.max_cycle_time as maxCycleTime,sm.mould_code as mouldCode,
+            tpi.ring_num as ringNum,tpi.pipe_num as pipeNum,tpi.into_mod_time as intoModTime,
+            tpi.check_user as checkUser,su.real_name as pipeCheckUserName,tpi.check_time as pipeCheckTime,
+            sd1.dict_name as turnName,
+            sd2.dict_name as reinforcementName,
+            sd3.dict_name as groutingHolesName,
+            sd4.dict_name as blockNumName,
+            sd5.dict_name as sizeName,
+            sd6.dict_name as mouldTypeName
 
         from t_pipe_info tpi
-                 left join sys_dict sd1 on sd1.dict_id = tpi.turn
-                 left join sys_dict sd2 on sd2.dict_id = tpi.reinforcement
-                 left join sys_dict sd3 on sd3.dict_id = tpi.grouting_holes
-                 left join sys_dict sd4 on sd4.dict_id = tpi.block_num
-                 left join sys_dict sd5 on sd5.dict_id = tpi.size
-                 left join sys_mould sm on sm.mould_id = tpi.mod_id
-                 left join sys_dict sd6 on sd6.dict_id = sm.mould_type
-                 left join t_steel_produce tsp on tsp.produce_number = tpi.produce_number
-                 left join sys_project sp on sp.pro_id = tpi.pro_id
-                 left join sys_users su on su.user_id = tpi.check_user
-                 left join sys_users su1 on su1.user_id = tsp.create_user
-                 left join sys_users su2 on su2.user_id = tsp.quality_user
+        left join sys_dict sd1 on sd1.dict_id = tpi.turn
+        left join sys_dict sd2 on sd2.dict_id = tpi.reinforcement
+        left join sys_dict sd3 on sd3.dict_id = tpi.grouting_holes
+        left join sys_dict sd4 on sd4.dict_id = tpi.block_num
+        left join sys_dict sd5 on sd5.dict_id = tpi.size
+        left join sys_mould sm on sm.mould_id = tpi.mod_id
+        left join sys_dict sd6 on sd6.dict_id = sm.mould_type
+        left join t_steel_produce tsp on tsp.produce_number = tpi.produce_number
+        left join sys_project sp on sp.pro_id = tpi.pro_id
+        left join sys_users su on su.user_id = tpi.check_user
+        left join sys_users su1 on su1.user_id = tsp.create_user
+        left join sys_users su2 on su2.user_id = tsp.quality_user
+        left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
+        left join sys_plat_user spu on spu.user_id = stp.plat_user_id
         where 1=1
         <if test="pipeId != null">
            and tpi.pipe_id = #{pipeId}

--
Gitblit v1.9.3