This commit is contained in:
Paidax
2025-01-16 20:41:17 +08:00
parent 6795c475df
commit 4beba06d11
7 changed files with 34 additions and 44 deletions
@@ -456,15 +456,15 @@ public class WelfareListController {
if (StrUtil.isNotBlank(courierNumberExcelMode.getOneCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getOneCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber());
}
if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) {
courierNumberList.add(courierNumberExcelMode.getFourCourierNumber());
}
// if (StrUtil.isNotBlank(courierNumberExcelMode.getTwoCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getTwoCourierNumber());
// }
// if (StrUtil.isNotBlank(courierNumberExcelMode.getThreeCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getThreeCourierNumber());
// }
// if (StrUtil.isNotBlank(courierNumberExcelMode.getFourCourierNumber())) {
// courierNumberList.add(courierNumberExcelMode.getFourCourierNumber());
// }
for (String number : courierNumberList) {
WelfareCourierNumber courierNumber = new WelfareCourierNumber();
@@ -12,7 +12,7 @@ public class CourierNumberExcelMode {
@Excel(name = "姓名", width = 20)
private String userName;
@Excel(name = "快递单号1", width = 30)
@Excel(name = "快递单号", width = 30)
private String oneCourierNumber;
@Excel(name = "快递单号2", width = 30)