From 737c8dd0f86a57edfb4ac07f998ddbe3bf44d15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Sun, 26 May 2024 16:53:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(dqbom):=20=E8=B0=83=E6=95=B4=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=9F=A5=E8=AF=A2=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/api/user/DQBomApi.java     |  2 +-
 .../bomnew/pojo/vo/QueryMaterialsVO.java      | 56 +++++++++++++++++++
 .../product/bomnew/service/DQBomService.java  |  4 +-
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java
index 564e2179..26144656 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/DQBomApi.java
@@ -256,7 +256,7 @@ public class DQBomApi extends BaseApi {
      */
     @PostMapping("queryMaterials")
     @ApiOperation("批量查询物料信息")
-    public ResultVO<List<BaseMaterialVO>> queryMaterials(@Valid @RequestBody @NotEmpty List<QueryMaterialsQuery> query) {
+    public ResultVO<List<QueryMaterialsVO>> queryMaterials(@Valid @RequestBody @NotEmpty List<QueryMaterialsQuery> query) {
         return ResultVO.success(dQBomService.queryMaterials(query));
     }
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java
new file mode 100644
index 00000000..16a738c9
--- /dev/null
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/QueryMaterialsVO.java
@@ -0,0 +1,56 @@
+package com.nflg.product.bomnew.pojo.vo;
+
+import com.nflg.product.base.core.conmon.util.SessionUtil;
+import com.nflg.product.bomnew.constant.EBomStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author 曹鹏飞
+ * @date 2024/5/26 16:38:29
+ */
+@Data
+@Accessors(chain = true)
+public class QueryMaterialsVO extends BaseMaterialVO implements Serializable {
+
+    /**
+     * 设计人员名称
+     */
+    @ApiModelProperty(value = "设计人员名称")
+    private String deviseName = SessionUtil.getRealName();
+
+    /**
+     * 设计维护部门名称
+     */
+    @ApiModelProperty(value = "设计维护部门名称")
+    private String deptName = SessionUtil.getFullDeptName();
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createdTime = LocalDateTime.now();
+
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime modifyTime;
+
+    /**
+     * 版本过期时间=下个版本的创建时间
+     */
+    @ApiModelProperty(value = "版本过期时间=下个版本的创建时间")
+    private LocalDateTime expireEndTime = LocalDateTime.parse("9999-12-31 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+    /**
+     * 1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）
+     */
+    @ApiModelProperty(value = "1=待复核、2=已复核、3=已退回、4=定版（已发布PBOM）99=借用件 100=引用件")
+    private Integer status = EBomStatusEnum.CHECKED.getValue();
+}
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
index 5af786c0..a9f69cce 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
@@ -666,7 +666,7 @@ public class DQBomService {
         return datas;
     }
 
-    public List<BaseMaterialVO> queryMaterials(List<QueryMaterialsQuery> query) {
+    public List<QueryMaterialsVO> queryMaterials(List<QueryMaterialsQuery> query) {
         List<BaseMaterialVO> datas = new ArrayList<>();
         List<String> keys = query.stream().map(QueryMaterialsQuery::getMaterialNo)
                 .filter(StrUtil::isNotBlank)
@@ -683,6 +683,6 @@ public class DQBomService {
         if (CollUtil.isNotEmpty(keys)) {
             datas.addAll(SpringUtil.getBean(MaterialMainMapper.class).getMaterialByDrawingNo(keys));
         }
-        return datas;
+        return Convert.toList(QueryMaterialsVO.class, datas);
     }
 }