From 0e2879d8e3110b777bcdcff9d7e8e8a44bf95e7d Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Thu, 02 Apr 2020 15:46:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml | 1 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
index 9144f5e..5884ea3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml
@@ -34,10 +34,10 @@
and doctor_tel = #{p.doctorTel}
</if>
<if test="p.needBegintime != null and p.needBegintime !=''">
- and need_begintime = #{p.needBegintime}
+ and need_begintime >= #{p.needBegintime}
</if>
<if test="p.needEndtime != null and p.needEndtime !=''">
- and need_endtime = #{p.needEndtime}
+ and need_endtime <= #{p.needEndtime}
</if>
<if test="p.needTags != null and p.needTags !=''">
and need_tags = #{p.needTags}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
index 023de49..f74a33a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
@@ -59,6 +59,7 @@
ignoreTables:
- sys_user
- sys_logger
+ - data_need
ignoreSqls:
- com.kidgrow.usercenter.mapper.SysRoleMapper.findAll
--
Gitblit v1.8.0