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/BusinessRecordsMapper.xml | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml index b056ced..9f33dac 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml @@ -11,12 +11,12 @@ <sql id="where"> <where> <!--查询条件自行添加--> - p.is_del=0 + is_del=0 <if test="p.id != null and p.id !=''"> and id = #{p.id} </if> <if test="p.recordTitle != null and p.recordTitle !=''"> - and record_title = #{p.recordTitle} + and record_title like '%${p.recordTitle}%' </if> <if test="p.userId != null and p.userId !=''"> and user_id = #{p.userId} @@ -57,6 +57,12 @@ <if test="p.createTime != null and p.createTime !=''"> and create_time = #{p.createTime} </if> + <if test="p.startTime!= null and p.startTime !=''"> + and create_time >= #{p.startTime} + </if> + <if test="p.endTime!= null and p.endTime !=''"> + and create_time <= #{p.endTime} + </if> <if test="p.updateTime != null and p.updateTime !=''"> and update_time = #{p.updateTime} </if> @@ -70,6 +76,7 @@ from business_records <include refid="where"/> order by id desc + limit 1 </select> <!--定义根据-BusinessRecords当作查询条件返回对象集合--> -- Gitblit v1.8.0