胡翰林 / ash · Commits

Commit 158d9f1fd110413471593b49d958d52bf13b83fd

Authored by 胡翰林
1 parent 1b96af9a

导入模板非空修改

Inline Side-by-side
Showing 4 changed files with 7 additions and 17 deletions
... ... @@ -38,7 +38,7 @@ public class CaseExcelData implements Serializable {
38 38 private String name;
39 39
40 40 @ExcelCheck(canEmpty = false)
41   - @ExcelProperty(value = "案件详情", index = 2)
  41 + @ExcelProperty(value = "简要案情", index = 2)
42 42 @ContentStyle(dataFormat = 49)
43 43 @ColumnWidth(25)
44 44 private String caseDetail;
... ... @@ -61,10 +61,9 @@ public class CaseExcelData implements Serializable {
61 61 @ColumnWidth(25)
62 62 private String filingUnit;
63 63
64   - @ExcelCheck(canEmpty = false)
65   - @ExcelProperty(value = "涉案总价值（人名币）", index = 6)
  64 + @ExcelProperty(value = "涉案总价值（人民币元）", index = 6)
66 65 @ContentStyle(dataFormat = 49)
67 66 @ColumnWidth(25)
68   - private Double totalAmount;
  67 + private Double totalAmount=0d;
69 68
70 69 }
... ...
... ... @@ -37,7 +37,7 @@ public class CaseExportExcelData implements Serializable {
37 37 private String name;
38 38
39 39 @ExcelCheck(canEmpty = false)
40   - @ExcelProperty(value = "案件详情", index = 2)
  40 + @ExcelProperty(value = "简要案情", index = 2)
41 41 @ContentStyle(dataFormat = 49)
42 42 @ColumnWidth(25)
43 43 private String caseDetail;
... ... @@ -74,7 +74,7 @@ public class CaseExportExcelData implements Serializable {
74 74 private String county;
75 75
76 76 @ExcelCheck(canEmpty = false)
77   - @ExcelProperty(value = "涉案总金额", index = 8)
  77 + @ExcelProperty(value = "涉案总价值（人民币元）", index = 8)
78 78 @ContentStyle(dataFormat = 49)
79 79 @ColumnWidth(25)
80 80 private Double totalAmount;
... ...
... ... @@ -36,7 +36,6 @@ public class WarningInstanceExcelData implements Serializable {
36 36 @ColumnWidth(25)
37 37 private Date alarmDate;
38 38
39   - @ExcelCheck(canEmpty = false)
40 39 @ExcelProperty(value = "报警电话", index = 2)
41 40 @ContentStyle(dataFormat = 49)
42 41 @ColumnWidth(25)
... ... @@ -66,7 +65,6 @@ public class WarningInstanceExcelData implements Serializable {
66 65 @ColumnWidth(25)
67 66 private String county;
68 67
69   - @ExcelCheck(canEmpty = false)
70 68 @ExcelProperty(value = "事发地址", index = 7)
71 69 @ContentStyle(dataFormat = 49)
72 70 @ColumnWidth(25)
... ... @@ -78,25 +76,21 @@ public class WarningInstanceExcelData implements Serializable {
78 76 @ColumnWidth(25)
79 77 private String content;
80 78
81   - @ExcelCheck(canEmpty = false)
82 79 @ExcelProperty(value = "接警警情类别", index = 9)
83 80 @ContentStyle(dataFormat = 49)
84 81 @ColumnWidth(25)
85 82 private String alarmCategory;
86 83
87   - @ExcelCheck(canEmpty = false)
88 84 @ExcelProperty(value = "接警警情类型", index = 10)
89 85 @ContentStyle(dataFormat = 49)
90 86 @ColumnWidth(25)
91 87 private String alarmType;
92 88
93   - @ExcelCheck(canEmpty = false)
94 89 @ExcelProperty(value = "接警警情细类", index = 11)
95 90 @ContentStyle(dataFormat = 49)
96 91 @ColumnWidth(25)
97 92 private String alarmTypeDetail;
98 93
99   - @ExcelCheck(canEmpty = false)
100 94 @ExcelProperty(value = "接警警情子类", index = 12)
101 95 @ContentStyle(dataFormat = 49)
102 96 @ColumnWidth(25)
... ... @@ -108,31 +102,26 @@ public class WarningInstanceExcelData implements Serializable {
108 102 @ColumnWidth(25)
109 103 private String feedbackContent;
110 104
111   - @ExcelCheck(canEmpty = false)
112 105 @ExcelProperty(value = "警情类别", index = 14)
113 106 @ContentStyle(dataFormat = 49)
114 107 @ColumnWidth(25)
115 108 private String category;
116 109
117   - @ExcelCheck(canEmpty = false)
118 110 @ExcelProperty(value = "警情类型", index = 15)
119 111 @ContentStyle(dataFormat = 49)
120 112 @ColumnWidth(25)
121 113 private String type;
122 114
123   - @ExcelCheck(canEmpty = false)
124 115 @ExcelProperty(value = "警情细类", index = 16)
125 116 @ContentStyle(dataFormat = 49)
126 117 @ColumnWidth(25)
127 118 private String typeDetail;
128 119
129   - @ExcelCheck(canEmpty = false)
130 120 @ExcelProperty(value = "警情子类", index = 17)
131 121 @ContentStyle(dataFormat = 49)
132 122 @ColumnWidth(25)
133 123 private String subType;
134 124
135   - @ExcelCheck(canEmpty = false)
136 125 @ExcelProperty(value = "处理结果", index = 18)
137 126 @ContentStyle(dataFormat = 49)
138 127 @ColumnWidth(25)
... ...
... ... @@ -260,6 +260,8 @@ public class WarningInstanceService {
260 260 mpjQueryWrapper.le("t.alarm_date", sdf.format(DateUtils.weeHours(params.getEndTime(), 1)));
261 261 }
262 262
  263 + mpjQueryWrapper.isNotNull("t.sub_type");
  264 +
263 265 mpjQueryWrapper.groupBy("t.sub_type");
264 266 mpjQueryWrapper.orderByDesc("field_count");
265 267
... ...