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;