From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml
index 0b6ebd6..2783dad 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeOrderDao.xml
@@ -15,8 +15,8 @@
<result property="arrivalTime" column="arrival_time"></result>
<result property="orderUserName" column="orderUserName"></result>
<result property="consigneeUserName" column="consigneeUserName"></result>
- <result property="supplyId" column="supplier_id"></result>
- <result property="supplyName" column="supplier_name"></result>
+ <result property="supplierId" column="supplier_id"></result>
+ <result property="supplierName" column="supplier_name"></result>
</resultMap>
<sql id="queryWhereSql">
@@ -41,12 +41,12 @@
<if test="editId != null and editId != ''">
and oo.id != #{editId}
</if>
- <if test="supplyId != null and supplyId != ''">
- and oo.supplier_id != #{supplyId}
+ <if test="supplierId != null and supplierId != ''">
+ and oo.supplier_id != #{supplierId}
</if>
</sql>
- <select id="getOpeOrder" parameterType="java.lang.String" resultMap="OpeOrder" >
+ <select id="getOpeOrder" resultMap="OpeOrder" >
select oo.*, su.name as orderUserName, su2.name as consigneeUserName
from ope_order as oo
left join sys_user as su on oo.order_user_id = su.id
@@ -75,9 +75,9 @@
<include refid="queryWhereSql"/>
</select>
- <insert id="insertOpeOrder" parameterType="com.nanometer.smartlab.entity.OpeOrder">
- insert into ope_order(id, order_code, order_name, status, memo, consignee_user_id, order_user_id, arrival_time, valid_flag, create_time, update_time, supplier_id, supplier_name)
- values (#{id}, #{orderCode}, #{orderName}, #{status}, #{memo}, #{consigneeUserId}, #{orderUserId}, #{arrivalTime}, 1, now(), now(),#{supplyId},#{supplyName})
+ <insert id="insertOpeOrder" parameterType="com.nanometer.smartlab.entity.OpeOrder" useGeneratedKeys = "true" keyProperty = "id">
+ insert into ope_order( order_code, order_name, status, memo, consignee_user_id, order_user_id, arrival_time, valid_flag, create_time, update_time, supplier_id, supplier_name)
+ values ( #{orderCode}, #{orderName}, #{status}, #{memo}, #{consigneeUserId}, #{orderUserId}, #{arrivalTime}, 1, now(), now(),#{supplierId},#{supplierName})
</insert>
<update id="updateOpeOrder" parameterType="com.nanometer.smartlab.entity.OpeOrder">
@@ -90,8 +90,8 @@
<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>
+ <if test="supplierId != null">supplier_id=#{supplierId},</if>
+ <if test="supplierName != null">supplier_name=#{supplierName},</if>
update_time=now()
</set>
where id=#{id}
@@ -118,7 +118,8 @@
oo.status,
oo.order_code orderCode,
oo.order_name orderName,
- oo.order_user_id orderUserId
+ oo.order_user_id orderUserId,
+ oo.consignee_user_id
from ope_apply_order oao
left join ope_order oo on oo.id = oao.ope_order_id
where oo.valid_flag = 1
--
Gitblit v1.9.2