From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/ICalculateRuleService.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 2be0456..22295fa 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
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.entity.CalculateRule;
-import com.ycl.platform.domain.entity.TContract;
-import org.springframework.web.multipart.MultipartFile;
+import com.ycl.platform.domain.vo.CalculateRuleCascaderVO;
import java.util.List;
@@ -63,16 +62,16 @@
public int deleteDefaultRuleById(Long id);
/**
- * 璇诲彇Excel鏁版嵁
- *
- * @param file 鏂囦欢
- */
- List<CalculateRule> readExcel(MultipartFile file);
-
- /**
* 鏍规嵁鍚堝悓id鏌ヨ瑙勫垯
* @param contractId 鍚堝悓id
* @return 鍚堝悓瑙勫垯
*/
List<CalculateRule> getRuleListByContractId(Integer contractId);
+
+ /**
+ * 鏍规嵁鍗曚綅id鏌ヨ瑙勫垯
+ * @param unitId 杩愮淮鍗曚綅
+ * @return 瑙勫垯
+ */
+ List<CalculateRuleCascaderVO> getRuleListByUnitId(Integer unitId);
}
--
Gitblit v1.8.0