胡翰林 / ash · Commits

Commit 01cdbf384d672204f76225857c1e8e546fb984b0

Authored by 胡翰林
1 parent 33fe8946

异常处理

Inline Side-by-side
Showing 2 changed files with 18 additions and 18 deletions
... ... @@ -31,7 +31,7 @@ public class WarningInstanceExcelData implements Serializable {
31 31 private String code;
32 32
33 33 @ExcelCheck(canEmpty = false)
34   - @ExcelProperty(value = "报警时间", index = 1, converter = DatetimeConverter2.class)
  34 + @ExcelProperty(value = "首次报警时间", index = 1, converter = DatetimeConverter2.class)
35 35 @ContentStyle(dataFormat = 49)
36 36 @ColumnWidth(25)
37 37 private Date alarmDate;
... ... @@ -76,22 +76,22 @@ public class WarningInstanceExcelData implements Serializable {
76 76 @ColumnWidth(25)
77 77 private String content;
78 78
79   - @ExcelProperty(value = "接警警情类别", index = 9)
  79 + @ExcelProperty(value = "接警警情类别（部标）", index = 9)
80 80 @ContentStyle(dataFormat = 49)
81 81 @ColumnWidth(25)
82 82 private String alarmCategory;
83 83
84   - @ExcelProperty(value = "接警警情类型", index = 10)
  84 + @ExcelProperty(value = "接警警情类型（部标）", index = 10)
85 85 @ContentStyle(dataFormat = 49)
86 86 @ColumnWidth(25)
87 87 private String alarmType;
88 88
89   - @ExcelProperty(value = "接警警情细类", index = 11)
  89 + @ExcelProperty(value = "接警警情细类（部标）", index = 11)
90 90 @ContentStyle(dataFormat = 49)
91 91 @ColumnWidth(25)
92 92 private String alarmTypeDetail;
93 93
94   - @ExcelProperty(value = "接警警情子类", index = 12)
  94 + @ExcelProperty(value = "接警警情子类（部标）", index = 12)
95 95 @ContentStyle(dataFormat = 49)
96 96 @ColumnWidth(25)
97 97 private String alarmSubType;
... ... @@ -102,22 +102,22 @@ public class WarningInstanceExcelData implements Serializable {
102 102 @ColumnWidth(25)
103 103 private String feedbackContent;
104 104
105   - @ExcelProperty(value = "警情类别", index = 14)
  105 + @ExcelProperty(value = "警情类别（部标）", index = 14)
106 106 @ContentStyle(dataFormat = 49)
107 107 @ColumnWidth(25)
108 108 private String category;
109 109
110   - @ExcelProperty(value = "警情类型", index = 15)
  110 + @ExcelProperty(value = "警情类型（部标）", index = 15)
111 111 @ContentStyle(dataFormat = 49)
112 112 @ColumnWidth(25)
113 113 private String type;
114 114
115   - @ExcelProperty(value = "警情细类", index = 16)
  115 + @ExcelProperty(value = "警情细类（部标）", index = 16)
116 116 @ContentStyle(dataFormat = 49)
117 117 @ColumnWidth(25)
118 118 private String typeDetail;
119 119
120   - @ExcelProperty(value = "警情子类", index = 17)
  120 + @ExcelProperty(value = "警情子类（部标）", index = 17)
121 121 @ContentStyle(dataFormat = 49)
122 122 @ColumnWidth(25)
123 123 private String subType;
... ...
... ... @@ -31,7 +31,7 @@ public class WarningInstanceExportExcelData implements Serializable {
31 31 private String code;
32 32
33 33 @ExcelCheck(canEmpty = false, dateFormatValid = "yyyy-MM-dd HH:mm:ss")
34   - @ExcelProperty(value = "报警时间", index = 1, converter = DatetimeConverter2.class)
  34 + @ExcelProperty(value = "首次报警时间", index = 1, converter = DatetimeConverter2.class)
35 35 @ContentStyle(dataFormat = 49)
36 36 @ColumnWidth(25)
37 37 private Date alarmDate;
... ... @@ -79,25 +79,25 @@ public class WarningInstanceExportExcelData implements Serializable {
79 79 private String content;
80 80
81 81 @ExcelCheck(canEmpty = false)
82   - @ExcelProperty(value = "接警警情类别", index = 9)
  82 + @ExcelProperty(value = "接警警情类别（部标）", index = 9)
83 83 @ContentStyle(dataFormat = 49)
84 84 @ColumnWidth(25)
85 85 private String alarmCategory;
86 86
87 87 @ExcelCheck(canEmpty = false)
88   - @ExcelProperty(value = "接警警情类型", index = 10)
  88 + @ExcelProperty(value = "接警警情类型（部标）", index = 10)
89 89 @ContentStyle(dataFormat = 49)
90 90 @ColumnWidth(25)
91 91 private String alarmType;
92 92
93 93 @ExcelCheck(canEmpty = false)
94   - @ExcelProperty(value = "接警警情细类", index = 11)
  94 + @ExcelProperty(value = "接警警情细类（部标）", index = 11)
95 95 @ContentStyle(dataFormat = 49)
96 96 @ColumnWidth(25)
97 97 private String alarmTypeDetail;
98 98
99 99 @ExcelCheck(canEmpty = false)
100   - @ExcelProperty(value = "接警警情子类", index = 12)
  100 + @ExcelProperty(value = "接警警情子类（部标）", index = 12)
101 101 @ContentStyle(dataFormat = 49)
102 102 @ColumnWidth(25)
103 103 private String alarmSubType;
... ... @@ -109,25 +109,25 @@ public class WarningInstanceExportExcelData implements Serializable {
109 109 private String feedbackContent;
110 110
111 111 @ExcelCheck(canEmpty = false)
112   - @ExcelProperty(value = "警情类别", index = 14)
  112 + @ExcelProperty(value = "警情类别（部标）", index = 14)
113 113 @ContentStyle(dataFormat = 49)
114 114 @ColumnWidth(25)
115 115 private String category;
116 116
117 117 @ExcelCheck(canEmpty = false)
118   - @ExcelProperty(value = "警情类型", index = 15)
  118 + @ExcelProperty(value = "警情类型（部标）", index = 15)
119 119 @ContentStyle(dataFormat = 49)
120 120 @ColumnWidth(25)
121 121 private String type;
122 122
123 123 @ExcelCheck(canEmpty = false)
124   - @ExcelProperty(value = "警情细类", index = 16)
  124 + @ExcelProperty(value = "警情细类（部标）", index = 16)
125 125 @ContentStyle(dataFormat = 49)
126 126 @ColumnWidth(25)
127 127 private String typeDetail;
128 128
129 129 @ExcelCheck(canEmpty = false)
130   - @ExcelProperty(value = "警情子类", index = 17)
  130 + @ExcelProperty(value = "警情子类（部标）", index = 17)
131 131 @ContentStyle(dataFormat = 49)
132 132 @ColumnWidth(25)
133 133 private String subType;
... ...