From bd8213ddfe04f41b7ad0f4c6377afbe39a44b4af Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 18 一月 2019 15:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
index c54e672..e2016f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/ExtractMapper.xml
@@ -259,18 +259,18 @@
 		SELECT IFNULL(COUNT(et.id), 0)AS total,IFNULL(SUM(CASE WHEN et.state =
 		1 THEN 1 ELSE 0 END),0) AS succeed,IFNULL(SUM(CASE WHEN et.state = 2
 		THEN 1 ELSE 0 END),0) AS fails
-		FROM yeshi_ec_extract et WHERE (et.state=1 OR et.state= 2) AND 
-		 <![CDATA[
-			 FROM_UNIXTIME(et.extractTime/1000) >=CURDATE();
-		 ]]>
+		FROM yeshi_ec_extract et
+		LEFT JOIN `yeshi_ec_extract_audit_record` ar ON ar.`extractId` = et.`id`
+		WHERE  ar.`id` IS NOT NULL 
+			   AND FROM_UNIXTIME(ar.`auditTime`/1000,'%y%m%d') = CURDATE()
 	</select>
 
 	<select id="getTodayTotalSuccessMoney" resultType="java.math.BigDecimal">
 		SELECT IFNULL(ROUND(SUM(money),2) ,0) AS moneys
-		FROM yeshi_ec_extract et WHERE et.state=1 AND 
-		  <![CDATA[
-			 FROM_UNIXTIME(et.extractTime/1000) >=CURDATE();
-		 ]]>
+		FROM yeshi_ec_extract et 
+		LEFT JOIN `yeshi_ec_extract_audit_record` ar ON ar.`extractId` = et.`id`
+		WHERE et.state=1 AND  ar.`id` IS NOT NULL 
+			AND FROM_UNIXTIME(ar.`auditTime`/1000,'%y%m%d') = CURDATE()
 	</select>
 
 	<select id="countTotalSuccess" resultType="java.util.HashMap">

--
Gitblit v1.8.0