From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java
index d9835a0..15d8e8c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java
@@ -1,7 +1,9 @@
 package com.ycl.platform.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.entity.CalculateMoneyRule;
 import com.ycl.platform.domain.entity.TContract;
+import com.ycl.system.AjaxResult;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -27,7 +29,20 @@
      * @param tContract 鍚堝悓淇℃伅
      * @return 瀵煎叆缁撴灉
      */
-    void importData(MultipartFile file, TContract tContract);
+    AjaxResult importData(MultipartFile file, TContract tContract);
 
     List<TContract> selectAll();
+
+    /**
+     * 鏍规嵁鍚堝悓id鏌ヨ閽辨牳绠楄鍒�
+     * @param contractId 鍚堝悓id
+     * @return 瑙勫垯
+     */
+    List<CalculateMoneyRule> selectMoneyRules(Integer contractId);
+
+    /**
+     * 鏌ヨ鎵�鏈夋鍦ㄤ娇鐢ㄧ殑鍚堝悓
+     * @return 鏁版嵁
+     */
+    List<TContract> selectUsingContract();
 }

--
Gitblit v1.8.0