From 7a7dbbd34179b79caf3b74dedf2d5b84f30d0c05 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 26 四月 2024 11:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
similarity index 68%
rename from ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java
rename to ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
index 260fb18..aac85ac 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DefaultResultController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java
@@ -1,8 +1,8 @@
package com.ycl.platform.controller;
import annotation.Log;
-import com.ycl.platform.domain.entity.DefaultResult;
-import com.ycl.platform.service.IDefaultResultService;
+import com.ycl.platform.domain.entity.ContractResult;
+import com.ycl.platform.service.IContractResultService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
@@ -22,21 +22,21 @@
* @date 2024-04-01
*/
@RestController
-@RequestMapping("/default/result")
-public class DefaultResultController extends BaseController
+@RequestMapping("/contract/result")
+public class ContractResultController extends BaseController
{
@Autowired
- private IDefaultResultService defaultResultService;
+ private IContractResultService defaultResultService;
/**
* 鏌ヨ鍚堝悓鑰冩牳缁撴灉鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('system:result:list')")
@GetMapping("/list")
- public TableDataInfo list(DefaultResult defaultResult)
+ public TableDataInfo list(ContractResult contractResult)
{
startPage();
- List<DefaultResult> list = defaultResultService.selectDefaultResultList(defaultResult);
+ List<ContractResult> list = defaultResultService.selectDefaultResultList(contractResult);
return getDataTable(list);
}
@@ -46,10 +46,10 @@
@PreAuthorize("@ss.hasPermi('system:result:export')")
@Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, DefaultResult defaultResult)
+ public void export(HttpServletResponse response, ContractResult contractResult)
{
- List<DefaultResult> list = defaultResultService.selectDefaultResultList(defaultResult);
- ExcelUtil<DefaultResult> util = new ExcelUtil<DefaultResult>(DefaultResult.class);
+ List<ContractResult> list = defaultResultService.selectDefaultResultList(contractResult);
+ ExcelUtil<ContractResult> util = new ExcelUtil<ContractResult>(ContractResult.class);
util.exportExcel(response, list, "鍚堝悓鑰冩牳缁撴灉鏁版嵁");
}
@@ -69,9 +69,9 @@
@PreAuthorize("@ss.hasPermi('system:result:add')")
@Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody DefaultResult defaultResult)
+ public AjaxResult add(@RequestBody ContractResult contractResult)
{
- return toAjax(defaultResultService.insertDefaultResult(defaultResult));
+ return toAjax(defaultResultService.insertDefaultResult(contractResult));
}
/**
@@ -80,9 +80,9 @@
@PreAuthorize("@ss.hasPermi('system:result:edit')")
@Log(title = "鍚堝悓鑰冩牳缁撴灉", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody DefaultResult defaultResult)
+ public AjaxResult edit(@RequestBody ContractResult contractResult)
{
- return toAjax(defaultResultService.updateDefaultResult(defaultResult));
+ return toAjax(defaultResultService.updateDefaultResult(contractResult));
}
/**
--
Gitblit v1.8.0