From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
index a05536a..e882f25 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java
@@ -2,62 +2,70 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.CalculateRule;
+import com.ycl.platform.domain.vo.CalculateRuleCascaderVO;
import java.util.List;
/**
- * 鏍哥畻瑙勫垯Mapper鎺ュ彛
- *
+ * 杩濈害瑙勫垯Mapper鎺ュ彛
+ *
* @author ruoyi
- * @date 2024-04-03
+ * @date 2024-04-01
*/
public interface CalculateRuleMapper extends BaseMapper<CalculateRule>
{
/**
- * 鏌ヨ鏍哥畻瑙勫垯
- *
- * @param id 鏍哥畻瑙勫垯涓婚敭
- * @return 鏍哥畻瑙勫垯
+ * 鏌ヨ杩濈害瑙勫垯
+ *
+ * @param id 杩濈害瑙勫垯涓婚敭
+ * @return 杩濈害瑙勫垯
*/
- public CalculateRule selectCalculateRuleById(Long id);
+ public CalculateRule selectDefaultRuleById(Long id);
/**
- * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
- *
- * @param calculateRule 鏍哥畻瑙勫垯
- * @return 鏍哥畻瑙勫垯闆嗗悎
+ * 鏌ヨ杩濈害瑙勫垯鍒楄〃
+ *
+ * @param calculateRule 杩濈害瑙勫垯
+ * @return 杩濈害瑙勫垯闆嗗悎
*/
- public List<CalculateRule> selectCalculateRuleList(CalculateRule calculateRule);
+ public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule);
/**
- * 鏂板鏍哥畻瑙勫垯
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ * 鏂板杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 缁撴灉
*/
- public int insertCalculateRule(CalculateRule calculateRule);
+ public int insertDefaultRule(CalculateRule calculateRule);
/**
- * 淇敼鏍哥畻瑙勫垯
- *
- * @param calculateRule 鏍哥畻瑙勫垯
+ * 淇敼杩濈害瑙勫垯
+ *
+ * @param calculateRule 杩濈害瑙勫垯
* @return 缁撴灉
*/
- public int updateCalculateRule(CalculateRule calculateRule);
+ public int updateDefaultRule(CalculateRule calculateRule);
/**
- * 鍒犻櫎鏍哥畻瑙勫垯
- *
- * @param id 鏍哥畻瑙勫垯涓婚敭
+ * 鍒犻櫎杩濈害瑙勫垯
+ *
+ * @param id 杩濈害瑙勫垯涓婚敭
* @return 缁撴灉
*/
- public int deleteCalculateRuleById(Long id);
+ public int deleteDefaultRuleById(Long id);
/**
- * 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
- *
+ * 鎵归噺鍒犻櫎杩濈害瑙勫垯
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteCalculateRuleByIds(Long[] ids);
+ public int deleteDefaultRuleByIds(Long[] ids);
+
+ /**
+ * 鑾峰彇杩濈害瑙勫垯鍒楄〃-鐢ㄤ簬Cascader涓嬫媺
+ * @param unitId 杩愮淮鍗曚綅
+ * @return 鏁版嵁
+ */
+ List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId, String now);
}
--
Gitblit v1.8.0