From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期三, 23 四月 2025 00:06:54 +0800 Subject: [PATCH] 系统合并 --- inspect-server/src/main/resources/mapper/InsReportMapper.xml | 70 +++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml index f4b741e..fa58164 100644 --- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml +++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml @@ -64,4 +64,74 @@ order by s.create_time desc limit 1 </select> + + <!-- 鎶ュ憡鎶ヨ〃瀵煎嚭 --> + <select id="reportAllExport" resultType="com.ruoyi.inspect.dto.InsReportExport"> + select code, + case when type_source = 0 then '鎴愬搧涓嬪崟' else '鍘熸潗鏂欎笅鍗�' end type_source, + case + when order_type = '鎶芥' then '鎶芥' + when order_type = 'Customer-ordered test' then '濮旀墭妫�楠�' + when order_type = '杩涘巶妫�楠�' then '杩涘巶妫�楠�' + when order_type = 'Quarterly inspection' then '瀛e害妫�楠�' + else '' end order_type, + DATE_FORMAT(create_Time, '%Y-%m-%d %H:%i:%s') create_Time, + write_user_name, + DATE_FORMAT(write_time, '%Y-%m-%d %H:%i:%s') write_time, + case when state = 0 then '寰呮彁浜�' when state = 1 then '宸叉彁浜�' else '' end state, + examine_user, + DATE_FORMAT(examine_time, '%Y-%m-%d %H:%i:%s') examine_time, + case when is_examine = 0 then '涓嶉�氳繃' when is_examine = 1 then '閫氳繃' else '' end is_examine, + examine_tell, + ratify_user, + DATE_FORMAT(ratify_time, '%Y-%m-%d %H:%i:%s') ratify_time, + case when is_ratify = 0 then '涓嶆壒鍑�' when is_ratify = 1 then '鎵瑰噯' else '' end is_ratify, + ratify_tell + from ( + select + ir.*, + io.entrust_code, + u.name write_user_name, + u1.name ratify_user, + u2.name examine_user, + io.type_source, + io.order_type, + io.laboratory, + io.ifs_inventory_id, + iiq.is_copper, + ip.son_laboratory + from ins_report ir + left join ins_order io on io.id = ir.ins_order_id + LEFT JOIN ifs_inventory_quantity iiq ON iiq.id = io.ifs_inventory_id + left join user u on u.id = ir.write_user_id + left join user u1 on u1.id = ir.ratify_user_id + left join user u2 on u2.id = ir.examine_user_id + left join ins_sample is2 on is2.ins_order_id = io.id + left join ins_product ip on ip.ins_sample_id = is2.id + where 1=1 + and ir.is_pass = 1 + <if test="createOrderUser != null and createOrderUser != ''"> + and (ir.write_user_id = #{createOrderUser} or ir.examine_user_id = #{createOrderUser} or ir.ratify_user_id = #{createOrderUser}) + </if> + <if test="queryStatus != null and queryStatus != ''"> + <!-- 寰呮彁浜�--> + <if test='queryStatus == 0'> + and ir.state = 0 + </if> + <!-- 寰呭鎵�--> + <if test='queryStatus == 1'> + and ir.state = 1 and (ir.is_examine != 1 or ir.is_examine is null) + </if> + <!-- 寰呮壒鍑�--> + <if test='queryStatus == 2'> + and ir.state = 1 and ir.is_examine = 1 and (ir.is_ratify != 1 or ir.is_ratify is null) + </if> + </if> + group by ir.id + ) a + <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> + ${ew.customSqlSegment} + </if> + ORDER BY a.create_time DESC + </select> </mapper> -- Gitblit v1.9.3