联动报价-第二版-报价模型物资关系

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;
-
-
 }

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())
+            if(projBaseInfoVO.getQuoteModelVOList()!=null && !projBaseInfoVO.getQuoteModelVOList().isEmpty()){
-                    .setProjectId(record.getId()).setSectionId(section.getId()));
+                quoteModelMaterialService.saveOrUpdate(new QuoteModelMaterial().setId(section.getId()).setModelMaterial(projBaseInfoVO.getQuoteModelVOList())
+                        .setProjectId(record.getId()).setSectionId(section.getId()).setProjectPlanId(section.getProjectPlanId()));
+            }
 
             if(projBaseInfoVO.getTemplateItemList()!=null){
                 //资格条件模板-资格条件项（页面手动新增或来自资格条件库引用）-结构化公告用