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