From 20818d972592377078162437ddc20e963bcf8ef2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Sep 2020 18:16:38 +0800
Subject: [PATCH] modify
---
src/main/resources/mapper/modules/DataMonitoringMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/DataMonitoringMapper.xml b/src/main/resources/mapper/modules/DataMonitoringMapper.xml
index 2745a2f..fca4dcb 100644
--- a/src/main/resources/mapper/modules/DataMonitoringMapper.xml
+++ b/src/main/resources/mapper/modules/DataMonitoringMapper.xml
@@ -9,6 +9,9 @@
<if test="record.account!=null and record.account!=''">
and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
</if>
+ <if test="record.isTest!=null and record.isTest!=''">
+ and m.account_type= #{record.isTest}
+ </if>
</if>
</where>
order by m.create_time desc
@@ -57,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">
@@ -66,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