diff --git a/SC-boot/linkage-common/src/main/java/jnpf/util/ExcelUtil.java b/SC-boot/linkage-common/src/main/java/jnpf/util/ExcelUtil.java index f0cf3040..d2b01f7a 100644 --- a/SC-boot/linkage-common/src/main/java/jnpf/util/ExcelUtil.java +++ b/SC-boot/linkage-common/src/main/java/jnpf/util/ExcelUtil.java @@ -3,7 +3,10 @@ package jnpf.util; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; +import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult; +import io.netty.util.internal.ObjectUtil; import lombok.Cleanup; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -19,6 +22,7 @@ import java.util.List; */ public class ExcelUtil { + /** * excel转成实体 * @param filePath 路径 @@ -60,6 +64,7 @@ public class ExcelUtil { ImportParams params = new ImportParams(); params.setTitleRows(titleRows); params.setHeadRows(headerRows); +// params.setVerifyHandler(verifyHandler); List list = null; try { list = ExcelImportUtil.importExcel(file, pojoClass, params); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java index 9fb49639..2be7ef0f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java @@ -276,15 +276,20 @@ public class PoundlistServiceImpl extends ServiceImpl dataRowMap = new HashMap<>(); PoundlistEntity model = personList.get(i); - dataRowMap.put("customerName", model.getCustomerName()); - dataRowMap.put("vehicleName", model.getVehicleName()); - dataRowMap.put("grossWeight", model.getGrossWeight()); - dataRowMap.put("tareWeight", model.getTareWeight()); - dataRowMap.put("settlement", model.getSettlement()); - dataRowMap.put("unit", model.getUnit()); - dataRowMap.put("salesPrice", model.getSalesPrice()); - dataRowMap.put("salesAmount", model.getSalesAmount()); - dataRow.add(dataRowMap); + if (StringUtils.isBlank(model.getCustomerName()) && StringUtils.isBlank(model.getVehicleName()) && model.getGrossWeight() == null + && model.getTareWeight() == null && model.getSettlement() == null && StringUtils.isBlank(model.getUnit()) + && model.getSalesPrice()==null && StringUtils.isBlank(model.getSalesAmount())) { + }else{ + dataRowMap.put("customerName", model.getCustomerName()); + dataRowMap.put("vehicleName", model.getVehicleName()); + dataRowMap.put("grossWeight", model.getGrossWeight()); + dataRowMap.put("tareWeight", model.getTareWeight()); + dataRowMap.put("settlement", model.getSettlement()); + dataRowMap.put("unit", model.getUnit()); + dataRowMap.put("salesPrice", model.getSalesPrice()); + dataRowMap.put("salesAmount", model.getSalesAmount()); + dataRow.add(dataRowMap); + } } for (int i = 1; i < 10; i++) { Map columnsMap = new HashMap<>();