From ba03f227ccf2a670173f68fa33143200694ab48a Mon Sep 17 00:00:00 2001
From: fuqingji <51312040@qq.com>
Date: Sat, 25 Jun 2022 14:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectentrust/entity/ebpentity/PurpMaterialVO.java        | 3 +++
 .../projectrecord/service/impl/ProjectRecordServiceImpl.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java
index 3fbddf0..3de1f6a 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/entity/ebpentity/PurpMaterialVO.java
@@ -117,6 +117,9 @@ public class PurpMaterialVO {
     @ApiModelProperty(value = "需求数量")
     private BigDecimal inRequNum;
 
+    @ApiModelProperty(value = "需求数量")
+    private BigDecimal requNum;
+
     @ApiModelProperty(value = "单位")
     private String unit;
 
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
index fd6bdcf..1a096d3 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
@@ -845,7 +845,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
                 material.setDemandName(purpMaterialVO.getRequName());
                 material.setMaterialExplain(purpMaterialVO.getMaterialDesc());
                 material.setMaterialTypeName(purpMaterialVO.getMaterialCategoryName());
-                material.setProcurementCount(purpMaterialVO.getInRequNum());
+                material.setProcurementCount(Optional.ofNullable(purpMaterialVO.getInRequNum()).orElseGet(purpMaterialVO::getRequNum));
                 material.setMaterialUnit(purpMaterialVO.getUnit());
                 material.setBasePrice(purpMaterialVO.getUnitAmt());
                 resultList.add(material);