From be19444704d40195c1355e471f1316f7419b930b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 09:24:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/LabelMapper.java |  246 ++++++++++++++++++++++++------------------------
 1 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/LabelMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/LabelMapper.java
index 7d124a8..c21020f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/LabelMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/LabelMapper.java
@@ -1,124 +1,124 @@
-package com.yeshi.fanli.dao.mybatis.lable;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.entity.bus.lable.Label;
-import com.yeshi.fanli.entity.bus.lable.LabelGoods;
-import com.yeshi.fanli.exception.LabelException;
-
-public interface LabelMapper {
-
-	int insert(Label record);
-
-	int insertSelective(Label record);
-	
-	int updateByPrimaryKey(Label record);
-	
-	int updateByPrimaryKeySelective(Label record);
-	
-	int deleteByPrimaryKey(Long id);
-	
-	Label selectByPrimaryKey(Long id);
-	
-	List<Label> selectByTitle(@Param("title") String title);
-	
-	
-	Label getByTitle(@Param("title") String title);
-	
-	
-	/**
-	 * 澶氫釜鏍囩鏌ヨ
-	 * @param list
-	 * @return
-	 */
-	List<Label> listByTitles(List<String> list);
-	
-	
-	/**
-	 * 缁熻鏍囩鎬绘暟
-	 * @return
-	 */
-	long getCount();
-	
-	/**
-	 * 缁熻浠婃棩鏂瑰紡 褰曞叆鎬绘暟
-	 * @return
-	 */
-	long getCountToday();
-	
-	
-	Map<String, Object> getCountByEntryMode();
-	
-	/**
-	 * 鎵归噺鍒犻櫎
-	 * @param ids
-	 * @return
-	 */
-	int deleteBatchByPrimaryKey(long[] ids);
-	
-	/**
-	 * 鏍规嵁鏉′欢鏌ヨ鏍囩
-	 * @param start
-	 * @param count
-	 * @param title
-	 * @param startTime
-	 * @param endTime
-	 * @return
-	 */
-	List<Label> query(@Param("start") long start, @Param("count") int count, @Param("key") String title,
-			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("orderMode") String orderMode);
-	
-	int getQueryCount(@Param("key") String title, @Param("startTime") String startTime,
-			@Param("endTime") String endTime);
-	
-	
-	/**
-	 * 鍟嗗搧鏍囩娣诲姞鍊欓�夐」锛堝凡鎺掗櫎瀛樺湪鏍囩锛�
-	 * @param goodsId
-	 * @return
-	 * @throws LabelException
-	 */
-	List<Label> queryGoodsCandidate(@Param("start") int start, @Param("count") int count, 
-			@Param("key") String key, @Param("goodsId") Long goodsId);
-	int getCountQueryGoodsCandidate(@Param("key") String key, @Param("goodsId") Long goodsId);
-	
-	/**
-	 * 鏌ヨ涓�绾у垎绫� 鏍囩鍊欓�夐」
-	 * @param classId
-	 * @return
-	 */
-	List<Label> queryClassCandidate(@Param("start") int start, @Param("count") int count, 
-			@Param("key") String key, @Param("classId") Long classId);
-	int getCountQueryClassCandidate(@Param("key") String key, @Param("classId") Long classId);
-	
-	
-	/**
-	 * 鏌ヨ瀛愮骇鍒嗙被 鏍囩鍊欓�夐」
-	 * @param subClassId
-	 * @return
-	 */
-	List<Label> querySubClassCandidate(@Param("start") int start, @Param("count") int count, 
-			@Param("key") String key, @Param("subClassId") Long subClassId);
-	int getCountQuerySubClassCandidate(@Param("key") String key, @Param("subClassId") Long subClassId);
-	
-	
-	
-	/**
-	 * 鏌ヨ浜岀骇浠ヤ笅鍒嗙被 鏍囩鍒楄〃
-	 * @param subClassId
-	 * @return
-	 */
-	List<Label> getSecondClassLables(@Param("subClassId") Long subClassId);
-	
-	
-	/**
-	 * 鏌ヨ鍟嗗搧瀵瑰簲鏍囩
-	 * @param goodsId
-	 * @return
-	 */
-	List<LabelGoods> getByGoodsId(@Param("goodsId") Long goodsId);
-	
+package com.yeshi.fanli.dao.mybatis.lable;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.bus.lable.Label;
+import com.yeshi.fanli.entity.bus.lable.LabelGoods;
+import com.yeshi.fanli.exception.goods.quality.LabelException;
+
+public interface LabelMapper {
+
+	int insert(Label record);
+
+	int insertSelective(Label record);
+	
+	int updateByPrimaryKey(Label record);
+	
+	int updateByPrimaryKeySelective(Label record);
+	
+	int deleteByPrimaryKey(Long id);
+	
+	Label selectByPrimaryKey(Long id);
+	
+	List<Label> selectByTitle(@Param("title") String title);
+	
+	
+	Label getByTitle(@Param("title") String title);
+	
+	
+	/**
+	 * 澶氫釜鏍囩鏌ヨ
+	 * @param list
+	 * @return
+	 */
+	List<Label> listByTitles(List<String> list);
+	
+	
+	/**
+	 * 缁熻鏍囩鎬绘暟
+	 * @return
+	 */
+	long getCount();
+	
+	/**
+	 * 缁熻浠婃棩鏂瑰紡 褰曞叆鎬绘暟
+	 * @return
+	 */
+	long getCountToday();
+	
+	
+	Map<String, Object> getCountByEntryMode();
+	
+	/**
+	 * 鎵归噺鍒犻櫎
+	 * @param ids
+	 * @return
+	 */
+	int deleteBatchByPrimaryKey(long[] ids);
+	
+	/**
+	 * 鏍规嵁鏉′欢鏌ヨ鏍囩
+	 * @param start
+	 * @param count
+	 * @param title
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<Label> query(@Param("start") long start, @Param("count") int count, @Param("key") String title,
+			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("orderMode") String orderMode);
+	
+	int getQueryCount(@Param("key") String title, @Param("startTime") String startTime,
+			@Param("endTime") String endTime);
+	
+	
+	/**
+	 * 鍟嗗搧鏍囩娣诲姞鍊欓�夐」锛堝凡鎺掗櫎瀛樺湪鏍囩锛�
+	 * @param goodsId
+	 * @return
+	 * @throws LabelException
+	 */
+	List<Label> queryGoodsCandidate(@Param("start") int start, @Param("count") int count, 
+			@Param("key") String key, @Param("goodsId") Long goodsId);
+	int getCountQueryGoodsCandidate(@Param("key") String key, @Param("goodsId") Long goodsId);
+	
+	/**
+	 * 鏌ヨ涓�绾у垎绫� 鏍囩鍊欓�夐」
+	 * @param classId
+	 * @return
+	 */
+	List<Label> queryClassCandidate(@Param("start") int start, @Param("count") int count, 
+			@Param("key") String key, @Param("classId") Long classId);
+	int getCountQueryClassCandidate(@Param("key") String key, @Param("classId") Long classId);
+	
+	
+	/**
+	 * 鏌ヨ瀛愮骇鍒嗙被 鏍囩鍊欓�夐」
+	 * @param subClassId
+	 * @return
+	 */
+	List<Label> querySubClassCandidate(@Param("start") int start, @Param("count") int count, 
+			@Param("key") String key, @Param("subClassId") Long subClassId);
+	int getCountQuerySubClassCandidate(@Param("key") String key, @Param("subClassId") Long subClassId);
+	
+	
+	
+	/**
+	 * 鏌ヨ浜岀骇浠ヤ笅鍒嗙被 鏍囩鍒楄〃
+	 * @param subClassId
+	 * @return
+	 */
+	List<Label> getSecondClassLables(@Param("subClassId") Long subClassId);
+	
+	
+	/**
+	 * 鏌ヨ鍟嗗搧瀵瑰簲鏍囩
+	 * @param goodsId
+	 * @return
+	 */
+	List<LabelGoods> getByGoodsId(@Param("goodsId") Long goodsId);
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0