From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java |   63 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java
new file mode 100644
index 0000000..47b9854
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java
@@ -0,0 +1,63 @@
+package com.yuanchu.limslaboratory.controller;
+
+import com.yuanchu.limslaboratory.pojo.CnasSatisfactionSurvey;
+import com.yuanchu.limslaboratory.pojo.Dto.CnasSatisfactionSurveyPageDto;
+import com.yuanchu.limslaboratory.pojo.vo.CnasSatisfactionSurveyVo;
+import com.yuanchu.limslaboratory.service.CnasSatisfactionSurveyService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/10
+ */
+@RestController
+@RequestMapping("/cnasSatisfactionSurvey")
+@Api(tags = "CNAS-->婊℃剰搴﹁皟鏌�")
+public class CnasSatisfactionSurveyController {
+
+    @Resource
+    private CnasSatisfactionSurveyService service;
+
+    /**
+     * 鑾峰彇婊℃剰搴﹁皟鏌ヤ俊鎭�
+     * @return
+     */
+    @ApiOperation(value = "鑾峰彇婊℃剰搴﹁皟鏌�")
+    @GetMapping("/getCnasSatisfactionSurvey")
+    public Result<CnasSatisfactionSurveyVo>getCnasSatisfactionSurvey(CnasSatisfactionSurveyPageDto cnasSatisfactionSurveyPageDto){
+        return Result.success(service.getCnasSatisfactionSurvey(cnasSatisfactionSurveyPageDto));
+    }
+
+    @GetMapping("/getFillNameAndId")
+    @ApiOperation(value = "鑾峰彇褰撳墠褰曞彇浜�")
+    public Result<Map>getFillNameAndId(@RequestHeader("X-Token")String token){
+        return Result.success(service.getFillNameAndTd(token));
+    }
+
+    /**
+     * 闄勪欢涓婁紶
+     * @param file
+     * @return
+     */
+    @ApiOperation(value = "闄勪欢涓婁紶")
+    @PostMapping(value = "/uploadFile",consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = {MediaType.APPLICATION_JSON_VALUE})
+    public Result<Map>wordParse(MultipartFile file){
+        return Result.success(service.wordParse(file));
+    }
+
+    @ApiOperation(value = "婊℃剰搴﹁皟鏌ユ柊澧�")
+    @PostMapping("/addSurvey")
+    public Result<Boolean>addSurvey(@RequestBody CnasSatisfactionSurvey cnasSatisfactionSurvey){
+        System.out.println(cnasSatisfactionSurvey+"=============");
+        return Result.success(service.addSurvey(cnasSatisfactionSurvey));
+    }
+
+}

--
Gitblit v1.9.3