b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
b2894lxlx
2026-08-12 21:19:24 +08:00
parent 1109fe777c
commit 4571a7fce0
4 changed files with 12 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/LoadingManageExcel.java
+8 -41
View File
@@ -13,7 +13,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
@@ -34,17 +33,7 @@ public class LoadingManageExcel implements Serializable {
private String loadingNo;
@ExcelProperty("配载子单号")
private String loadingSubNos;
@ExcelProperty("项目名称")
private String projectName;
@ExcelProperty("客户名称")
private String customerName;
@ExcelProperty("运输类型")
private String transportType;
@ExcelProperty("货物类型")
private String cargoType;
@ExcelProperty("货物名称")
private String cargoName;
@ExcelProperty("车/船/航班/班列")
@ExcelProperty("车牌号/航班号/船号/班列号")
private String vehicleNo;
@ExcelProperty("司机")
private String driverName;
@@ -54,46 +43,24 @@ public class LoadingManageExcel implements Serializable {
private String carrierType;
@ExcelProperty("承运商")
private String carrierName;
@ExcelProperty("发货地址")
@ExcelProperty("发货地")
private String departureAddress;
@ExcelProperty("途经地")
private String transitAddress;
@ExcelProperty("到货地")
private String arrivalAddress;
@ExcelProperty("原始单号")
private String originalNo;
@ExcelProperty("运输类型")
private String transportType;
@ExcelProperty("数据来源")
private String dataSource;
@ExcelProperty("开始日期")
private LocalDate startDate;
@ExcelProperty("结束日期")
private LocalDate endDate;
@ExcelProperty("计划名称")
private String planName;
@ExcelProperty("运单批次号")
private String batchNo;
@ExcelProperty("当前过程节点")
private String currentProcessNode;
@ExcelProperty("里程")
private String mileage;
@ExcelProperty("预计发货日期")
private LocalDate estimatedStartDate;
@ExcelProperty("预计完成日期")
private LocalDate estimatedEndDate;
@ExcelProperty("任务备注")
private String taskRemark;
@ExcelProperty("业务状态")
private String businessStatus;
@ExcelProperty("所属组织")
private String deptName;
@ExcelProperty("创建人")
private String createUserName;
@ExcelProperty("更新人")
private String updateUserName;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("更新时间")
private LocalDateTime updateTime;
@ExcelProperty("过程节点")
private String currentProcessNode;
@ExcelProperty("状态")
private String businessStatus;
@ExcelIgnore
private String errorMessage;
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ShippingTemplateExcel.java
+4 -28
View File
@@ -52,39 +52,15 @@ public class ShippingTemplateExcel implements Serializable {
private String templateName;
@ExcelProperty("模板类型")
private String templateType;
@ExcelProperty("项目")
private String projectName;
@ExcelProperty("客户合同")
private String contractName;
@ExcelProperty("运输类型")
private String transportType;
@ExcelProperty("发货地")
private String departureName;
@ExcelProperty("发货地址")
private String departureAddress;
@ExcelProperty("发货联系人")
private String departureContact;
@ExcelProperty("发货联系方式")
private String departurePhone;
@ExcelProperty("收货地")
private String arrivalName;
@ExcelProperty("收货地址")
private String arrivalAddress;
@ExcelProperty("收货联系人")
private String arrivalContact;
@ExcelProperty("收货联系方式")
private String arrivalPhone;
@ExcelProperty("所属组织")
private String deptName;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("创建人")
private String createUserName;
@ExcelProperty("更新人")
private String updateUserName;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("备注")
private String remark;
@ExcelProperty("更新时间")
private LocalDateTime updateTime;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/LoadingManageServiceImpl.java
-4
View File
@@ -13,7 +13,6 @@ import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.UserCache;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.transport.excel.LoadingManageExcel;
import org.springblade.transport.mapper.LoadingManageMapper;
@@ -157,9 +156,6 @@ public class LoadingManageServiceImpl extends BaseServiceImpl<LoadingManageMappe
return list(queryWrapper).stream().map(record -> {
LoadingManageExcel excel = new LoadingManageExcel();
BeanUtil.copyProperties(record, excel);
excel.setCreateUserName(UserCache.getUserRealName(record.getCreateUser()));
excel.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()));
excel.setMileage(formatMileage(record.getMileage()));
return excel;
}).toList();
}
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ShippingTemplateServiceImpl.java
-1
View File
@@ -131,7 +131,6 @@ public class ShippingTemplateServiceImpl extends BaseServiceImpl<ShippingTemplat
ShippingTemplateExcel excel = new ShippingTemplateExcel();
BeanUtil.copyProperties(record, excel);
excel.setCreateUserName(UserCache.getUserRealName(record.getCreateUser()));
excel.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()));
return excel;
}).toList();
}