From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001 From: 李宇 <986321569@qq.com> Date: 星期三, 18 八月 2021 13:01:21 +0800 Subject: [PATCH] 耗材无供应商也显示,申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材 --- src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml index e4a85d7..0b6ebd6 100644 --- a/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml +++ b/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml @@ -81,8 +81,19 @@ </insert> <update id="updateOpeOrder" parameterType="com.nanometer.smartlab.entity.OpeOrder"> - update ope_order set order_code=#{orderCode}, order_name=#{orderName}, status=#{status}, memo=#{memo}, - consignee_user_id=#{consigneeUserId}, order_user_id=#{orderUserId}, arrival_time=#{arrivalTime}, update_time=now(),supplier_id=#{supplyId},supplier_name=#{supplyName} + update ope_order + <set> + <if test="orderCode != null">order_code=#{orderCode},</if> + <if test="orderName != null">order_name=#{orderName},</if> + <if test="status != null">status=#{status},</if> + <if test="memo != null">memo=#{memo},</if> + <if test="consigneeUserId != null">consignee_user_id=#{consigneeUserId},</if> + <if test="orderUserId != null">order_user_id=#{orderUserId},</if> + <if test="arrivalTime != null">arrival_time=#{arrivalTime},</if> + <if test="supplyId != null">supplier_id=#{supplyId},</if> + <if test="supplyName != null">supplier_name=#{supplyName},</if> + update_time=now() + </set> where id=#{id} </update> @@ -93,4 +104,25 @@ #{item} </foreach> </update> + <update id="updateOpeOrderStatus" parameterType="com.nanometer.smartlab.entity.OpeOrder"> + update ope_order + set status = #{status}, + arrival_time = #{arrivalTime}, + consignee_user_id = #{consigneeUserId} + where id = #{id} + </update> + + <select id="selectParentOrder" resultType="com.nanometer.smartlab.entity.OpeOrder"> + select + oo.id, + oo.status, + oo.order_code orderCode, + oo.order_name orderName, + oo.order_user_id orderUserId + from ope_apply_order oao + left join ope_order oo on oo.id = oao.ope_order_id + where oo.valid_flag = 1 + and oao.ope_apply_id = #{0} + + </select> </mapper> -- Gitblit v1.9.2