|
@@ -450,14 +450,15 @@
|
|
|
<result column="tool_code" property="toolCode"/>
|
|
<result column="tool_code" property="toolCode"/>
|
|
|
<result column="last_test_date" property="lastTestDate"/>
|
|
<result column="last_test_date" property="lastTestDate"/>
|
|
|
<result column="isok" property="isok"/>
|
|
<result column="isok" property="isok"/>
|
|
|
|
|
+ <result column="exp_id" property="experimentId"/>
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
|
|
<select id="listExperimentTool" resultMap="ExpResultMap">
|
|
<select id="listExperimentTool" resultMap="ExpResultMap">
|
|
|
SELECT
|
|
SELECT
|
|
|
- <include refid="Base_Column_List"/>, t1.isok
|
|
|
|
|
|
|
+ <include refid="Base_Column_List"/>, t1.isok, #{experimentId} as exp_id
|
|
|
FROM base_safety_tool t
|
|
FROM base_safety_tool t
|
|
|
left join sec_experiment_tool t1 on t.tool_id = t1.tool_id
|
|
left join sec_experiment_tool t1 on t.tool_id = t1.tool_id
|
|
|
- where t1.exp_id=#{expId}
|
|
|
|
|
|
|
+ where t1.exp_id=#{experimentId}
|
|
|
<where>
|
|
<where>
|
|
|
t.del_flag='0'
|
|
t.del_flag='0'
|
|
|
<if test="deptId!=null and deptId!=''">
|
|
<if test="deptId!=null and deptId!=''">
|