From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java |   66 ++++++++++++++++++++------------
 1 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java
index 9f543a1..05bf752 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java
@@ -1,62 +1,78 @@
 package com.ycl.platform.service;
 
-import com.ycl.platform.domain.entity.CalculateMoneyRule;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.entity.CalculateRule;
+import com.ycl.platform.domain.vo.CalculateRuleCascaderVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
- * 鏍哥畻瑙勫垯Service鎺ュ彛
+ * 杩濈害瑙勫垯Service鎺ュ彛
  *
  * @author ruoyi
- * @date 2024-04-03
+ * @date 2024-04-01
  */
-public interface ICalculateRuleService
-{
+public interface ICalculateRuleService extends IService<CalculateRule> {
     /**
-     * 鏌ヨ鏍哥畻瑙勫垯
+     * 鏌ヨ杩濈害瑙勫垯
      *
-     * @param id 鏍哥畻瑙勫垯涓婚敭
-     * @return 鏍哥畻瑙勫垯
+     * @param id 杩濈害瑙勫垯涓婚敭
+     * @return 杩濈害瑙勫垯
      */
-    public CalculateMoneyRule selectCalculateRuleById(Long id);
+    public CalculateRule selectDefaultRuleById(Long id);
 
     /**
-     * 鏌ヨ鏍哥畻瑙勫垯鍒楄〃
+     * 鏌ヨ杩濈害瑙勫垯鍒楄〃
      *
-     * @param calculateMoneyRule 鏍哥畻瑙勫垯
-     * @return 鏍哥畻瑙勫垯闆嗗悎
+     * @param calculateRule 杩濈害瑙勫垯
+     * @return 杩濈害瑙勫垯闆嗗悎
      */
-    public List<CalculateMoneyRule> selectCalculateRuleList(CalculateMoneyRule calculateMoneyRule);
+    public List<CalculateRule> selectDefaultRuleList(CalculateRule calculateRule);
 
     /**
-     * 鏂板鏍哥畻瑙勫垯
+     * 鏂板杩濈害瑙勫垯
      *
-     * @param calculateMoneyRule 鏍哥畻瑙勫垯
+     * @param calculateRule 杩濈害瑙勫垯
      * @return 缁撴灉
      */
-    public int insertCalculateRule(CalculateMoneyRule calculateMoneyRule);
+    public int insertDefaultRule(CalculateRule calculateRule);
 
     /**
-     * 淇敼鏍哥畻瑙勫垯
+     * 淇敼杩濈害瑙勫垯
      *
-     * @param calculateMoneyRule 鏍哥畻瑙勫垯
+     * @param calculateRule 杩濈害瑙勫垯
      * @return 缁撴灉
      */
-    public int updateCalculateRule(CalculateMoneyRule calculateMoneyRule);
+    public int updateDefaultRule(CalculateRule calculateRule);
 
     /**
-     * 鎵归噺鍒犻櫎鏍哥畻瑙勫垯
+     * 鎵归噺鍒犻櫎杩濈害瑙勫垯
      *
-     * @param ids 闇�瑕佸垹闄ょ殑鏍哥畻瑙勫垯涓婚敭闆嗗悎
+     * @param ids 闇�瑕佸垹闄ょ殑杩濈害瑙勫垯涓婚敭闆嗗悎
      * @return 缁撴灉
      */
-    public int deleteCalculateRuleByIds(Long[] ids);
+    public int deleteDefaultRuleByIds(Long[] ids);
 
     /**
-     * 鍒犻櫎鏍哥畻瑙勫垯淇℃伅
+     * 鍒犻櫎杩濈害瑙勫垯淇℃伅
      *
-     * @param id 鏍哥畻瑙勫垯涓婚敭
+     * @param id 杩濈害瑙勫垯涓婚敭
      * @return 缁撴灉
      */
-    public int deleteCalculateRuleById(Long id);
+    public int deleteDefaultRuleById(Long id);
+
+    /**
+     * 鏍规嵁鍚堝悓id鏌ヨ瑙勫垯
+     * @param contractId 鍚堝悓id
+     * @return 鍚堝悓瑙勫垯
+     */
+    List<CalculateRule> getRuleListByContractId(Integer contractId);
+
+    /**
+     * 鏍规嵁鍗曚綅id鏌ヨ瑙勫垯
+     * @param unitId 杩愮淮鍗曚綅
+     * @return 瑙勫垯
+     */
+    List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId);
 }

--
Gitblit v1.8.0