From 1d87d61cb31912ae9f5856cbfe1d763b27156afe Mon Sep 17 00:00:00 2001
From: er <913652501@qq.com>
Date: Fri, 03 Apr 2020 09:41:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 79 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index c85a2ae..3f96fa3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -12,63 +12,64 @@
<where>
<!--查询条件自行添加-->
is_del=0
- <if test="id != null and id !=''">
- and id = #{id}
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="orderId != null and orderId !=''">
- and order_id = #{orderId}
+ <if test="p.orderId != null and p.orderId !=''">
+ and order_id = #{p.orderId}
</if>
- <if test="proId != null and proId !=''">
- and pro_id = #{proId}
+ <if test="p.proId != null and p.proId !=''">
+ and pro_id = #{p.proId}
</if>
- <if test="proName != null and proName !=''">
- and pro_name = #{proName}
+ <if test="p.proName != null and p.proName !=''">
+ and pro_name = #{p.proName}
</if>
- <if test="isShare != null and isShare !=''">
- and is_share = #{isShare}
+ <if test="p.isShare != null and p.isShare !=''">
+ and is_share = #{p.isShare}
</if>
- <if test="isDel != null and isDel !=''">
- and is_del = #{isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="ailightCount != null and ailightCount !=''">
- and ailight_count = #{ailightCount}
+ <if test="p.ailightCount != null and p.ailightCount !=''">
+ and ailight_count = #{p.ailightCount}
</if>
- <if test="recordCount != null and recordCount !=''">
- and record_count = #{recordCount}
+ <if test="p.recordCount != null and p.recordCount !=''">
+ and record_count = #{p.recordCount}
</if>
- <if test="proBegintime != null and proBegintime !=''">
- and pro_begintime = #{proBegintime}
+ <if test="p.proBegintime != null and p.proBegintime !=''">
+ and pro_begintime = #{p.proBegintime}
</if>
- <if test="proEndtime != null and proEndtime !=''">
- and pro_endtime = #{proEndtime}
+ <if test="p.proEndtime != null and p.proEndtime !=''">
+ and pro_endtime = #{p.proEndtime}
</if>
- <if test="enabled != null and enabled !=''">
- and enabled = #{enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="createUserId != null and createUserId !=''">
- and create_user_id = #{createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="createUserName != null and createUserName !=''">
- and create_user_name = #{createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="updateUserId != null and updateUserId !=''">
- and update_user_id = #{updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
- <if test="updateUserName != null and updateUserName !=''">
- and update_user_name = #{updateUserName}
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
</if>
- <if test="createTime != null and createTime !=''">
- and create_time = #{createTime}
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
</if>
- </where>
+ </where>
</sql>
<!--定义根据-ProductOrderDetail当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
- select <include refid="Column_List"/>
+ <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
+ select
+ <include refid="Column_List"/>
from product_order_detail
<include refid="where"/>
order by id desc
@@ -76,8 +77,10 @@
<!--定义根据-ProductOrderDetail当作查询条件返回对象集合-->
<select id="findList" resultType="com.kidgrow.oprationcenter.model.ProductOrderDetail">
- select <include refid="Column_List"/>
+ select
+ <include refid="Column_List"/>
from product_order_detail
+ <include refid="where"/>
order by id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0