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/SysFeedbackMapper.xml | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml index 49891e0..50c3397 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml @@ -4,7 +4,13 @@ <mapper namespace="com.kidgrow.oprationcenter.mapper.SysFeedbackMapper"> <!--定义查询列--> <sql id="Column_List"> - * + id, + doctor_name, + doctor_tel, + department_name, + hospital_name, + enabled, + create_time </sql> <!--sql查询片段--> @@ -19,7 +25,7 @@ and doctor_id = #{p.doctorId} </if> <if test="p.doctorName != null and p.doctorName !=''"> - and doctor_name = #{p.doctorName} + and doctor_name like concat('%', #{p.doctorName}, '%') </if> <if test="p.doctorTel != null and p.doctorTel !=''"> and doctor_tel = #{p.doctorTel} @@ -57,11 +63,8 @@ <if test="p.updateUserName != null and p.updateUserName !=''"> and update_user_name = #{p.updateUserName} </if> - <if test="p.createTime != null and p.createTime !=''"> - and create_time = #{p.createTime} - </if> - <if test="p.updateTime != null and p.updateTime !=''"> - and update_time = #{p.updateTime} + <if test="p.createTime != null and p.createTime !='' and p.updateTime != null and p.updateTime !=''"> + and (create_time between #{p.createTime} and #{p.updateTime}) </if> </where> </sql> @@ -73,6 +76,7 @@ from sys_feedback <include refid="where"/> order by id desc + limit 1 </select> <!--定义根据-SysFeedback当作查询条件返回对象集合--> -- Gitblit v1.8.0