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/controller/TContractController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TContractController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TContractController.java
index a4f51da..824b018 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TContractController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TContractController.java
@@ -2,8 +2,10 @@
import annotation.Log;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.platform.domain.entity.CalculateMoneyRule;
import com.ycl.platform.domain.entity.TContract;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.query.ContractQuery;
import com.ycl.platform.domain.query.YwUnitQuery;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.service.ITContractService;
@@ -36,8 +38,14 @@
@PreAuthorize("@ss.hasPermi('system:contract:list')")
@GetMapping("/list")
- public List<TContract> list() {
- return tContractService.selectAll();
+ public Result page(ContractQuery query) {
+ return tContractService.selectAll(query);
+ }
+
+ @PreAuthorize("@ss.hasPermi('system:contract:query')")
+ @GetMapping("/selectMoneyRules")
+ public AjaxResult selectMoneyRules(Integer contractId) {
+ return success(tContractService.selectMoneyRules(contractId));
}
/**
@@ -58,8 +66,8 @@
@Log(title = "鍚堝悓瀵煎叆", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData")
- public AjaxResult importData(MultipartFile file, TContract tContract) {
- return tContractService.importData(file, tContract);
+ public AjaxResult importData(TContract tContract) {
+ return tContractService.importData(tContract.getFile(), tContract);
}
/**
--
Gitblit v1.8.0