From b081758449c9d491adf1c70a030461b24dc163fe Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 14 八月 2023 17:59:31 +0800
Subject: [PATCH] 满意度调查word解析 人员管理
---
cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 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
index 95646d1..47b9854 100644
--- a/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/controller/CnasSatisfactionSurveyController.java
@@ -1,16 +1,18 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.Dto.CnasSatisfactionSurveyDto;
+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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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 寮犲
@@ -30,9 +32,32 @@
*/
@ApiOperation(value = "鑾峰彇婊℃剰搴﹁皟鏌�")
@GetMapping("/getCnasSatisfactionSurvey")
- public Result<CnasSatisfactionSurveyVo>getCnasSatisfactionSurvey(CnasSatisfactionSurveyDto cnasSatisfactionSurveyDto){
- return Result.success(service.getCnasSatisfactionSurvey(cnasSatisfactionSurveyDto));
+ 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