From 8b4e5dc6be4d56e68fbc08273c76ff35101b6752 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 12 二月 2025 09:49:58 +0800
Subject: [PATCH] 房屋合同生成账单定时任务

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java |   18 ++++++++++--------
 1 files changed, 10 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..8df9388 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()){
@@ -87,6 +91,7 @@
             tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
             tContractRentType.setNumericalValue(dto.getNumericalValue());
             tContractRentType.setChangeTime(dto.getChangeTime());
+            tContractRentType.setCycleTime(dto.getCycleTime());
             contractRentTypeService.save(tContractRentType);
         }
         return R.ok();
@@ -105,6 +110,7 @@
             tContractRentType.setIncreasingDecreasingType(dto.getIncreasingDecreasingType());
             tContractRentType.setNumericalValue(dto.getNumericalValue());
             tContractRentType.setChangeTime(dto.getChangeTime());
+            tContractRentType.setCycleTime(dto.getCycleTime());
             contractRentTypeService.save(tContractRentType);
         }
         return R.ok();
@@ -210,17 +216,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