ziliaoxiazai

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommonController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.google.common.net.HttpHeaders;
 import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
+import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceImpl;
 import io.swagger.annotations.Api;
@@ -45,18 +46,18 @@ public class CommonController {
     @GetMapping(value = "/downInformation")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "资料下载", notes = "资料下载")
-    public void downList(HttpServletResponse response, @RequestParam(required = false) String surveyInformationId,
-                         @RequestParam(required = false)String peasantHouseholdId,
+    public ResponseModel downList(HttpServletResponse response, @RequestParam(required = false) String surveyInformationId,
+                         @RequestParam(required = false)List<String> peasantHouseholdIds,
                          @RequestParam(required = false)String processInstanceId) throws IOException {
 
 // 设置响应头
         response.setContentType("application/zip");
-        commonService.downZiliao(surveyInformationId,peasantHouseholdId,processInstanceId,response);
+        commonService.downZiliao(surveyInformationId,peasantHouseholdIds,processInstanceId,response);
 
+        return CommonResponseNewUtil.success();
 
     }
 
-
     /**
      * 设备信息下载
      *
@@ -65,9 +66,9 @@ public class CommonController {
     @GetMapping(value = "/getSchedule")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "资料下载进度获取", notes = "资料下载进度获取")
-    public Object getSchedule(String peasantHouseholdId) {
+    public ResponseModel<Object> getSchedule(String peasantHouseholdId) {
 
-     return commonService.getSchedule(peasantHouseholdId);
+      return ResponseHelper.buildResponse(commonService.getSchedule(peasantHouseholdId));
 
 
     }