From 720cf3a1e11d09b1dd468e83c39156a457913e94 Mon Sep 17 00:00:00 2001
From: yss <17921@qq.com>
Date: Fri, 31 May 2024 14:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8A=A5=E4=BB=B7-=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E7=89=88-=E6=8A=A5=E4=BB=B7=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/QuoteModelMaterial.java            | 31 -------------------
 .../impl/ProjectRecordServiceImpl.java        |  6 ++--
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java
index c0bee4b..dc503a2 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/modelmaterial/entity/QuoteModelMaterial.java
@@ -61,35 +61,4 @@ public class QuoteModelMaterial  implements Serializable {
         @ApiModelProperty(value = "方案ID（采购平台推送数据）")
         private String projectPlanId;
 
-        /**
-        * 创建者
-        */
-        @ApiModelProperty(value = "创建者")
-        private String createBy;
-
-        /**
-        * 创建时间
-        */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-        @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class)
-        private java.time.LocalDateTime createDate;
-
-        /**
-        * 更新者
-        */
-        @ApiModelProperty(value = "更新者")
-        private String updateBy;
-
-        /**
-        * 更新时间
-        */
-        @ApiModelProperty(value = "更新时间")
-        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-        @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class)
-        private java.time.LocalDateTime updateDate;
-
-
 }
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 d3e1beb..9a16172 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
@@ -853,8 +853,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             materialList.addAll(section.getMaterialList());
 
             //保存报价结构化模型及物资关系
-            quoteModelMaterialService.saveOrUpdate(new QuoteModelMaterial().setId(section.getId()).setModelMaterial(projBaseInfoVO.getQuoteModelVOList())
-                    .setProjectId(record.getId()).setSectionId(section.getId()));
+            if(projBaseInfoVO.getQuoteModelVOList()!=null && !projBaseInfoVO.getQuoteModelVOList().isEmpty()){
+                quoteModelMaterialService.saveOrUpdate(new QuoteModelMaterial().setId(section.getId()).setModelMaterial(projBaseInfoVO.getQuoteModelVOList())
+                        .setProjectId(record.getId()).setSectionId(section.getId()).setProjectPlanId(section.getProjectPlanId()));
+            }
 
             if(projBaseInfoVO.getTemplateItemList()!=null){
                 //资格条件模板-资格条件项（页面手动新增或来自资格条件库引用）-结构化公告用