From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
index 7d444ff..0a0ff26 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java
@@ -3,6 +3,7 @@
import java.util.Date;
import java.util.List;
+import com.yeshi.fanli.entity.SystemEnum;
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.entity.push.PushGoods;
@@ -36,9 +37,9 @@
* @return
*/
List<PushGoods> listQuery(@Param("start") long start, @Param("count") int count,
- @Param("key") String key, @Param("state") Integer state);
+ @Param("key") String key, @Param("state") Integer state, @Param("system") SystemEnum system);
- long countQuery(@Param("key") String key, @Param("state") Integer state);
+ long countQuery(@Param("key") String key, @Param("state") Integer state, @Param("system") SystemEnum system);
/**
@@ -49,16 +50,16 @@
* @return
*/
List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,
- @Param("uid") Long uid, @Param("pushTime") Date pushTime);
-
+ @Param("uid") Long uid, @Param("pushTime") Date pushTime, @Param("system") SystemEnum system);
+
/**
* 缁熻鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
- * @param start
- * @param count
+ * @param uid
* @param pushTime
+ * @param system
* @return
*/
- long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);
+ long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime, @Param("system") SystemEnum system);
/**
* 鏌ヨ宸叉帹閫佽褰�
@@ -72,6 +73,6 @@
* 闇�瑕佹墽琛屾帹閫佺殑浠诲姟
* @return
*/
- List<PushGoods> listTask();
+ List<PushGoods> listTask( @Param("system") SystemEnum system);
}
\ No newline at end of file
--
Gitblit v1.8.0