From 76f71670b5dd61645d814e0a169b266ae793dadd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Feb 2022 14:14:11 +0800
Subject: [PATCH] 督办单修改接口update

---
 screen-api/src/main/java/com/moral/api/service/SupervisionService.java          |    3 ++-
 screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java |    3 +--
 screen-api/src/main/java/com/moral/api/controller/SupervisionController.java    |    8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java b/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
index 9ecaf4b..5b4e590 100644
--- a/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
@@ -12,11 +12,14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.alibaba.fastjson.JSONObject;
 import com.moral.api.entity.Supervision;
 import com.moral.api.service.SupervisionService;
 import com.moral.constant.ResponseCodeEnum;
@@ -63,7 +66,10 @@
 
     @ApiOperation(value = "���������������", notes = "���������������")
     @PostMapping("update")
-    public ResultMessage update(MultipartFile[] files, Supervision supervision) {
+    public ResultMessage update(HttpServletRequest request) {
+        Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+        List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+        Supervision supervision = JSONObject.parseObject(JSONObject.toJSONString(params), Supervision.class);
         Map<String, Object> response = supervisionService.updateSupervision(files, supervision);
         if (!response.isEmpty()) {
             return ResultMessage.fail(Integer.parseInt(response.get("code").toString()), response.get("msg").toString());
diff --git a/screen-api/src/main/java/com/moral/api/service/SupervisionService.java b/screen-api/src/main/java/com/moral/api/service/SupervisionService.java
index 551227d..58e30db 100644
--- a/screen-api/src/main/java/com/moral/api/service/SupervisionService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SupervisionService.java
@@ -2,6 +2,7 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
 import java.util.Map;
 
 import com.moral.api.entity.Supervision;
@@ -24,7 +25,7 @@
     Map<String, Object> selectSupervisions(Map<String, Object> params);
 
     //���������������
-    Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision);
+    Map<String, Object> updateSupervision(List<MultipartFile> files, Supervision supervision);
 
     //���������������
     void deleteSupervision(Integer supervisionId);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index e6df36e..1893205 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -156,8 +156,7 @@
 
     @Override
     @Transactional
-    public Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision) {
-
+    public Map<String, Object> updateSupervision(List<MultipartFile> files, Supervision supervision) {
         //������jar���������������
         ApplicationHome applicationHome = new ApplicationHome(getClass());
         //���jar������������������������������upload������������������������������������

--
Gitblit v1.8.0