From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java
index e80a3f7..673c12d 100644
--- a/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/service/CnasSatisfactionSurveyService.java
@@ -1,7 +1,11 @@
package com.yuanchu.limslaboratory.service;
-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 org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
/**
* @Author 寮犲
@@ -11,10 +15,28 @@
/**
* 鑾峰彇婊℃剰搴﹁皟鏌ヤ俊鎭�
- * @param cnasSatisfactionSurveyDto
+ * @param cnasSatisfactionSurveyPageDto
* @return
*/
- CnasSatisfactionSurveyVo getCnasSatisfactionSurvey(CnasSatisfactionSurveyDto cnasSatisfactionSurveyDto);
+ CnasSatisfactionSurveyVo getCnasSatisfactionSurvey(CnasSatisfactionSurveyPageDto cnasSatisfactionSurveyPageDto);
+ /**
+ * 鑾峰彇褰撳墠褰曞叆浜�
+ * @return
+ */
+ Map<String, Object> getFillNameAndTd(String token);
+ /**
+ * 瑙ｆ瀽word
+ * @param file
+ * @return
+ */
+ Map<String, String> wordParse(MultipartFile file);
+
+ /**
+ * 鏂板婊℃剰搴﹁皟鏌�
+ * @param cnasSatisfactionSurvey
+ * @return
+ */
+ Boolean addSurvey(CnasSatisfactionSurvey cnasSatisfactionSurvey);
}
--
Gitblit v1.9.3