From 2ba52666860b04bedff1da95af0f6445315e6128 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期二, 11 二月 2025 14:27:52 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 6bc7ae8..711e8bf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -37,6 +37,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -72,12 +73,15 @@
private TCheckAcceptRecordService checkAcceptRecordService;
@ApiOperation(value = "获取合同分页列表")
@PostMapping(value = "/contractList")
+ @PreAuthorize("@ss.hasPermi('system:contract:list')")
+
public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
return R.ok(contractService.contractList(query));
}
@Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增合同")
@PostMapping(value = "/addContract")
+ @PreAuthorize("@ss.hasPermi('system:contract:add')")
public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
contractService.save(dto);
if (dto.getIsIncreasing()){
@@ -210,17 +214,13 @@
String url = wordUtil.generatePdf("/templates", "1_yzj_租赁合同.xml", templateParam, "租赁合同", "E:\\");
return R.ok(url);
}
- @ApiOperation(value = "导出")
- @PostMapping("/export")
- public void export(@RequestBody TContractQuery query){
- contractService.export(query);
- }
+
/**
* 光缆巡检列表导出
*/
- @ApiOperation(value = "光缆巡检列表导出")
- @Log(title = "现场作业-光缆巡检列表导出", businessType = BusinessType.EXPORT)
- @PostMapping("/exportOpticalInspection")
+ @ApiOperation(value = "导出")
+ @Log(title = "导出", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
public void exportOpticalInspection(@RequestBody TContractQuery query)
{
List<ContractExport> contractExports = new ArrayList<>();
--
Gitblit v1.7.1