diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonAddressController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonAddressController.java index 48f2403..37d3750 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonAddressController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonAddressController.java @@ -41,7 +41,7 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springblade.transport.excel.CommonAddressExcel; +import org.springblade.transport.excel.CommonAddressExportExcel; import org.springblade.transport.pojo.entity.CommonAddress; import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO; import org.springblade.transport.pojo.vo.CommonAddressVO; @@ -136,8 +136,8 @@ public class CommonAddressController extends BladeController { public void exportCommonAddress(CommonAddressVO commonAddress, @RequestParam(required = false) String ids, HttpServletResponse response) { - List list = commonAddressService.exportCommonAddress(buildExportQuery(commonAddress, ids)); - ExcelUtil.export(response, "常用地址" + DateUtil.time(), "常用地址", list, CommonAddressExcel.class); + List list = commonAddressService.exportCommonAddress(buildExportQuery(commonAddress, ids)); + ExcelUtil.export(response, "常用地址" + DateUtil.time(), "常用地址", list, CommonAddressExportExcel.class); } private Query normalizeQuery(Query query) { diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonCargoController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonCargoController.java index 73ee36d..34b54fa 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonCargoController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonCargoController.java @@ -112,7 +112,7 @@ public class CommonCargoController extends BladeController { public R importCommonCargo(MultipartFile file, HttpServletResponse response) { List failureList = commonCargoService.importCommonCargo(ExcelUtil.read(file, CommonCargoExcel.class)); if (Func.isNotEmpty(failureList)) { - ImportFailureExcelUtil.export(response, "常用货物导入失败明细" + DateUtil.time(), "导入失败明细", failureList, CommonCargoExcel.class); + ImportFailureExcelUtil.export(response, "常用货物导入失败明细" + DateUtil.time(), "导入失败明细", failureList, CommonCargoImportFailureExcel.class); return null; } return R.success("导入数据成功"); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonRouteController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonRouteController.java index 7ca3e91..6196605 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonRouteController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonRouteController.java @@ -38,7 +38,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.common.excel.ImportFailureExcelUtil; -import org.springblade.transport.excel.CommonRouteExcel; +import org.springblade.transport.excel.CommonRouteExportExcel; import org.springblade.transport.excel.CommonRouteImportExcel; import org.springblade.transport.pojo.entity.CommonRoute; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; @@ -101,8 +101,8 @@ public class CommonRouteController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "导出常用线路") public void exportCommonRoute(CommonRouteVO commonRoute, @RequestParam(required = false) String ids, HttpServletResponse response) { - List list = commonRouteService.exportCommonRoute(commonRoute, ids); - ExcelUtil.export(response, "常用线路" + DateUtil.time(), "常用线路", list, CommonRouteExcel.class); + List list = commonRouteService.exportCommonRoute(commonRoute, ids); + ExcelUtil.export(response, "常用线路" + DateUtil.time(), "常用线路", list, CommonRouteExportExcel.class); } @PostMapping("/import-common-route") diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProcessConfigController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProcessConfigController.java index 1bf3097..efadf14 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProcessConfigController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProcessConfigController.java @@ -39,7 +39,7 @@ import org.springblade.core.secure.annotation.PreAuth; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springblade.transport.excel.ProcessConfigExcel; +import org.springblade.transport.excel.ProcessConfigExportExcel; import org.springblade.transport.mapper.VoucherImageMapper; import org.springblade.transport.pojo.entity.ProcessConfig; import org.springblade.transport.pojo.entity.VoucherImage; @@ -151,8 +151,8 @@ public class ProcessConfigController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "导出过程配置") public void exportProcessConfig(ProcessConfigVO processConfig, @RequestParam(required = false) String ids, HttpServletResponse response) { - List list = processConfigService.exportProcessConfig(processConfig, ids); - ExcelUtil.export(response, "过程配置" + DateUtil.time(), "过程配置", list, ProcessConfigExcel.class); + List list = processConfigService.exportProcessConfig(processConfig, ids); + ExcelUtil.export(response, "过程配置" + DateUtil.time(), "过程配置", list, ProcessConfigExportExcel.class); } @PostMapping("/copy") diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java similarity index 92% rename from blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExcel.java rename to blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java index 420cdca..a2ae4f9 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java @@ -32,10 +32,10 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDateTime; +import java.util.Date; /** - * 常用地址 Excel + * 常用地址导出 Excel * * @author Chill */ @@ -43,7 +43,7 @@ import java.time.LocalDateTime; @ColumnWidth(18) @HeadRowHeight(20) @ContentRowHeight(18) -public class CommonAddressExcel implements Serializable { +public class CommonAddressExportExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -88,9 +88,9 @@ public class CommonAddressExcel implements Serializable { private String remark; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("创建时间") - private LocalDateTime createTime; + private Date createTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExcel.java index 5a4d7a8..4440dc7 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExcel.java @@ -49,46 +49,43 @@ public class CommonCargoExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - @ExcelProperty("*一级货物类型") - private String firstCargoTypeName; - - @ExcelProperty("*二级货物类型编码") - private String secondCargoTypeCode; - @ExcelProperty("*货物名称") private String cargoName; @ExcelProperty("*货物编号后缀") private String cargoCodeSuffix; - @ExcelProperty("品牌") - private String brand; + @ExcelProperty("*一级货物类型") + private String firstCargoTypeName; + + @ExcelProperty("*二级货物类型") + private String secondCargoTypeName; + + @ExcelProperty("*二级货物类型编码") + private String secondCargoTypeCode; @ExcelProperty("包装") private String packageType; + @ExcelProperty("品牌") + private String brand; + + @ExcelProperty("规格") + private String specification; + + @ExcelProperty("型号") + private String model; + @ExcelProperty("单价") @NumberFormat("0.00") private BigDecimal cargoValue; - @ExcelProperty("规格") - private String specification; - @ExcelProperty("计价单位") private String priceUnit; - @ExcelProperty("型号") - private String model; - - @ExcelProperty("说明1") + @ExcelProperty("说明") private String descriptionOne; - @ExcelProperty("尺寸") - private String sizeText; - - @ExcelProperty("说明2") - private String descriptionTwo; - @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java index b9bf5e6..3cc8fcf 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java @@ -33,7 +33,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.math.BigDecimal; -import java.time.LocalDateTime; +import java.util.Date; /** * 常用货物导出 Excel @@ -52,8 +52,8 @@ public class CommonCargoExportExcel implements Serializable { @ExcelProperty("货物名称") private String cargoName; - @ExcelProperty("货物编号") - private String cargoCode; + @ExcelProperty("货物编号后缀") + private String cargoCodeSuffix; @ExcelProperty("一级货物类型") private String firstCargoTypeName; @@ -64,8 +64,11 @@ public class CommonCargoExportExcel implements Serializable { @ExcelProperty("二级货物类型编码") private String secondCargoTypeCode; - @ExcelProperty("包装品牌") - private String packageBrand; + @ExcelProperty("包装") + private String packageType; + + @ExcelProperty("品牌") + private String brand; @ExcelProperty("规格") private String specification; @@ -80,15 +83,9 @@ public class CommonCargoExportExcel implements Serializable { @ExcelProperty("计价单位") private String priceUnit; - @ExcelProperty("尺寸") - private String sizeText; - - @ExcelProperty("其他说明1") + @ExcelProperty("说明") private String descriptionOne; - @ExcelProperty("其他说明2") - private String descriptionTwo; - @ExcelProperty("备注") private String remark; @@ -96,9 +93,9 @@ public class CommonCargoExportExcel implements Serializable { private String deptName; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + private Date updateTime; @ExcelProperty("创建时间") - private LocalDateTime createTime; + private Date createTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoImportFailureExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoImportFailureExcel.java index 85ac9eb..7fc3fc8 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoImportFailureExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoImportFailureExcel.java @@ -49,46 +49,43 @@ public class CommonCargoImportFailureExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; - @ExcelProperty("*一级货物类型") - private String firstCargoTypeName; - - @ExcelProperty("*二级货物类型编码") - private String secondCargoTypeCode; - @ExcelProperty("*货物名称") private String cargoName; @ExcelProperty("*货物编号后缀") private String cargoCodeSuffix; - @ExcelProperty("品牌") - private String brand; + @ExcelProperty("*一级货物类型") + private String firstCargoTypeName; + + @ExcelProperty("*二级货物类型") + private String secondCargoTypeName; + + @ExcelProperty("*二级货物类型编码") + private String secondCargoTypeCode; @ExcelProperty("包装") private String packageType; + @ExcelProperty("品牌") + private String brand; + + @ExcelProperty("规格") + private String specification; + + @ExcelProperty("型号") + private String model; + @ExcelProperty("单价") @NumberFormat("0.00") private BigDecimal cargoValue; - @ExcelProperty("规格") - private String specification; - @ExcelProperty("计价单位") private String priceUnit; - @ExcelProperty("型号") - private String model; - - @ExcelProperty("说明1") + @ExcelProperty("说明") private String descriptionOne; - @ExcelProperty("尺寸") - private String sizeText; - - @ExcelProperty("说明2") - private String descriptionTwo; - @ExcelProperty("备注") private String remark; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExportExcel.java similarity index 92% rename from blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExcel.java rename to blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExportExcel.java index 31b2b76..8743d0c 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExportExcel.java @@ -30,10 +30,10 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** - * 常用线路 Excel + * 常用线路导出 Excel * * @author Chill */ @@ -41,7 +41,7 @@ import java.time.LocalDateTime; @ColumnWidth(22) @HeadRowHeight(20) @ContentRowHeight(18) -public class CommonRouteExcel implements Serializable { +public class CommonRouteExportExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -74,9 +74,9 @@ public class CommonRouteExcel implements Serializable { private String createUserName; @ExcelProperty("更新人") private String updateUserName; - @ExcelProperty("创建时间") - private LocalDateTime createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + private Date updateTime; + @ExcelProperty("创建时间") + private Date createTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExcel.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExportExcel.java similarity index 91% rename from blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExcel.java rename to blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExportExcel.java index cd565dc..8def790 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExcel.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExportExcel.java @@ -30,10 +30,10 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; +import java.util.Date; /** - * 过程配置 Excel + * 过程配置导出 Excel * * @author Chill */ @@ -41,7 +41,7 @@ import java.time.LocalDateTime; @ColumnWidth(22) @HeadRowHeight(20) @ContentRowHeight(18) -public class ProcessConfigExcel implements Serializable { +public class ProcessConfigExportExcel implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -68,9 +68,9 @@ public class ProcessConfigExcel implements Serializable { private String createUserName; @ExcelProperty("更新人") private String updateUserName; - @ExcelProperty("创建时间") - private LocalDateTime createTime; @ExcelProperty("更新时间") - private LocalDateTime updateTime; + private Date updateTime; + @ExcelProperty("创建时间") + private Date createTime; } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonAddressService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonAddressService.java index 8b652f7..31c889e 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonAddressService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonAddressService.java @@ -25,7 +25,7 @@ package org.springblade.transport.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; -import org.springblade.transport.excel.CommonAddressExcel; +import org.springblade.transport.excel.CommonAddressExportExcel; import org.springblade.transport.pojo.entity.CommonAddress; import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO; import org.springblade.transport.pojo.vo.CommonAddressVO; @@ -87,6 +87,6 @@ public interface ICommonAddressService extends BaseService { * @param queryWrapper 查询条件 * @return 导出数据 */ - List exportCommonAddress(Wrapper queryWrapper); + List exportCommonAddress(Wrapper queryWrapper); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonRouteService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonRouteService.java index 7f05d36..e02339d 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonRouteService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonRouteService.java @@ -24,7 +24,7 @@ package org.springblade.transport.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; -import org.springblade.transport.excel.CommonRouteExcel; +import org.springblade.transport.excel.CommonRouteExportExcel; import org.springblade.transport.excel.CommonRouteImportExcel; import org.springblade.transport.pojo.entity.CommonRoute; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; @@ -43,7 +43,7 @@ public interface ICommonRouteService extends BaseService { CommonRouteVO detail(Long id); boolean submit(CommonRoute commonRoute); BusinessRemoveResultVO removeCommonRoute(String ids); - List exportCommonRoute(CommonRouteVO commonRoute, String ids); + List exportCommonRoute(CommonRouteVO commonRoute, String ids); List importCommonRoute(List data); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProcessConfigService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProcessConfigService.java index 294bc1d..6939d91 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProcessConfigService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProcessConfigService.java @@ -24,7 +24,7 @@ package org.springblade.transport.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; -import org.springblade.transport.excel.ProcessConfigExcel; +import org.springblade.transport.excel.ProcessConfigExportExcel; import org.springblade.transport.pojo.entity.ProcessConfig; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; import org.springblade.transport.pojo.vo.ProcessConfigVO; @@ -42,7 +42,7 @@ public interface IProcessConfigService extends BaseService { ProcessConfigVO detail(Long id); boolean submit(ProcessConfig processConfig); BusinessRemoveResultVO removeProcessConfig(String ids); - List exportProcessConfig(ProcessConfigVO processConfig, String ids); + List exportProcessConfig(ProcessConfigVO processConfig, String ids); ProcessConfigVO copy(Long id); boolean enable(Long id); boolean disable(Long id); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java index 949fdd4..c20948a 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java @@ -32,7 +32,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.SysCache; import org.springblade.system.cache.UserCache; import org.springblade.system.pojo.entity.Dept; -import org.springblade.transport.excel.CommonAddressExcel; +import org.springblade.transport.excel.CommonAddressExportExcel; import org.springblade.transport.mapper.CommonAddressMapper; import org.springblade.transport.pojo.entity.CommonAddress; import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO; @@ -156,9 +156,9 @@ public class CommonAddressServiceImpl extends BaseServiceImpl exportCommonAddress(Wrapper queryWrapper) { + public List exportCommonAddress(Wrapper queryWrapper) { return list(queryWrapper).stream().map(address -> { - CommonAddressExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(address, CommonAddressExcel.class)); + CommonAddressExportExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(address, CommonAddressExportExcel.class)); excel.setSiteCodeDisplay(TYPE_NORMAL.equals(address.getAddressType()) ? NORMAL_SITE_CODE : address.getSiteCode()); return excel; }).toList(); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonCargoServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonCargoServiceImpl.java index 91fbbcc..8171531 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonCargoServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonCargoServiceImpl.java @@ -70,15 +70,18 @@ public class CommonCargoServiceImpl extends BaseServiceImpl { CommonCargoExportExcel excel = new CommonCargoExportExcel(); BeanUtil.copyProperties(record, excel); + excel.setCargoCodeSuffix(cargoCodeSuffix(record)); excel.setCargoValue(normalizeCargoValue(record.getCargoValue())); - excel.setPackageBrand(String.join(" / ", List.of( - Func.isEmpty(record.getPackageType()) ? "" : record.getPackageType(), - Func.isEmpty(record.getBrand()) ? "" : record.getBrand() - ).stream().filter(value -> !value.isEmpty()).toList())); return excel; }).toList(); } + private String cargoCodeSuffix(CommonCargo commonCargo) { + String cargoCode = commonCargo.getCargoCode(); + if (Func.isEmpty(cargoCode)) { + return null; + } + String prefix = commonCargo.getSecondCargoTypeCode(); + if (Func.isNotEmpty(prefix) && cargoCode.startsWith(prefix.substring(0, Math.min(4, prefix.length())))) { + return cargoCode.substring(Math.min(4, prefix.length())); + } + return cargoCode; + } + @Override @Transactional(rollbackFor = Exception.class) public List importCommonCargo(List data) { @@ -154,11 +166,9 @@ public class CommonCargoServiceImpl extends BaseServiceImpllambdaQuery().eq(CommonCargo::getCargoCode, commonCargo.getCargoCode()).ne(Func.isNotEmpty(commonCargo.getId()), CommonCargo::getId, commonCargo.getId()).eq(CommonCargo::getIsDeleted, 0)) > 0) { throw new ServiceException("该货物编号已存在"); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonRouteServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonRouteServiceImpl.java index ebcfa8c..10d7f8d 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonRouteServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonRouteServiceImpl.java @@ -31,7 +31,7 @@ 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.CommonRouteExcel; +import org.springblade.transport.excel.CommonRouteExportExcel; import org.springblade.transport.excel.CommonRouteImportExcel; import org.springblade.transport.mapper.CommonRouteMapper; import org.springblade.transport.pojo.entity.CommonRoute; @@ -110,13 +110,13 @@ public class CommonRouteServiceImpl extends BaseServiceImpl exportCommonRoute(CommonRouteVO commonRoute, String ids) { + public List exportCommonRoute(CommonRouteVO commonRoute, String ids) { LambdaQueryWrapper queryWrapper = buildQuery(commonRoute); if (Func.isNotEmpty(ids)) { queryWrapper.in(CommonRoute::getId, Func.toLongList(ids)); } return list(queryWrapper).stream().map(record -> { - CommonRouteExcel excel = new CommonRouteExcel(); + CommonRouteExportExcel excel = new CommonRouteExportExcel(); BeanUtil.copyProperties(record, excel); excel.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); excel.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProcessConfigServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProcessConfigServiceImpl.java index 13a2dc3..131e546 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProcessConfigServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProcessConfigServiceImpl.java @@ -31,7 +31,7 @@ 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.ProcessConfigExcel; +import org.springblade.transport.excel.ProcessConfigExportExcel; import org.springblade.transport.mapper.ProcessConfigMapper; import org.springblade.transport.pojo.entity.ProcessConfig; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; @@ -109,13 +109,13 @@ public class ProcessConfigServiceImpl extends BaseServiceImpl exportProcessConfig(ProcessConfigVO processConfig, String ids) { + public List exportProcessConfig(ProcessConfigVO processConfig, String ids) { LambdaQueryWrapper queryWrapper = buildQuery(processConfig); if (Func.isNotEmpty(ids)) { queryWrapper.in(ProcessConfig::getId, Func.toLongList(ids)); } return list(queryWrapper).stream().map(record -> { - ProcessConfigExcel excel = new ProcessConfigExcel(); + ProcessConfigExportExcel excel = new ProcessConfigExportExcel(); BeanUtil.copyProperties(record, excel); excel.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); excel.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); diff --git a/doc/sql/transport/blade_tms_business.sql b/doc/sql/transport/blade_tms_business.sql index 2c9d133..5739a02 100644 --- a/doc/sql/transport/blade_tms_business.sql +++ b/doc/sql/transport/blade_tms_business.sql @@ -72,7 +72,7 @@ CREATE TABLE `blade_common_cargo` ( `specification` varchar(100) DEFAULT NULL COMMENT '规格', `price_unit` varchar(100) DEFAULT NULL COMMENT '计价单位', `model` varchar(100) DEFAULT NULL COMMENT '型号', - `description_one` varchar(100) DEFAULT NULL COMMENT '说明1', + `description_one` varchar(100) DEFAULT NULL COMMENT '说明', `size_text` varchar(100) DEFAULT NULL COMMENT '尺寸', `description_two` varchar(100) DEFAULT NULL COMMENT '说明2', `data_source` varchar(100) DEFAULT NULL COMMENT '数据来源',