From 6557baac627dce769c2b05ab482e4daf262a88ac Mon Sep 17 00:00:00 2001 From: houruijun <411269194@kidgrow.com> Date: Wed, 17 Jun 2020 17:34:01 +0800 Subject: [PATCH] 1.增加工具类 MultipartFileUtils ,支持将MultipartFile类型转换为file类型 2.增加缩略图相关全局配置变量:宽高和生成缩略图的暂存目录(缩略图上传成功后会删除) 3.修改文件上传中心的上传代码,将生成目录和aliyun上传方法抽离独立 4.增加医院logo上传支持接口(可返回缩略图地址) 5.修改登录后回去用户信息不完整bug --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml | 6 ++++-- 1 files changed, 4 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 df12aa3..35dabc4 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 @@ -11,7 +11,7 @@ <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