From 3b7f9e4425ad1fe34afb6a3a121c5b943432db5e Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 22 十一月 2023 13:39:31 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml
index da73957..53bd359 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml
@@ -57,6 +57,9 @@
<if test="isUse != null">
is_use,
</if>
+ <if test="platUserId != null">
+ plat_user_id,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="steelPrintId != null">
@@ -92,28 +95,34 @@
<if test="isUse != null">
#{isUse,jdbcType=INTEGER},
</if>
+ <if test="platUserId != null">
+ #{platUserId,jdbcType=VARCHAR},
+ </if>
</trim>
</insert>
<select id="steelPrintList" resultType="com.thhy.materials.modules.biz.rebarprint.entity.TSteelPrint">
- select tsp.steel_print_id as steelPrintId,
- tsp.pro_id as proId,
- tsp.size_id as sizeId,
- tsp.reinforcement_id as reinforcementId,
- tsp.block_num as blockNum,
- tsp.print_num as printNum,
- tsp.create_user as createUser,
- tsp.create_time as createTime,
- sp.pro_name as proName,sd.dict_name as sizeName,
- sd1.dict_name as reinforcementName,
- sd2.dict_name as blockName,
- su.real_name as realName
- from t_steel_print tsp
- left join sys_project sp on tsp.pro_id=sp.pro_id
- left join sys_dict sd on tsp.size_id=sd.dict_id
- left join sys_dict sd1 on tsp.reinforcement_id=sd1.dict_id
- left join sys_dict sd2 on tsp.block_num=sd2.dict_id
- left join sys_users su on tsp.create_user=su.user_id
- where tsp.is_use=1
+ select
+ tsp.steel_print_id as steelPrintId,
+ tsp.pro_id as proId,
+ tsp.size_id as sizeId,
+ tsp.reinforcement_id as reinforcementId,
+ tsp.block_num as blockNum,
+ tsp.print_num as printNum,
+ tsp.create_user as createUser,
+ tsp.create_time as createTime,
+ sp.pro_name as proName,sd.dict_name as sizeName,
+ sd1.dict_name as reinforcementName,
+ sd2.dict_name as blockName,
+ su.real_name as realName,
+ spu.real_name as platUserName
+ from t_steel_print tsp
+ left join sys_plat_user spu on spu.user_id = tsp.plat_user_id
+ left join sys_project sp on tsp.pro_id=sp.pro_id
+ left join sys_dict sd on tsp.size_id=sd.dict_id
+ left join sys_dict sd1 on tsp.reinforcement_id=sd1.dict_id
+ left join sys_dict sd2 on tsp.block_num=sd2.dict_id
+ left join sys_users su on tsp.create_user=su.user_id
+ where tsp.is_use=1
<if test="proId!=null and proId!='' ">
and tsp.pro_id=#{proId}
</if>
--
Gitblit v1.9.3