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 | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 0d463e2..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
@@ -1,17 +1,27 @@
package com.ycl.platform.controller;
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;
import com.ycl.system.AjaxResult;
+import com.ycl.system.Result;
import com.ycl.system.controller.BaseController;
-import com.ycl.utils.poi.ExcelUtil;
+import com.ycl.system.page.TableDataInfo;
import enumeration.BusinessType;
+import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
@@ -26,6 +36,17 @@
private final ITContractService tContractService;
+ @PreAuthorize("@ss.hasPermi('system:contract:list')")
+ @GetMapping("/list")
+ 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));
+ }
/**
* 鍚堝悓瀵煎叆妯℃澘
@@ -40,18 +61,13 @@
/**
* 鍚堝悓瀵煎叆
*
- * @param file 瀵煎叆鏂囦欢
- * @param unitId 杩愮淮鍗曚綅
- * @param startTime 寮�濮嬫椂闂�
- * @param endTime 缁撴潫鏃堕棿
* @return 瀵煎叆缁撴灉
*/
@Log(title = "鍚堝悓瀵煎叆", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData")
- public AjaxResult importData(MultipartFile file, String unitId, String startTime, String endTime) {
- ExcelUtil<TContract> util = new ExcelUtil<>(TContract.class);
- return success();
+ public AjaxResult importData(TContract tContract) {
+ return tContractService.importData(tContract.getFile(), tContract);
}
/**
--
Gitblit v1.8.0