From be63f61992b0120e0ea6df6657141d0c8e245172 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 20 Aug 2020 12:08:23 +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/ProductOrderMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
index 21ed839..81c0769 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--sql查询片段-->
@@ -19,7 +19,7 @@
and hospital_id = #{p.hospitalId}
</if>
<if test="p.hospitalName != null and p.hospitalName !=''">
- and hospital_name = #{p.hospitalName}
+ and hospital_name like concat('%',#{p.hospitalName},'%')
</if>
<if test="p.departmentId != null and p.departmentId !=''">
and department_id = #{p.departmentId}
@@ -66,6 +66,7 @@
<if test="p.createTime != null and p.createTime !=''">
and create_time = #{p.createTime}
</if>
+ <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>
</where>
</sql>
@@ -76,6 +77,7 @@
from product_order
<include refid="where"/>
order by id desc
+ limit 1
</select>
<!--定义根据-ProductOrder当作查询条件返回对象集合-->
@@ -86,4 +88,8 @@
<include refid="where"/>
order by id desc
</select>
+ <update id="delProductDetail">
+ UPDATE product_order_record SET is_del=1,update_time=now() WHERE order_id= #{orderId};
+ UPDATE product_order_detail SET is_del=1,update_time=now() WHERE order_id= #{orderId};
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0