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/ITContractService.java | 24 +++++++++++++++++++++++- 1 files changed, 23 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 338ad78..aaf5b80 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,11 @@ 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.platform.domain.query.ContractQuery; import com.ycl.system.AjaxResult; +import com.ycl.system.Result; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; @@ -30,5 +33,24 @@ */ AjaxResult importData(MultipartFile file, TContract tContract); - List<TContract> selectAll(); + /** + * 鍒嗛〉鏌ヨ + * + * @param query + * @return + */ + Result selectAll(ContractQuery query); + + /** + * 鏍规嵁鍚堝悓id鏌ヨ閽辨牳绠楄鍒� + * @param contractId 鍚堝悓id + * @return 瑙勫垯 + */ + List<CalculateMoneyRule> selectMoneyRules(Integer contractId); + + /** + * 鏌ヨ鎵�鏈夋鍦ㄤ娇鐢ㄧ殑鍚堝悓 + * @return 鏁版嵁 + */ + List<TContract> selectUsingContract(); } -- Gitblit v1.8.0