From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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..34f98d0 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml
@@ -93,4 +93,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