From a6e79707473f92d46d9b149ea5d245ad460387c1 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 20 Sep 2023 09:25:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=20=E7=A4=BE=E4=BC=9A?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java | 2 ++ .../ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java | 4 ++++ .../ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java | 4 ++++ .../com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java | 6 ++++++ .../java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java | 4 ++++ .../java/com/ningdatech/pmapi/projectlib/model/entity/Project.java | 4 ++++ .../com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java index b37aff9..bc24071 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/PurchaseSaveDTO.java @@ -79,5 +79,7 @@ public class PurchaseSaveDTO { @ApiModelProperty("应用编码") private String appCode; + @ApiModelProperty("预算执行确认书编号") + private String budgetExecConfirmNo; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java index 3270314..a1c2a83 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/ProjectDraft.java @@ -343,6 +343,10 @@ public class ProjectDraft implements Serializable { @ApiModelProperty("内容类别") private String baseConstructionType; + @ApiModelProperty("主管单位统一社会信用代码") + @Compare("主管单位统一社会信用代码") + private String superOrgCreditCode; + private Long createBy; private Long updateBy; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java index 98389ee..94afce4 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/ProjectDraftVO.java @@ -343,6 +343,10 @@ public class ProjectDraftVO implements Serializable { @ApiModelProperty("内容类别") private String baseConstructionType; + @ApiModelProperty("主管单位统一社会信用代码") + @Compare("主管单位统一社会信用代码") + private String superOrgCreditCode; + private Long createBy; private Long updateBy; } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java index 48a9fb2..56545d9 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PurchaseVO.java @@ -22,6 +22,9 @@ public class PurchaseVO { @ApiModelProperty("id") private Long id; + @ApiModelProperty("标段名称") + private String bidName; + @ApiModelProperty("项目ID") private Long projectId; @@ -73,4 +76,7 @@ public class PurchaseVO { @ApiModelProperty("中标通知书") private String acceptanceLetter; + @ApiModelProperty("预算执行确认书编号") + private String budgetExecConfirmNo; + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java index 63a1a85..97b9885 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java @@ -84,6 +84,10 @@ public class ProjectDTO implements Serializable { @ApiModelProperty("建设单位浙政钉ID") private String buildOrgZheJiangGovDingId; + @ApiModelProperty("主管单位统一社会信用代码") + @Compare("主管单位统一社会信用代码") + private String superOrgCreditCode; + @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维") @Compare("项目类型") private String projectType; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java index c9d2d65..f7d618d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java @@ -399,6 +399,10 @@ public class Project implements Serializable { @Compare("主管部门Code") private String superOrgCode; + @ApiModelProperty("主管单位统一社会信用代码") + @Compare("主管单位统一社会信用代码") + private String superOrgCreditCode; + @ApiModelProperty("前端所需验证字段") @Compare("前端所需验证字段") private String allApplicationsDone; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java index fcc3ca7..b85541d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java @@ -514,4 +514,8 @@ public class ProjectDetailVO { @ApiModelProperty("实际成效指标") private String actualPerformanceIndicators; + + @ApiModelProperty("主管单位统一社会信用代码") + @Compare("主管单位统一社会信用代码") + private String superOrgCreditCode; }