From 4e2381fe3f9228d89ba82c703416b10da6dfdf64 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 31 五月 2019 10:15:04 +0800
Subject: [PATCH] 提现增加资金预测

---
 fanli/src/main/java/com/yeshi/fanli/mapping/push/PushInfoMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/push/PushInfoMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/push/PushInfoMapper.xml
index 5386182..a11abfe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/push/PushInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/push/PushInfoMapper.xml
@@ -77,7 +77,7 @@
    </delete>
   
   <select id="listQuery" resultMap="BaseResultMap">
-  	SELECT * FROM  yeshi_ec_push_info
+  	SELECT p.*,IF(`pi_control_time` IS NOT NULL,pi_control_time,`pi_create_time`) AS orderyTime FROM  yeshi_ec_push_info p
 	WHERE pi_type = #{type}
 		<if test="key != null and key !='' ">
 			<if test="keyType == 1">AND pi_title like '%#{key}%'</if>
@@ -87,9 +87,9 @@
 		<if  test="state != null">
 			AND pi_state = #{state}
 		</if>
-  	ORDER BY pi_state,pi_push_time DESC
+  	ORDER BY orderyTime DESC
   	LIMIT ${start},${count}
-  </select>  
+  </select>
   
   <select id="countQuery" resultType="java.lang.Long">
   	SELECT IFNULL(COUNT(pi_id),0) FROM  yeshi_ec_push_info

--
Gitblit v1.8.0