|
|
@@ -72,16 +72,21 @@
|
|
|
</sql>
|
|
|
<select id="selectList" parameterType="com.platform.dao.dto.fill.FillGatherTaskDetailDTO"
|
|
|
resultType="com.platform.dao.vo.query.fill.FillGatherTaskDetailVO">
|
|
|
- select fill.*
|
|
|
- from t_fill_gather_task_detail as fill
|
|
|
+ select fill.*,,sb.name as sbName,sp.name as positionName,sb.no as sbNo from t_fill_gather_task_detail as fill
|
|
|
+ join t_sb_info sb on fill.sb_id = sb.id left join t_sb_position sp on sb.position_id = sp.id
|
|
|
<where>
|
|
|
- <include refid="List_Condition"/>
|
|
|
+ <if test="taskId != null and taskId != ''">
|
|
|
+ and fill.task_id = #{taskId}
|
|
|
+ </if>
|
|
|
+ <if test="status != null">
|
|
|
+ and fill.status = #{status}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
</select>
|
|
|
|
|
|
<select id="selectVOByTaskId" parameterType="java.lang.String" resultType="com.platform.dao.vo.query.fill.FillGatherTaskDetailVO">
|
|
|
select fill.*,sb.name as sbName,sp.name as positionName,sb.no as sbNo from t_fill_gather_task_detail as fill
|
|
|
- join t_sb_info sb on fill.sb_id = sb.id join t_sb_position sp on sb.position_id = sp.id
|
|
|
+ join t_sb_info sb on fill.sb_id = sb.id left join t_sb_position sp on sb.position_id = sp.id
|
|
|
where fill.task_id = #{taskId}
|
|
|
</select>
|
|
|
</mapper>
|
