From d17ba8ecfef5f034a662e9cc352f1df809d4254c Mon Sep 17 00:00:00 2001 From: WendyYang Date: Wed, 11 Sep 2024 09:18:31 +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 | 9 +++++++++ .../api/projectdeclared/model/req/SubmitFinallyInspectedReq.java | 9 +++++++++ .../java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java | 9 +++++++++ 4 files changed, 30 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 2eafd59..db0e233 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 @@ -322,6 +322,9 @@ public class FinalAcceptanceManage { tenderStateMachineUtil.pass(purchase); purchase.setFinalInspectionDate(req.getInspectionDate()); purchase.setFinalInspectionMaterials(req.getInspectionMaterials()); + purchase.setHasSecurityEval(req.getHasSecurityEval()); + purchase.setSecurityEvalDate(req.getSecurityEvalDate()); + purchase.setSecurityEvalMaterials(req.getSecurityEvalMaterials()); 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 c11b6e2..6cf3ea9 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 @@ -185,4 +185,13 @@ public class Purchase { @ApiModelProperty("是否发布信创云图") private Boolean publishMhNotice; + @ApiModelProperty("是否完成等保测评") + private Boolean hasSecurityEval; + + @ApiModelProperty("等保测评时间") + private LocalDate securityEvalDate; + + @ApiModelProperty("等保测评材料") + private String securityEvalMaterials; + } 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 50446a4..b15159f 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 @@ -33,4 +33,13 @@ public class SubmitFinallyInspectedReq { @NotBlank(message = "请提交终验材料") private String inspectionMaterials; + @ApiModelProperty("是否完成等保测评") + private Boolean hasSecurityEval; + + @ApiModelProperty("等保测评时间") + private LocalDate securityEvalDate; + + @ApiModelProperty("等保测评材料") + private String securityEvalMaterials; + } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java index c0a30be..03685d8 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java @@ -181,4 +181,13 @@ public class PurchaseVO { @ApiModelProperty("是否发布信创云图") private Boolean publishMhNotice; + @ApiModelProperty("是否完成等保测评") + private Boolean hasSecurityEval; + + @ApiModelProperty("等保测评时间") + private LocalDate securityEvalDate; + + @ApiModelProperty("等保测评材料") + private String securityEvalMaterials; + }