Browse Source

fix:

1.干线车次费用的导出
pre-production
pref_mail@163.com 4 weeks ago
parent
commit
b38a4659d0
  1. 6
      blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/vo/TrunklineCarCostExcel.java
  2. 2
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java

6
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;
/**

2
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/TrunklineCarCostController.java

@ -83,7 +83,7 @@ public class TrunklineCarCostController extends BladeController {
List<TrunklineCarCostExcel> data = new ArrayList<>();
for (TrunklineCarCostEntity l : ls) {
TrunklineCarCostExcel t =BeanUtil.copy(l, TrunklineCarCostExcel.class);
t.setCarsNoTypeString(l.getCarsNoType()==1?"外请":"自有");
data.add(t);
}
return data;

Loading…
Cancel
Save