From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml
index 45a2a01..73519e7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysSkinCheckRecordDao.xml
@@ -294,6 +294,9 @@
<if test="(record.telphone!=null and record.telphone!='') or (record.telphone!='' and record.telphone==0) ">
and telphone = #{record.telphone}
</if>
+ <if test="record.beginTime != null and record.endTime!=null">
+ and (date(check_time) between #{record.beginTime} and #{record.endTime})
+ </if>
</if>
</where>
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -331,6 +334,9 @@
<if test="(record.telphone!=null and record.telphone!='') or (record.telphone!='' and record.telphone==0) ">
and telphone = #{record.telphone}
</if>
+ <if test="record.beginTime != null and record.endTime!=null">
+ and (date(check_time) between #{record.beginTime} and #{record.endTime})
+ </if>
</if>
</where>
</select>
--
Gitblit v1.9.1