From 387d3aca6fab1a07618bb8342ee522b3da2db9b1 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期日, 28 四月 2024 10:09:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 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 ba9cac0..d101b61 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,8 +1,13 @@ 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; + +import java.util.List; /** * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice鎺ュ彛 @@ -17,4 +22,21 @@ * @param response 缁撴灉 */ void importTemplate(HttpServletResponse response); + + /** + * 瀵煎叆鍚堝悓鏁版嵁 + * @param file 鏂囦欢 + * @param tContract 鍚堝悓淇℃伅 + * @return 瀵煎叆缁撴灉 + */ + AjaxResult importData(MultipartFile file, TContract tContract); + + List<TContract> selectAll(); + + /** + * 鏍规嵁鍚堝悓id鏌ヨ閽辨牳绠楄鍒� + * @param contractId 鍚堝悓id + * @return 瑙勫垯 + */ + List<CalculateMoneyRule> selectMoneyRules(Integer contractId); } -- Gitblit v1.8.0