From 35abaf305a81c7ffa90a5ad6ca60b3c6a6bd1415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 23 Dec 2024 09:34:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=9C=9F?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=B8=BAdatetime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/technology/pojo/vo/MaterialCostVO.java | 7 ++++--- .../technology/service/ProductCostAnalysisService.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/MaterialCostVO.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/MaterialCostVO.java index bd0b1125..c0ec6337 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/MaterialCostVO.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/vo/MaterialCostVO.java @@ -8,6 +8,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * @author 曹鹏飞 @@ -75,10 +76,10 @@ public class MaterialCostVO implements Serializable { } @ApiModelProperty("交期") - private Integer leadTime; + private LocalDateTime leadTime; - public Integer getLeadTime() { - return RandomUtil.randomInt(1000); + public LocalDateTime getLeadTime() { + return LocalDateTime.now().plusDays(RandomUtil.randomInt(365)); } @ApiModelProperty("物料行id") diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProductCostAnalysisService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProductCostAnalysisService.java index a3eb93a3..cbd8095e 100644 --- a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProductCostAnalysisService.java +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProductCostAnalysisService.java @@ -258,7 +258,7 @@ public class ProductCostAnalysisService { materialCostVO.setMaterialCategoryName("物料类别" + i); materialCostVO.setInventory(RandomUtil.randomBigDecimal(100, 2)); materialCostVO.setMaterialUnit("PC"); - materialCostVO.setLeadTime(RandomUtil.randomInt(30)); + materialCostVO.setLeadTime(LocalDateTime.now().plusDays(RandomUtil.randomInt(365))); costs.add(materialCostVO); } vo.setCosts(costs);