优化查询案件列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java

@@ -28,10 +28,10 @@ import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.List;
@@ -345,39 +345,16 @@ public class CaseApplicationController extends BaseController {
     /**
      * 下载案件压缩包
      */
-    @PostMapping("/downloadCaseZipFile1")
-    public AjaxResult downloadCaseZipFile1(@Validated @RequestBody CaseApplication caseApplication) {
+    @PostMapping("/downloadCaseZipFile")
+    public AjaxResult downloadCaseZipFile(@Validated @RequestBody CaseApplication caseApplication) {
 
         CaseAttach caseAttach = caseApplicationService.downloadCaseZipFile(caseApplication);
         return success(caseAttach);
     }
 
-    /**
-     * 下载案件压缩包
-     */
-    @PostMapping("/downloadCaseZipFile")
-    public void downloadCaseZipFile(@Validated @RequestBody CaseApplication caseApplication,HttpServletResponse response) {
 
-        CaseAttach caseAttach = caseApplicationService.downloadCaseZipFile(caseApplication);
-        String annexPath = caseAttach.getAnnexPath();
-        String annexName = caseAttach.getAnnexName();
-        String urlstr = "http://121.40.189.20:8000/API"  + annexPath;
-        try {
-            InputStream fileInputStream = new URL(urlstr).openStream();
-            response.setHeader("content-type", "application/octet-stream");
-            response.setContentType("application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(annexName,"UTF-8"));
-            byte[] buffer = new byte[1024];
-            int length;
-            while ((length = fileInputStream.read(buffer)) > 0) {
-                response.getOutputStream().write(buffer, 0, length);
-            }
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
 
+    
 
     /**
      * 发送房间号短信

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseArbitrateController.java

@@ -30,8 +30,8 @@ public class CaseArbitrateController extends BaseController {
     @PutMapping("/method")
 //    @PreAuthorize("@ss.hasPermi('caseManagement:list:checkarbitrationway')")
     public AjaxResult examineArbitrateMethod(@Validated @RequestBody CaseApplication caseApplication
-            , Integer opinion){
-        return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion);
+            , Integer opinion, Integer arbitratMethod){
+        return caseArbitrateService.examineArbitrateMethod(caseApplication,opinion,arbitratMethod);
     }
 
     /**