From 8dc28c815eb0acdb5af82c2667eec45efd0507c5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 18 三月 2025 09:34:46 +0800
Subject: [PATCH] 车间绑定调整

---
 cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java |   42 +++++++++++++++++-------------------------
 1 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
index c548731..74f3ba3 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java
@@ -3,13 +3,12 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
 import com.ruoyi.manage.mapper.ClientSatisfactionAnalyseFileMapper;
 import com.ruoyi.manage.pojo.ClientSatisfaction;
 import com.ruoyi.manage.pojo.ClientSatisfactionAnalyseFile;
 import com.ruoyi.manage.service.ClientSatisfactionService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -37,15 +36,12 @@
 
     /**
      * 瀹㈡埛婊℃剰搴﹁皟鏌ュ垪琛�
-     * @param data
+     * @param
      * @return
      */
-    @ValueAuth
     @ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ュ垪琛�")
-    @PostMapping("/pageClientSatisfaction")
-    public Result<IPage<ClientSatisfaction>> pageClientSatisfaction(@RequestBody Map<String, Object> data) throws Exception {
-        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-        ClientSatisfaction clientSatisfaction = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ClientSatisfaction.class);
+    @GetMapping("/pageClientSatisfaction")
+    public Result<IPage<ClientSatisfaction>> pageClientSatisfaction(Page page,ClientSatisfaction clientSatisfaction) throws Exception {
         return Result.success(clientSatisfactionService.pageClientSatisfaction(page, clientSatisfaction));
     }
 
@@ -53,7 +49,6 @@
      * 瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�
      * @return
      */
-    @ValueAuth
     @ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
     @PostMapping("/addClientSatisfaction")
     public Result addClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction){
@@ -64,7 +59,6 @@
      * 瀹㈡埛婊℃剰搴﹁皟鏌ヤ慨鏀�
      * @return
      */
-    @ValueAuth
     @ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
     @PostMapping("/updateClientSatisfaction")
     public Result updateClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction){
@@ -75,9 +69,9 @@
      * 瀹㈡埛婊℃剰搴﹁皟鏌ヤ慨鏀�
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�")
-    @GetMapping("/delClientSatisfaction")
+    @DeleteMapping("/delClientSatisfaction")
     public Result updateClientSatisfaction(Integer clientSatisfactionId){
         return Result.success(clientSatisfactionService.removeById(clientSatisfactionId));
     }
@@ -88,7 +82,7 @@
      * @param response
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "瀹㈡埛婊℃剰瀵煎嚭")
     @GetMapping("/exportWordClientSatisfaction")
     public Result exportWordClientSatisfaction(Integer clientSatisfactionId, HttpServletResponse response){
@@ -101,10 +95,10 @@
      * @param clientSatisfaction 瑕佷慨鏀瑰鎴锋弧鎰忓害鐨勭姸鎬佸璞�
      * @param userId 淇敼浜篿d
      */
-    @ValueAuth
+
     @ApiOperation(value = "纭瀹㈡埛婊℃剰搴�")
-    @GetMapping("/confirmClientSatisfaction")
-    public void confirmClientSatisfaction(ClientSatisfaction clientSatisfaction, Integer userId){
+    @PostMapping("/confirmClientSatisfaction")
+    public void confirmClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction, Integer userId){
         clientSatisfactionService.confirmClientSatisfaction(clientSatisfaction, userId);
     }
 
@@ -113,7 +107,7 @@
      * @param file
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鏂板鎴峰垎鏋愰檮浠�")
     @PostMapping("/uploadAnalyseFile")
     public Result<?> uploadAnalyseFile(MultipartFile file) {
@@ -125,12 +119,10 @@
      * 鏌ヨ鎴峰垎鏋愰檮浠�
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鏌ヨ鎴峰垎鏋愰檮浠�")
-    @PostMapping("/pageAnalyseFile")
-    public Result<IPage<ClientSatisfactionAnalyseFile>> pageAnalyseFile(@RequestBody Map<String, Object> data) throws Exception {
-        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-        ClientSatisfactionAnalyseFile analyseFile = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ClientSatisfactionAnalyseFile.class);
+    @GetMapping("/pageAnalyseFile")
+    public Result<IPage<ClientSatisfactionAnalyseFile>> pageAnalyseFile(Page page, ClientSatisfactionAnalyseFile analyseFile) {
         return Result.success(clientSatisfactionService.pageAnalyseFile(page, analyseFile));
     }
 
@@ -138,9 +130,9 @@
      * 鍒犻櫎鎴峰垎鏋愰檮浠�
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍒犻櫎鎴峰垎鏋愰檮浠�")
-    @GetMapping("/delAnalyseFile")
+    @DeleteMapping("/delAnalyseFile")
     public Result delAnalyseFile(Integer analyseFileId){
         return Result.success(clientSatisfactionAnalyseFileMapper.deleteById(analyseFileId));
     }

--
Gitblit v1.9.3