~zhangleilei/supipe.git

			@@ -246,10 +246,15 @@
			</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,

			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,
			@@ -272,6 +277,8 @@
			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}