From 6a47350594a4843f6cc36e5c94902d6fa97a6d4a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/PushGoodsMapper.java | 146 +++++++++++++++++++++++++-----------------------
1 files changed, 76 insertions(+), 70 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 056dae0..7d444ff 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
@@ -1,71 +1,77 @@
-package com.yeshi.fanli.dao.mybatis.push;
-
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.entity.push.PushGoods;
-
-public interface PushGoodsMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(PushGoods record);
-
- int insertSelective(PushGoods record);
-
- PushGoods selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(PushGoods record);
-
- int updateByPrimaryKey(PushGoods record);
-
- /**
- * 鎵归噺鍒犻櫎
- * @param list
- * @return
- */
- int deleteBatchByPrimaryKey(List<Long> list);
-
- /**
- * 鍚庣鍒楄〃鏌ヨ
- * @param start
- * @param count
- * @param key
- * @return
- */
- List<PushGoods> listQuery(@Param("start") long start, @Param("count") int count,
- @Param("key") String key, @Param("state") Integer state);
-
- long countQuery(@Param("key") String key, @Param("state") Integer state);
-
-
- /**
- * 鑾峰彇鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
- * @param start
- * @param count
- * @param pushTime
- * @return
- */
- List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,
- @Param("uid") Long uid, @Param("pushTime") Date pushTime);
-
- /**
- * 缁熻鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
- * @param start
- * @param count
- * @param pushTime
- * @return
- */
- long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);
-
- /**
- * 鏌ヨ宸叉帹閫佽褰�
- * @param list
- * @return
- */
- List<PushGoods> listByPushState(List<Long> list);
-
-
+package com.yeshi.fanli.dao.mybatis.push;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.push.PushGoods;
+
+public interface PushGoodsMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(PushGoods record);
+
+ int insertSelective(PushGoods record);
+
+ PushGoods selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(PushGoods record);
+
+ int updateByPrimaryKey(PushGoods record);
+
+ /**
+ * 鎵归噺鍒犻櫎
+ * @param list
+ * @return
+ */
+ int deleteBatchByPrimaryKey(List<Long> list);
+
+ /**
+ * 鍚庣鍒楄〃鏌ヨ
+ * @param start
+ * @param count
+ * @param key
+ * @return
+ */
+ List<PushGoods> listQuery(@Param("start") long start, @Param("count") int count,
+ @Param("key") String key, @Param("state") Integer state);
+
+ long countQuery(@Param("key") String key, @Param("state") Integer state);
+
+
+ /**
+ * 鑾峰彇鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
+ * @param start
+ * @param count
+ * @param pushTime
+ * @return
+ */
+ List<PushGoods> listHistoryByPushTime(@Param("start") long start, @Param("count") int count,
+ @Param("uid") Long uid, @Param("pushTime") Date pushTime);
+
+ /**
+ * 缁熻鍘嗗彶鎺ㄩ�佸晢鍝佷俊鎭�
+ * @param start
+ * @param count
+ * @param pushTime
+ * @return
+ */
+ long countHistoryByPushTime(@Param("uid") Long uid, @Param("pushTime") Date pushTime);
+
+ /**
+ * 鏌ヨ宸叉帹閫佽褰�
+ * @param list
+ * @return
+ */
+ List<PushGoods> listByPushState(List<Long> list);
+
+
+ /**
+ * 闇�瑕佹墽琛屾帹閫佺殑浠诲姟
+ * @return
+ */
+ List<PushGoods> listTask();
+
}
\ No newline at end of file
--
Gitblit v1.8.0