From b8383319454895289dc77a336745c048978341b2 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Wed, 11 Sep 2024 10:45:47 +0800 Subject: [PATCH] =?UTF-8?q?modify:=201.=20=E9=A1=B9=E7=9B=AE=E7=BB=88?= =?UTF-8?q?=E9=AA=8C=E7=94=B3=E6=8A=A5=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java | 3 +++ .../com/hz/pm/api/projectdeclared/model/entity/Purchase.java | 4 ++++ .../api/projectdeclared/model/req/SubmitFinallyInspectedReq.java | 9 +++++++++ 3 files changed, 16 insertions(+) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java index db0e233..22b5926 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java @@ -325,6 +325,9 @@ public class FinalAcceptanceManage { purchase.setHasSecurityEval(req.getHasSecurityEval()); purchase.setSecurityEvalDate(req.getSecurityEvalDate()); purchase.setSecurityEvalMaterials(req.getSecurityEvalMaterials()); + purchase.setXcfhxReportFiles(req.getXcfhxReportFiles()); + purchase.setMatchXcfhx(req.getMatchXcfhx()); + purchase.setXcfhxEvalFinishDate(req.getXcfhxEvalFinishDate()); purchaseService.updateById(purchase); PurchaseInst purchaseInst = new PurchaseInst(); purchaseInst.setBidId(req.getBidId()); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java index 6cf3ea9..5092909 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java @@ -194,4 +194,8 @@ public class Purchase { @ApiModelProperty("等保测评材料") private String securityEvalMaterials; + @ApiModelProperty("信创符合性测评时间") + private LocalDate xcfhxEvalFinishDate; + + } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java index b15159f..6eaded4 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/SubmitFinallyInspectedReq.java @@ -42,4 +42,13 @@ public class SubmitFinallyInspectedReq { @ApiModelProperty("等保测评材料") private String securityEvalMaterials; + @ApiModelProperty("是否符合信创符合性要求") + private Boolean matchXcfhx; + + @ApiModelProperty("信创符合性测评报告文件") + private String xcfhxReportFiles; + + @ApiModelProperty("信创测评完成时间") + private LocalDate xcfhxEvalFinishDate; + }