Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/CommonEnum.java

@@ -52,6 +52,16 @@ public enum CommonEnum {
     非自然人("非自然人","fzrr","商务类型"),
     宅基地农户屋顶("宅基地农户屋顶","zjdnhw","法务类型"),
     法人私有的宅基地建筑屋顶("法人私有的宅基地建筑屋顶","frsydzjd","法务类型"),
+    单晶("单晶","danjing","组件类型"),
+    多晶("多晶","duojing","组件类型"),
+    不限("不限","bx","逆变器系列"),
+    全额上网("全额上网","qesw","上网模式"),
+    余电上网("余电上网","ydsw","上网模式"),
+    单相("单相","dx","相位"),
+    三相("三相","ydsw","相位"),
+    SMC("SMC","smc","材质"),
+    不锈钢("不锈钢","bxg","材质"),
+    钢板喷塑("钢板喷塑","gbps","材质"),
     其他("其他","other","公用");
 
     /**

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java

@@ -92,7 +92,8 @@ public class SurveyInformationDto extends BaseDto {
 
     @ApiModelProperty(value = "项目地址")
     private String projectAddressName;
-
+    @ApiModelProperty(value = "常住地址")
+    private String permanentAddressName;
     @ApiModelProperty(value = "常住地址code")
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<Integer> permanentAddress;

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

@@ -46,15 +46,15 @@ public class CommonController {
     @GetMapping(value = "/downInformation")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "资料下载", notes = "资料下载")
-    public ResponseModel downList(HttpServletResponse response, @RequestParam(required = false) String surveyInformationId,
+    public void 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,peasantHouseholdIds,processInstanceId,response);
 
-        return CommonResponseNewUtil.success();
+
+        commonService.downZiliao(surveyInformationId,peasantHouseholdIds,processInstanceId,response);
 
     }