From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 27 一月 2021 16:54:34 +0800
Subject: [PATCH] 合并
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index 38cef0d..b55d128 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -64,6 +64,7 @@
<result property="status" column="status" typeHandler="com.nanometer.smartlab.entity.handler.ApplyStatusHandler"></result>
<result property="applyUserId" column="apply_user_id"></result>
<result property="arrivalTime" column="arrival_time"></result>
+ <result property="articleNumber" column="articleNumber"></result>
<result property="projectManage" column="projectManage"/>
<result property="project" column="project"/>
<association property="reagent" javaType="com.nanometer.smartlab.entity.SysReagent">
@@ -470,9 +471,13 @@
<update id="updateOpeApplyInfo" parameterType="java.util.Map">
update
ope_apply
- set status = #{status},
- arrival_time = #{arrivalTime},
- consignee_id = #{consigneeId}
+ set status = #{status}
+ <if test="arrivalTime!=null" >
+ ,arrival_time = #{arrivalTime}
+ </if>
+ <if test="consigneeId!=null" >
+ ,consignee_id = #{consigneeId}
+ </if>
where valid_flag = 1
and id = #{applyId}
</update>
--
Gitblit v1.9.2