bug修复

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/DeviceCommandVo.java

@@ -1,5 +1,6 @@
 package com.zcxk.rmcp.api.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -19,6 +20,7 @@ import java.util.Date;
 public class DeviceCommandVo {
 
     @ApiModelProperty(value="Id")
+    @ExcelIgnore
     private Long id;
 
     @ApiModelProperty(value = "水表电子号")

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/vo/MeterReplaceVo.java

@@ -24,19 +24,19 @@ public class MeterReplaceVo {
     private Long id;
 
     @ApiModelProperty(value = "新设备编号")
-    @ExcelProperty(value = {"新设备编号"}, index = 1)
+    @ExcelProperty(value = {"新设备编号"}, index = 0)
     private String newDeviceNo;
 
     @ApiModelProperty(value = "旧设备编号")
-    @ExcelProperty(value = {"旧设备编号"}, index = 2)
+    @ExcelProperty(value = {"旧设备编号"}, index = 1)
     private String oldDeviceNo;
 
     @ApiModelProperty(value="新水表电子号")
-    @ExcelProperty(value = {"新水表电子号"}, index = 3)
+    @ExcelProperty(value = {"新水表电子号"}, index = 2)
     private String newMeterNo;
 
     @ApiModelProperty(value="旧水表电子号")
-    @ExcelProperty(value = {"旧水表电子号"}, index = 4)
+    @ExcelProperty(value = {"旧水表电子号"}, index = 3)
     private String oldMeterNo;
 
     @ApiModelProperty(value="新产品类型/新设备型号")
@@ -48,19 +48,19 @@ public class MeterReplaceVo {
     private String oldProductId;
 
     @ApiModelProperty(value="新产品类型/新设备型号")
-    @ExcelProperty(value = {"新设备型号"}, index = 5)
+    @ExcelProperty(value = {"新设备型号"}, index = 4)
     private String newDeviceModel;
 
     @ApiModelProperty(value="旧产品类型/旧设备型号")
-    @ExcelProperty(value = {"旧设备型号"}, index = 6)
+    @ExcelProperty(value = {"旧设备型号"}, index = 5)
     private String oldDeviceModel;
 
     @ApiModelProperty(value = "水表档案号")
-    @ExcelProperty(value = {"水表档案号"}, index = 7)
+    @ExcelProperty(value = {"水表档案号"}, index = 6)
     private String fileNo;
 
     @ApiModelProperty(value="新表起度")
-    @ExcelProperty(value = {"新表起度"}, index = 9)
+    @ExcelProperty(value = {"新表起度"}, index = 7)
     private String newBeginDegree;
 
     @ApiModelProperty(value="旧表止度")
@@ -68,20 +68,20 @@ public class MeterReplaceVo {
     private String oldEndDegree;
 
     @ApiModelProperty(value="更换方案，1 更换模块，2:更换整表")
-    @ExcelProperty(value = {"更换方案"}, index = 10)
+    @ExcelProperty(value = {"更换方案"}, index = 9)
     private String replaceMethod;
 
     @ApiModelProperty(value="更换人")
-    @ExcelProperty(value = {"更换人"}, index = 11)
+    @ExcelProperty(value = {"更换人"}, index = 10)
     private String replaceUsername;
 
     @ApiModelProperty(value="更换人手机号码")
-    @ExcelProperty(value = {"更换人手机号码"}, index = 12)
+    @ExcelProperty(value = {"更换人手机号码"}, index = 11)
     private String replaceUserPhone;
 
     @ApiModelProperty(value="创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    @ExcelProperty(value = {"上报时间"}, index = 13, converter = LocalDateTimeConverter.class)
+    @ExcelProperty(value = {"上报时间"}, index = 12, converter = LocalDateTimeConverter.class)
     private LocalDateTime dateCreate;
 
 }