胡翰林 / ash · Commits

Commit c9ce8c58db9a5dfe1bcf28e2d3146569a51f444d

Authored by 胡翰林
1 parent f6daca5f

导入模板适配现场数据

Inline Side-by-side
Showing 3 changed files with 7 additions and 7 deletions
@@ -12,7 +12,7 @@ import java.util.Date; @@ -12,7 +12,7 @@ import java.util.Date;
12 12
13 13
14 public class DatetimeConverter implements Converter<Date> { 14 public class DatetimeConverter implements Converter<Date> {
15 - private static final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd HH:mm:ss"; 15 + private static final String PATTERN_YYYY_MM_DD = "yyyy/MM/dd h:mm:ss";
16 16
17 17
18 @Override 18 @Override
@@ -48,14 +48,14 @@ public class CaseExcelData implements Serializable { @@ -48,14 +48,14 @@ public class CaseExcelData implements Serializable {
48 @ColumnWidth(25) 48 @ColumnWidth(25)
49 private String caseDetail; 49 private String caseDetail;
50 50
51 - @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")  
52 - @ExcelProperty(value = "接警时间", index = 4, converter = DatetimeConverter.class) 51 + @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy/MM/dd h:mm:ss")
  52 + @ExcelProperty(value = "接警时间", index = 4)
53 @ContentStyle(dataFormat = 49) 53 @ContentStyle(dataFormat = 49)
54 @ColumnWidth(25) 54 @ColumnWidth(25)
55 private Date alarmDate; 55 private Date alarmDate;
56 56
57 - @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")  
58 - @ExcelProperty(value = "立案时间", index = 5, converter = DatetimeConverter.class) 57 + @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy/MM/dd h:mm:ss")
  58 + @ExcelProperty(value = "立案时间", index = 5)
59 @ContentStyle(dataFormat = 49) 59 @ContentStyle(dataFormat = 49)
60 @ColumnWidth(25) 60 @ColumnWidth(25)
61 private Date filingDate; 61 private Date filingDate;
@@ -30,8 +30,8 @@ public class WarningInstanceExcelData implements Serializable { @@ -30,8 +30,8 @@ public class WarningInstanceExcelData implements Serializable {
30 @ColumnWidth(25) 30 @ColumnWidth(25)
31 private String code; 31 private String code;
32 32
33 - @ExcelCheck(canEmpty = false)  
34 - @ExcelProperty(value = "报警时间", index = 1, converter = DatetimeConverter.class) 33 + @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy/MM/dd h:mm:ss")
  34 + @ExcelProperty(value = "报警时间", index = 1)
35 @ContentStyle(dataFormat = 49) 35 @ContentStyle(dataFormat = 49)
36 @ColumnWidth(25) 36 @ColumnWidth(25)
37 private Date alarmDate; 37 private Date alarmDate;