From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 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 df12aa3..27388fb 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,14 +4,14 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderMapper">
<!--定义查询列-->
<sql id="Column_List">
- *
+ DISTINCT *
</sql>
<!--sql查询片段-->
<sql id="where">
<where>
<!--查询条件自行添加-->
- p.is_del=0
+ is_del=0
<if test="p.id != null and p.id !=''">
and id = #{p.id}
</if>
@@ -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当作查询条件返回对象集合-->
--
Gitblit v1.8.0