From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复

---
 ycl-server/src/main/java/com/ycl/platform/mapper/CalculateRuleMapper.java |   65 ++++++++++++++++++--------------
 1 files changed, 37 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 b09a678..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
@@ -1,62 +1,71 @@
 package com.ycl.platform.mapper;
 
+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-01
  */
-public interface CalculateRuleMapper 
+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