Browse Source

bug修复

lihui001 3 years ago
parent
commit
447f3ff055

+ 0 - 1
zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/meterreadrecord/MeterReadRecordDto.java

@@ -41,7 +41,6 @@ public class MeterReadRecordDto extends BasePageDto {
     @ApiModelProperty(value="采集器编码")
     private String collectorCode;
 
-
     public String getDate(){
         return ZoniotStringUtils.isNotEmpty(date) ? date + " 00:00:00" :date;
     }

+ 6 - 1
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/ReadRateController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -67,8 +68,12 @@ public class ReadRateController extends BaseController{
 
     @RequestMapping(value="export/excel" , method = RequestMethod.GET)
     @ApiOperation(value = "excel导出")
-    public void exportExcel(ReadRateDto dto, HttpServletResponse response) {
+    public void exportExcel(ReadRateDto dto, HttpServletResponse response) throws Exception {
         ReadRateEnum readRateEnum = ReadRateEnum.getReadRateEnum(dto.getStatDaysCode());
+        if (ReadRateEnum.getReadRateEnum(dto.getStatDaysCode()) == null) {
+            EasyExcelUtil.excelWrite(response, ReadRateVo.class, readRateEnum.getMessage() +"抄表率记录", new ArrayList());
+            return;
+        }
         List<ReadRateVo> list = readRateFactory.getReadRateService(dto.getStatDaysCode()).listReadRate(dto);
         try {
             EasyExcelUtil.excelWrite(response, ReadRateVo.class, readRateEnum.getMessage() +"抄表率记录", list);