From 3486499f56e487cd6df88a8fa2448ff72d72a1e0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 02:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/ITContractService.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 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..b1b8e6f 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,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;
@@ -27,7 +31,34 @@
* @param tContract 鍚堝悓淇℃伅
* @return 瀵煎叆缁撴灉
*/
- void importData(MultipartFile file, TContract tContract);
+ 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();
+
+ /**
+ * 鑾峰彇杩愮淮鍗曚綅鐨勫悎鍚屾椂闂磋寖鍥�
+ *
+ * @param unitId
+ * @return
+ */
+ Result timeRange(Integer unitId);
}
--
Gitblit v1.8.0