From 0730d0e9b5714394241cb3a19f3be38a40c46f7c Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 11 Nov 2020 16:40:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/roc-bak' into roc-bak
---
src/main/resources/mapper/modules/DataMonitoringMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/DataMonitoringMapper.xml b/src/main/resources/mapper/modules/DataMonitoringMapper.xml
index 42c27bf..fca4dcb 100644
--- a/src/main/resources/mapper/modules/DataMonitoringMapper.xml
+++ b/src/main/resources/mapper/modules/DataMonitoringMapper.xml
@@ -60,7 +60,7 @@
FROM
contract_order s
LEFT JOIN member m ON m.id = s.member_id
- where s.create_time >= #{createTime} and (TIMESTAMPDIFF(MINUTE,s.opening_time,s.closing_time) <![CDATA[ <= ]]> 3)
+ where s.create_time >= #{createTime} and (TIMESTAMPDIFF(MINUTE,s.opening_time,s.closing_time) <![CDATA[ <= ]]> 3)
</select>
<select id="selectContractOrderListLessThreeCountInToday" resultType="java.lang.String">
@@ -69,7 +69,8 @@
FROM
contract_order s
LEFT JOIN member m ON m.id = s.member_id
- where s.create_time >= #{createTime}
+ where s.create_time >= #{createTime}
+ and s.member_id = #{memberId}
and TIMESTAMPDIFF(
MINUTE,
s.opening_time,
--
Gitblit v1.9.1