From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSubClassMapper.java | 147 +++++++++++++++++++++++++-----------------------
1 files changed, 77 insertions(+), 70 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSubClassMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSubClassMapper.java
index 59c6e81..e705611 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSubClassMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/GoodsSubClassMapper.java
@@ -1,71 +1,78 @@
-package com.yeshi.fanli.dao.mybatis;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
-
-public interface GoodsSubClassMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(GoodsSubClass record);
-
- int insertSelective(GoodsSubClass record);
-
- GoodsSubClass selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(GoodsSubClass record);
-
- int updateByPrimaryKey(GoodsSubClass record);
-
-
- /**
- * 鏌ヨ涓�绾т箣涓嬬殑鎵�鏈変簩绾у垎绫�
- * @param rootId 涓�绾d
- * @returnL
- */
- List<GoodsSubClass> queryByRootId(@Param("rootId") Long rootId, @Param("state") Integer state);
-
- /**
- * 鏌ヨ浜岀骇鍒嗙被涔嬩笅鍏朵粬鍒嗙被
- * @param rootId 涓�绾d
- * @return
- */
- List<GoodsSubClass> queryByPid(@Param("pid") Long pid, @Param("state") Integer state);
-
-
- List<GoodsSubClass> queryByRootIdAndWeight(@Param("rootId") Long rootId, @Param("type") int type, @Param("weight") int weight);
-
- List<GoodsSubClass> queryByPidAndWeight(@Param("pid") Long pid, @Param("type") int type, @Param("weight") int weight);
-
- /**
- * 缁熻涓�绾т箣涓嬬殑鎵�鏈変簩绾у垎绫�
- * @param rootId 涓�绾d
- * @returnL
- */
- int countByRootId(@Param("rootId") Long rootId);
-
- /**
- * 缁熻浜岀骇鍒嗙被涔嬩笅鍏朵粬鍒嗙被
- * @param rootId 涓�绾d
- * @return
- */
- int countByPid(@Param("pid") Long pid);
-
- /**
- * 缁熻涓�绾т箣涓嬫渶澶ф潈閲�
- * @param rootId 涓�绾d
- * @returnL
- */
- int getMaxWeightByRootId(@Param("rootId") Long rootId);
-
- /**
- * 缁熻浜岀骇鍒嗙被涔嬫渶澶ф潈閲�
- * @param rootId 涓�绾d
- * @return
- */
- int getMaxWeightByPid(@Param("pid") Long pid);
-
+package com.yeshi.fanli.dao.mybatis;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
+
+public interface GoodsSubClassMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(GoodsSubClass record);
+
+ int insertSelective(GoodsSubClass record);
+
+ GoodsSubClass selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(GoodsSubClass record);
+
+ int updateByPrimaryKey(GoodsSubClass record);
+
+
+ /**
+ * 鏌ヨ涓�绾т箣涓嬬殑鎵�鏈変簩绾у垎绫�
+ * @param rootId 涓�绾d
+ * @returnL
+ */
+ List<GoodsSubClass> queryByRootId(@Param("rootId") Long rootId, @Param("state") Integer state,@Param("month") Integer month);
+
+ /**
+ * 鏌ヨ浜岀骇鍒嗙被涔嬩笅鍏朵粬鍒嗙被
+ * @param rootId 涓�绾d
+ * @return
+ */
+ List<GoodsSubClass> queryByPid(@Param("pid") Long pid, @Param("state") Integer state);
+
+
+ List<GoodsSubClass> queryByRootIdAndWeight(@Param("rootId") Long rootId, @Param("type") int type, @Param("weight") int weight);
+
+ List<GoodsSubClass> queryByPidAndWeight(@Param("pid") Long pid, @Param("type") int type, @Param("weight") int weight);
+
+ /**
+ * 缁熻涓�绾т箣涓嬬殑鎵�鏈変簩绾у垎绫�
+ * @param rootId 涓�绾d
+ * @returnL
+ */
+ int countByRootId(@Param("rootId") Long rootId);
+
+ /**
+ * 缁熻浜岀骇鍒嗙被涔嬩笅鍏朵粬鍒嗙被
+ * @param rootId 涓�绾d
+ * @return
+ */
+ int countByPid(@Param("pid") Long pid);
+
+ /**
+ * 缁熻涓�绾т箣涓嬫渶澶ф潈閲�
+ * @param rootId 涓�绾d
+ * @returnL
+ */
+ int getMaxWeightByRootId(@Param("rootId") Long rootId);
+
+ /**
+ * 缁熻浜岀骇鍒嗙被涔嬫渶澶ф潈閲�
+ * @param rootId 涓�绾d
+ * @return
+ */
+ int getMaxWeightByPid(@Param("pid") Long pid);
+
+ /**
+ * 涓�绾d鏌ヨ
+ * @param list
+ * @return
+ */
+ List<GoodsSubClass> queryByListCid(List<Long> list);
+
}
\ No newline at end of file
--
Gitblit v1.8.0