From 314f98c46840f6da1849c82bdefeb6d8888dd644 Mon Sep 17 00:00:00 2001 From: "BF-202309241046\\Administrator" Date: Sun, 10 Dec 2023 14:56:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/excel/ExportDeviceHelper.java | 7 ++++++- .../pojo/query/OptionalEbomConfigListQuery.java | 4 ++-- .../bomnew/service/aggreg/OptionalExcelService.java | 13 ++++++++++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java index e729b1de..31943fb9 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/ExportDeviceHelper.java @@ -333,7 +333,12 @@ public class ExportDeviceHelper { ImportExcelField excelField = new ImportExcelField(); excelField.setCellFirst(optionParentDrawingNoName); excelField.setCellSecond(String.format("%s %s", optionChildDrawingNoName, opChildName)); - excelField.setCellThird(String.format("%s %s：（%s）", item3.getDrawingNo(), item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选")); + if(StrUtil.isEmpty(item3.getDrawingNo())) { + excelField.setCellThird(String.format("%s：（%s）", item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选")); + }else { + excelField.setCellThird(String.format("%s：%s（%s）", item3.getDrawingNo(), item3.getMaterialName(), item3.getChooseStatus() == 1 ? "标配" : "可选")); + + } items.add(excelField); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java index 642a901b..d749c68f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java @@ -23,11 +23,11 @@ public class OptionalEbomConfigListQuery extends BasePageQuery implements Ser @ApiModelProperty(value = "开始时间") - private Date startDate; + private String startDate; @ApiModelProperty(value = "结束时间") - private Date endDate; + private String endDate; //状态 private Integer editStatus; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java index 0514ca36..a74d01c4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/OptionalExcelService.java @@ -63,9 +63,16 @@ public class OptionalExcelService { } optionalEbomImportLevel2Dto.getChild().add(levelDto3); - String[] optionName1 = item.getCellThird().trim().split("："); - String materialName = optionName1[1]; - levelDto3.setDrawingNo(optionName1[0]); + String cloumn3=item.getCellThird().trim(); + String materialName; + if(cloumn3.contains("：")) { + String[] optionName1 = item.getCellThird().trim().split("："); + materialName = optionName1[1]; + levelDto3.setDrawingNo(optionName1[0]); + + }else{ + materialName=cloumn3; + } // levelDto3.setMaterialName(optionName1[1]); levelDto3.setLineNo(item.getLineNo());