Showing
1 changed file
with
15 additions
and
37 deletions
| ... | ... | @@ -2,7 +2,6 @@ package com.lframework.xingyun.sc.excel.statistics; |
| 2 | 2 | |
| 3 | 3 | import com.alibaba.excel.annotation.ExcelProperty; |
| 4 | 4 | import com.alibaba.excel.annotation.format.DateTimeFormat; |
| 5 | -import com.lframework.starter.common.constants.StringPool; | |
| 6 | 5 | import com.lframework.starter.web.core.components.excel.ExcelModel; |
| 7 | 6 | import lombok.Data; |
| 8 | 7 | |
| ... | ... | @@ -25,7 +24,7 @@ public class StockInOrderDetailReportModel implements ExcelModel { |
| 25 | 24 | private String customerShortName; |
| 26 | 25 | |
| 27 | 26 | @ExcelProperty(value = "订货日期", index = 3) |
| 28 | - @DateTimeFormat(StringPool.EXCEL_DATE_PATTERN) | |
| 27 | + @DateTimeFormat("yyyy-MM-dd") | |
| 29 | 28 | private Date orderDate; |
| 30 | 29 | |
| 31 | 30 | @ExcelProperty(value = "生产厂", index = 4) |
| ... | ... | @@ -77,7 +76,7 @@ public class StockInOrderDetailReportModel implements ExcelModel { |
| 77 | 76 | private BigDecimal suggestedPrice; |
| 78 | 77 | |
| 79 | 78 | @ExcelProperty(value = "交货日期", index = 20) |
| 80 | - @DateTimeFormat(StringPool.EXCEL_DATE_PATTERN) | |
| 79 | + @DateTimeFormat("yyyy-MM-dd") | |
| 81 | 80 | private Date deliveryDate; |
| 82 | 81 | |
| 83 | 82 | @ExcelProperty(value = "超价协调价", index = 21) |
| ... | ... | @@ -161,7 +160,7 @@ public class StockInOrderDetailReportModel implements ExcelModel { |
| 161 | 160 | @ExcelProperty(value = "备用", index = 47) |
| 162 | 161 | private String reserve2; |
| 163 | 162 | |
| 164 | - @ExcelProperty(value = "备用", index = 48) | |
| 163 | + @ExcelProperty(value = "备用\u200B", index = 48) | |
| 165 | 164 | private String reserve3; |
| 166 | 165 | |
| 167 | 166 | @ExcelProperty(value = "备用", index = 49) |
| ... | ... | @@ -188,93 +187,72 @@ public class StockInOrderDetailReportModel implements ExcelModel { |
| 188 | 187 | @ExcelProperty(value = "备用", index = 56) |
| 189 | 188 | private String reserve5; |
| 190 | 189 | |
| 191 | - @ExcelProperty(value = "备用", index = 57) | |
| 190 | + @ExcelProperty(value = "备用\u200B", index = 57) | |
| 192 | 191 | private String reserve6; |
| 193 | 192 | |
| 194 | 193 | @ExcelProperty(value = "备用", index = 58) |
| 195 | 194 | private String reserve7; |
| 196 | 195 | |
| 197 | - @ExcelProperty(value = "备用", index = 59) | |
| 196 | + @ExcelProperty(value = "备用\u200B", index = 59) | |
| 198 | 197 | private String reserve8; |
| 199 | 198 | |
| 200 | 199 | @ExcelProperty(value = "备用", index = 60) |
| 201 | 200 | private String reserve9; |
| 202 | 201 | |
| 203 | - @ExcelProperty(value = "备用", index = 61) | |
| 202 | + @ExcelProperty(value = "备用\u200B", index = 61) | |
| 204 | 203 | private String reserve10; |
| 205 | 204 | |
| 206 | 205 | @ExcelProperty(value = "备用", index = 62) |
| 207 | 206 | private String reserve11; |
| 208 | 207 | |
| 209 | - @ExcelProperty(value = "备用", index = 63) | |
| 208 | + @ExcelProperty(value = "备用\u200B", index = 63) | |
| 210 | 209 | private String reserve12; |
| 211 | 210 | |
| 212 | 211 | @ExcelProperty(value = "备用", index = 64) |
| 213 | 212 | private String reserve13; |
| 214 | 213 | |
| 215 | - @ExcelProperty(value = "备用", index = 65) | |
| 214 | + @ExcelProperty(value = "备用\u200B", index = 65) | |
| 216 | 215 | private String reserve14; |
| 217 | 216 | |
| 218 | 217 | @ExcelProperty(value = "备用", index = 66) |
| 219 | 218 | private String reserve15; |
| 220 | 219 | |
| 221 | - @ExcelProperty(value = "备用", index = 67) | |
| 220 | + @ExcelProperty(value = "备用\u200B", index = 67) | |
| 222 | 221 | private String reserve16; |
| 223 | 222 | |
| 224 | 223 | @ExcelProperty(value = "备用", index = 68) |
| 225 | 224 | private String reserve17; |
| 226 | 225 | |
| 227 | - @ExcelProperty(value = "备用", index = 69) | |
| 226 | + @ExcelProperty(value = "备用\u200B", index = 69) | |
| 228 | 227 | private String reserve18; |
| 229 | 228 | |
| 230 | 229 | @ExcelProperty(value = "备用", index = 70) |
| 231 | 230 | private String reserve19; |
| 232 | 231 | |
| 233 | - @ExcelProperty(value = "备用", index = 71) | |
| 232 | + @ExcelProperty(value = "备用\u200B", index = 71) | |
| 234 | 233 | private String reserve20; |
| 235 | 234 | |
| 236 | 235 | @ExcelProperty(value = "备用", index = 72) |
| 237 | 236 | private String reserve21; |
| 238 | 237 | |
| 239 | - @ExcelProperty(value = "备用", index = 73) | |
| 238 | + @ExcelProperty(value = "备用\u200B", index = 73) | |
| 240 | 239 | private String reserve22; |
| 241 | 240 | |
| 242 | 241 | @ExcelProperty(value = "备用", index = 74) |
| 243 | 242 | private String reserve23; |
| 244 | 243 | |
| 245 | - @ExcelProperty(value = "备用", index = 75) | |
| 244 | + @ExcelProperty(value = "备用\u200B", index = 75) | |
| 246 | 245 | private String reserve24; |
| 247 | 246 | |
| 248 | 247 | @ExcelProperty(value = "备用", index = 76) |
| 249 | 248 | private String reserve25; |
| 250 | 249 | |
| 251 | - @ExcelProperty(value = "备用", index = 77) | |
| 250 | + @ExcelProperty(value = "备用\u200B", index = 77) | |
| 252 | 251 | private String reserve26; |
| 253 | 252 | |
| 254 | 253 | @ExcelProperty(value = "备用", index = 78) |
| 255 | 254 | private String reserve27; |
| 256 | 255 | |
| 257 | - @ExcelProperty(value = "备用", index = 79) | |
| 256 | + @ExcelProperty(value = "备用\u200B", index = 79) | |
| 258 | 257 | private String reserve28; |
| 259 | - | |
| 260 | - @ExcelProperty(value = "备用", index = 80) | |
| 261 | - private String reserve29; | |
| 262 | - | |
| 263 | - @ExcelProperty(value = "备用", index = 81) | |
| 264 | - private String reserve30; | |
| 265 | - | |
| 266 | - @ExcelProperty(value = "备用", index = 82) | |
| 267 | - private String reserve31; | |
| 268 | - | |
| 269 | - @ExcelProperty(value = "备用", index = 83) | |
| 270 | - private String reserve32; | |
| 271 | - | |
| 272 | - @ExcelProperty(value = "备用", index = 84) | |
| 273 | - private String reserve33; | |
| 274 | - | |
| 275 | - @ExcelProperty(value = "备用", index = 85) | |
| 276 | - private String reserve34; | |
| 277 | - | |
| 278 | - @ExcelProperty(value = "备用", index = 86) | |
| 279 | - private String reserve35; | |
| 280 | 258 | } | ... | ... |