From b38a4659d01429b14c343c2a1fbf1cc16792dff3 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 25 Dec 2024 15:43:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E5=B9=B2=E7=BA=BF=E8=BD=A6?= =?UTF-8?q?=E6=AC=A1=E8=B4=B9=E7=94=A8=E7=9A=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/statistics/vo/TrunklineCarCostExcel.java | 6 +++--- .../statistics/controller/TrunklineCarCostController.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java index a098c3c5a..bbf6855f7 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java @@ -55,8 +55,8 @@ public class TrunklineCarCostExcel implements Serializable { * 车次类型 1外请 2自有 目前该字段不使用 * */ - @ExcelProperty(value = "车次类型 1外请 2自有 ") - private Integer carsNoType; + @ExcelProperty(value = "车次类型") + private String carsNoTypeString; /** * 调车员 @@ -78,7 +78,7 @@ public class TrunklineCarCostExcel implements Serializable { /** * 货物品牌，多个拼接在一起 */ - @ExcelProperty(value = "货物品牌,多个拼接在一起") + @ExcelProperty(value = "货物品牌") private String brands; /** diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java index f581348c9..fd20f0f80 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java @@ -83,7 +83,7 @@ public class TrunklineCarCostController extends BladeController { List data = new ArrayList<>(); for (TrunklineCarCostEntity l : ls) { TrunklineCarCostExcel t =BeanUtil.copy(l, TrunklineCarCostExcel.class); - + t.setCarsNoTypeString(l.getCarsNoType()==1?"外请":"自有"); data.add(t); } return data;