From 5e844e1837eb77216ca8eb16dec6f1fe058b0877 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 15 Mar 2024 10:35:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(xml):=20=E4=BF=AE=E6=94=B9=E8=87=AA?= =?UTF-8?q?=E6=8F=90=E6=98=8E=E7=BB=86=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改自提明细报表查询报错 --- .../java/com/logpm/report/mapper/ReportBillLoadingMapper.xml | 2 +- .../src/main/java/com/logpm/report/util/ThreadPoolUtil.java | 4 +++- .../src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml index 49a5e306a..dab9ed3c6 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml @@ -82,7 +82,7 @@ dpl.description_goods material_name, '' start_ware_in_time, '' start_ware_out_time, - dpl.warehousing_time, + dpl.warehousing_time warehouse_entry_time_end, dbls.create_user scan_user, dbls.create_time scan_time, dbl.update_time examine_time, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java index 3839a59dc..f380ba860 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ThreadPoolUtil.java @@ -16,7 +16,9 @@ public class ThreadPoolUtil { private ThreadPoolUtil() { } - //构建线程池 + /** + * 导出线程池 + */ public static ExecutorService executor = null; static { init(); diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java index aad1dace7..62659a5ee 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingTasksVO.java @@ -87,7 +87,7 @@ public class BillLoadingTasksVO implements Serializable { @ApiModelProperty(value = "实际提货件数") @ExcelProperty("实际提货件数") - private String BillLoadingNum; + private String billLoadingNum; @ApiModelProperty(value = "到付运费") @ExcelProperty("到付运费")