|
@@ -9,18 +9,23 @@
|
|
a.DRI_CREAT_USER creatUser,
|
|
a.DRI_CREAT_USER creatUser,
|
|
a.DRI_BRANCH branch,
|
|
a.DRI_BRANCH branch,
|
|
a.DRI_TYPE typeId,
|
|
a.DRI_TYPE typeId,
|
|
- a.DRI_STATE state
|
|
|
|
- from dw_report_inf a
|
|
|
|
|
|
+ a.DRI_STATE state,
|
|
|
|
+ b.DBRT_TYPE type
|
|
|
|
+ from dw_report_inf a,dw_branch_report_type b
|
|
where
|
|
where
|
|
a.DRI_STATE = '0'
|
|
a.DRI_STATE = '0'
|
|
|
|
+ and a.DRI_TYPE = b.DBRT_ID
|
|
<if test="fileName != null and fileName != ''">
|
|
<if test="fileName != null and fileName != ''">
|
|
- and DRI_FILE_NAME like concat('%', #{fileName,jdbcType=VARCHAR} ,'%')
|
|
|
|
|
|
+ and a.DRI_FILE_NAME like concat('%', #{fileName,jdbcType=VARCHAR} ,'%')
|
|
</if>
|
|
</if>
|
|
<if test="branchId != null and branchId != ''">
|
|
<if test="branchId != null and branchId != ''">
|
|
- and DRI_BRANCH = #{branchId,jdbcType=VARCHAR}
|
|
|
|
|
|
+ and a.DRI_BRANCH = #{branchId,jdbcType=VARCHAR}
|
|
</if>
|
|
</if>
|
|
<if test="date != null and date != ''">
|
|
<if test="date != null and date != ''">
|
|
- and DRI_UPLOAD_DATE between substring(#{date,jdbcType=VARCHAR},1,8) and substring(#{date,jdbcType=VARCHAR},9,16)
|
|
|
|
|
|
+ and a.DRI_UPLOAD_DATE between substring(#{date,jdbcType=VARCHAR},1,8) and substring(#{date,jdbcType=VARCHAR},9,16)
|
|
|
|
+ </if>
|
|
|
|
+ <if test="timeType != null and timeType != ''">
|
|
|
|
+ and b.DBRT_TIME_TYPE = #{timeType,jdbcType=VARCHAR}
|
|
</if>
|
|
</if>
|
|
</select>
|
|
</select>
|
|
</mapper>
|
|
</mapper>
|