From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/controller/client/CustomerServiceController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/CustomerServiceController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/CustomerServiceController.java
index 151dbe1..162b1e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/CustomerServiceController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/CustomerServiceController.java
@@ -2,14 +2,18 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import org.yeshi.utils.JsonUtil;
@@ -42,10 +46,9 @@
@Resource
private CustomerServiceHistoryService customerServiceHistoryService;
-
+
@Resource
private UserComplaintService userComplaintService;
-
/**
* 棰勮鏍囬鐨勫叧閿瓧鍒楄〃
@@ -123,18 +126,24 @@
out.print(JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(answer)));
}
-
/**
- * 鐢ㄦ埛鍚愭Ы璁板綍娣诲姞
+ * 鐢ㄦ埛鍚愭Ы璁板綍娣诲姞
+ *
* @param fileList
* @param uid
* @param content
* @param out
*/
@RequestMapping(value = "complaint")
- public void complaint(AcceptData acceptData, List<CommonsMultipartFile> fileList, String content, Long uid, PrintWriter out) {
+ public void complaint(AcceptData acceptData, MultipartFile[] fileList, String content, Long uid,
+ HttpServletRequest request, PrintWriter out) {
try {
- userComplaintService.addUserComplaint(fileList, uid, content);
+ List<MultipartFile> files = new ArrayList<>();
+ if (fileList != null)
+ for (MultipartFile mf : fileList) {
+ files.add(mf);
+ }
+ userComplaintService.addUserComplaint(files, uid, content);
out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (UserComplaintException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0