diff --git a/src/main/java/com/gaotao/modules/pallet/entity/CatchPallet.java b/src/main/java/com/gaotao/modules/pallet/entity/CatchPallet.java index 11a440f..7ae175c 100644 --- a/src/main/java/com/gaotao/modules/pallet/entity/CatchPallet.java +++ b/src/main/java/com/gaotao/modules/pallet/entity/CatchPallet.java @@ -3,7 +3,10 @@ package com.gaotao.modules.pallet.entity; import cn.idev.excel.annotation.ExcelIgnore; import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.write.style.ColumnWidth; +import cn.idev.excel.annotation.write.style.HeadFontStyle; import cn.idev.excel.annotation.write.style.HeadRowHeight; +import cn.idev.excel.annotation.write.style.HeadStyle; +import cn.idev.excel.enums.BooleanEnum; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -15,6 +18,8 @@ import java.util.Date; @Data @HeadRowHeight(value = -1) @ColumnWidth(value = 25) +@HeadStyle(fillForegroundColor = -1) // 将背景色恢复为默认透明 +@HeadFontStyle(fontName = "Arial",fontHeightInPoints = 11, bold = BooleanEnum.FALSE) // 重置字体为默认值 public class CatchPallet { @@ -24,7 +29,7 @@ public class CatchPallet { @ExcelIgnore private String site; - @ExcelProperty(value = "Pallet Label",index = 0) + @ExcelProperty(value = "Pallet No",index = 0) private String palletNo; @ExcelProperty(value = "SN",index = 1) diff --git a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java index 35fefbc..28a0ba1 100644 --- a/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pallet/service/impl/CatchPalletServiceImpl.java @@ -1,6 +1,9 @@ package com.gaotao.modules.pallet.service.impl; import cn.idev.excel.FastExcel; +import cn.idev.excel.write.metadata.style.WriteCellStyle; +import cn.idev.excel.write.metadata.style.WriteFont; +import cn.idev.excel.write.style.HorizontalCellStyleStrategy; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -45,8 +48,18 @@ public class CatchPalletServiceImpl extends ServiceImpl list = palletService.lambdaQuery() @@ -68,7 +81,7 @@ public class CatchPalletServiceImpl extends ServiceImpl 0){ - throw new RuntimeException("Pallet Label \""+pallet.getPalletNo()+"\" already exist"); + throw new RuntimeException("Pallet No \""+pallet.getPalletNo()+"\" already exist"); } Date date = new Date(); List catchPalletList = new ArrayList<>(); @@ -101,7 +114,7 @@ public class CatchPalletServiceImpl extends ServiceImpl