From 7029c920698d1a60caa368e15c7ba2f7d8f620b5 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Mon, 13 Feb 2023 17:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/dto/DeclaredProjectDto.java             |   6 +-
 .../entity/dto/PreDeclaredProjectDto.java          |   1 -
 .../entity/dto/ProjectDraftSaveDto.java            |   4 +-
 .../manage/DeclaredProjectManage.java              |   9 +-
 .../controller/AnnualPlanController.java           |   8 +
 .../projectlib/manage/AnnualPlanLibManage.java     |   7 +
 .../model/dto/ProjectApplicationDTO.java           | 169 ++++++++++++
 .../model/dto/ProjectApplicationDto.java           | 169 ------------
 .../pmapi/projectlib/model/dto/ProjectDTO.java     | 295 +++++++++++++++++++++
 .../pmapi/projectlib/model/dto/ProjectDto.java     | 295 ---------------------
 10 files changed, 487 insertions(+), 476 deletions(-)
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectApplicationDTO.java
 delete mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectApplicationDto.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java
 delete mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDto.java

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectDto.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectDto.java
index 31e2e9d..f88bd05 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectDto.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectDto.java
@@ -2,15 +2,13 @@ package com.ningdatech.pmapi.projectdeclared.entity.dto;
 
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Maps;
-import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto;
-import com.ningdatech.pmapi.projectlib.model.entity.Project;
+import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Map;
@@ -28,7 +26,7 @@ import java.util.Map;
 public class DeclaredProjectDto implements Serializable {
 
     @NotNull
-    private ProjectDto projectInfo;
+    private ProjectDTO projectInfo;
 
     private Map<String,Object> formData;
 
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/PreDeclaredProjectDto.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/PreDeclaredProjectDto.java
index fae8f58..92d2e62 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/PreDeclaredProjectDto.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/PreDeclaredProjectDto.java
@@ -2,7 +2,6 @@ package com.ningdatech.pmapi.projectdeclared.entity.dto;
 
 import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Maps;
-import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto;
 import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/ProjectDraftSaveDto.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/ProjectDraftSaveDto.java
index 0fdf995..62070a3 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/ProjectDraftSaveDto.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/ProjectDraftSaveDto.java
@@ -1,6 +1,6 @@
 package com.ningdatech.pmapi.projectdeclared.entity.dto;
 
-import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto;
+import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;
 import io.swagger.annotations.ApiModel;
 import lombok.*;
@@ -26,7 +26,7 @@ public class ProjectDraftSaveDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @NotNull
-    private ProjectDto projectInfo;
+    private ProjectDTO projectInfo;
 
     @NotNull
     private ProcessInstanceUserDto user;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java
index 26b88c6..a1d78b3 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java
@@ -14,11 +14,10 @@ import com.ningdatech.pmapi.projectdeclared.entity.dto.DeclaredProjectListParamD
 import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectConditionDto;
 import com.ningdatech.pmapi.projectdeclared.entity.dto.ProjectDraftSaveDto;
 import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDeclaredDetailVO;
-import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDeclaredListItemVO;
 import com.ningdatech.pmapi.projectdeclared.entity.vo.ProjectDraftVo;
 import com.ningdatech.pmapi.projectdeclared.service.IProjectDraftService;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
-import com.ningdatech.pmapi.projectlib.model.dto.ProjectDto;
+import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
@@ -134,7 +133,7 @@ public class DeclaredProjectManage {
      * @return
      */
     public String startTheProcess(DeclaredProjectDto dto) {
-        ProjectDto projectInfo = dto.getProjectInfo();
+        ProjectDTO projectInfo = dto.getProjectInfo();
         String regionCode = projectInfo.getAreaCode();
 
         WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class)
@@ -175,7 +174,7 @@ public class DeclaredProjectManage {
      * @param projectDto
      * @param instanceId
      */
-    private void saveProject(ProjectDto projectDto, String instanceId, String regionCode) {
+    private void saveProject(ProjectDTO projectDto, String instanceId, String regionCode) {
         //流程启动之后 入库项目 重要业务信息 用于列表查询 展示
         try {
             //保存项目表信息
@@ -211,7 +210,7 @@ public class DeclaredProjectManage {
      * @return
      */
     public Long saveToDraft(ProjectDraftSaveDto dto) {
-        ProjectDto projectInfo = dto.getProjectInfo();
+        ProjectDTO projectInfo = dto.getProjectInfo();
         ProjectDraft draft = new ProjectDraft();
         BeanUtils.copyProperties(projectInfo, draft);
         draft.setUserId(dto.getUser().getUserId());
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java
index 7098b1d..2eeb57a 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/AnnualPlanController.java
@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.projectlib.controller;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.log.annotation.WebLog;
 import com.ningdatech.pmapi.projectlib.manage.AnnualPlanLibManage;
+import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectApprovedReq;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectIdReq;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
@@ -73,4 +74,11 @@ public class AnnualPlanController {
         annualPlanLibManage.exportAnnualPlanEditTable(response);
     }
 
+    @GetMapping("/modify")
+    @ApiOperation("年度计划编辑")
+    @WebLog("年度计划编辑")
+    public void modify(@RequestBody ProjectDTO req) {
+        annualPlanLibManage.updateAnnualPlan(req);
+    }
+
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
index 7b0ceba..2a5f18b 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
@@ -1,5 +1,6 @@
 package com.ningdatech.pmapi.projectlib.manage;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
@@ -16,6 +17,7 @@ import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.model.dto.AnnualLibImportDTO;
+import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectApprovedReq;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectIdReq;
@@ -204,4 +206,9 @@ public class AnnualPlanLibManage {
         // TODO
     }
 
+    public void updateAnnualPlan(ProjectDTO req) {
+        Project project = BeanUtil.copyProperties(req, Project.class);
+        projectService.updateById(project);
+    }
+
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectApplicationDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectApplicationDTO.java
new file mode 100644
index 0000000..a256131
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectApplicationDTO.java
@@ -0,0 +1,169 @@
+package com.ningdatech.pmapi.projectlib.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目应用表
+ * </p>
+ *
+ * @author WendyYang
+ * @since 2023-02-05
+ */
+@ApiModel(value = "NdProjectApplication对象", description = "")
+@Data
+public class ProjectApplicationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("应用ID")
+    private Long id;
+
+    @ApiModelProperty("项目ID")
+    private Long projectId;
+
+    @ApiModelProperty("是否初次建设 0否 1是")
+    private Integer isFirst;
+
+    @ApiModelProperty("应用名称")
+    private String applicationName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createOn;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateOn;
+
+    @ApiModelProperty("删除时间")
+    private LocalDateTime deleteOn;
+
+    @ApiModelProperty("关联IRS现有应用")
+    private String relatedExistsApplication;
+
+    @ApiModelProperty("关联IRS现有应用-IRS应用编码")
+    private String relatedExistsApplicationCode;
+
+    @ApiModelProperty("应用类型")
+    private String applicationType;
+
+    @ApiModelProperty("建设层级 1:国家 2:省级 3:市级 4:县（市、区）")
+    private Integer buildLevel;
+
+    @ApiModelProperty("是否统建应用 0:否 1:是")
+    private Integer isUniteBuild;
+
+    @ApiModelProperty("统建类型 1:全省统建 2:全市统建")
+    private Integer unionBuildKind;
+
+    @ApiModelProperty("是否数改系统 0:否 1:是")
+    private Integer isDigitalModification;
+
+    @ApiModelProperty("数改系统")
+    private String digitalModification;
+
+    @ApiModelProperty("业务领域")
+    private String bizDomain;
+
+    @ApiModelProperty("发布端")
+    private String publishSide;
+
+    @ApiModelProperty("是否一本账场景应用名称 0:否 1:是")
+    private Integer isAccountAppName;
+
+    @ApiModelProperty("一本账应用名称")
+    private String accountAppName;
+
+    @ApiModelProperty("领域大脑一本账")
+    private String domainBrainAccount;
+
+    @ApiModelProperty("是否业务协同 0:否 1:是")
+    private Integer isBizCooperate;
+
+    @ApiModelProperty("业务协同描述")
+    private String bizCooperateInfo;
+
+    @ApiModelProperty("使用范围")
+    private String usesRangeRemark;
+
+    @ApiModelProperty("应用简介")
+    private String applicationSummary;
+
+    @ApiModelProperty("应用备注")
+    private String applicationRemark;
+
+    @ApiModelProperty("应用总投资测算明细-文件")
+    private String applicationEstimateFile;
+
+    @ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级")
+    private Integer secrecyGrade;
+
+    @ApiModelProperty("密码测评级别 1:一级 2:二级 3:三级 4:四级 5:五级")
+    private Integer passwordGrade;
+
+    @ApiModelProperty("是否符合国家信息技术应用创新相关规范 0:否 1:是")
+    private Integer nationalItSpec;
+
+    @ApiModelProperty("是否使用政务云资源 0否 1是")
+    private Integer useGovCloud;
+
+    @ApiModelProperty("云资源类型")
+    private String cloudsType;
+
+    @ApiModelProperty("云资源基础规格")
+    private String cloudsFoundationSpecifications;
+
+    @ApiModelProperty("云资源台数")
+    private Integer cloudsNumber;
+
+    @ApiModelProperty("云资源用户描述")
+    private String cloudsDescription;
+
+    @ApiModelProperty("网络环境 1:政务内网 2:政务外网 3:互联网 4:业务专网 5:单机")
+    private Integer netEnv;
+
+    @ApiModelProperty("是否使用公共数据 0否 1是")
+    private Integer useCommonData;
+
+    @ApiModelProperty("数据名称")
+    private String dataName;
+
+    @ApiModelProperty("是否使用公共组件 0否 1是")
+    private Integer useCommonComponent;
+
+    @ApiModelProperty("使用的公共组件名称")
+    private String commonComponents;
+
+    @ApiModelProperty("是否产生公共组件 0否 1是")
+    private Integer produceCommonComponent;
+
+    @ApiModelProperty("预计产生组件名称")
+    private String produceCommonComponents;
+
+    @ApiModelProperty("试点任务名称")
+    private String pilotTasksName;
+
+    @ApiModelProperty("试点任务编号")
+    private String pilotTasksCode;
+
+    @ApiModelProperty("所属重大应用名称")
+    private String importantTaskName;
+
+    @ApiModelProperty("所属重大应用编号")
+    private String importantTaskCode;
+
+    @ApiModelProperty("所属子场景应用名称")
+    private String subSceneApplicationName;
+
+    @ApiModelProperty("试点文件")
+    private String experimentsFile;
+
+    private Long createBy;
+
+    private Long updateBy;
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectApplicationDto.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectApplicationDto.java
deleted file mode 100644
index e55d4c8..0000000
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectApplicationDto.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.ningdatech.pmapi.projectlib.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 项目应用表
- * </p>
- *
- * @author WendyYang
- * @since 2023-02-05
- */
-@ApiModel(value = "NdProjectApplication对象", description = "")
-@Data
-public class ProjectApplicationDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("应用ID")
-    private Long id;
-
-    @ApiModelProperty("项目ID")
-    private Long projectId;
-
-    @ApiModelProperty("是否初次建设 0否 1是")
-    private Integer isFirst;
-
-    @ApiModelProperty("应用名称")
-    private String applicationName;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createOn;
-
-    @ApiModelProperty("更新时间")
-    private LocalDateTime updateOn;
-
-    @ApiModelProperty("删除时间")
-    private LocalDateTime deleteOn;
-
-    @ApiModelProperty("关联IRS现有应用")
-    private String relatedExistsApplication;
-
-    @ApiModelProperty("关联IRS现有应用-IRS应用编码")
-    private String relatedExistsApplicationCode;
-
-    @ApiModelProperty("应用类型")
-    private String applicationType;
-
-    @ApiModelProperty("建设层级 1:国家 2:省级 3:市级 4:县（市、区）")
-    private Integer buildLevel;
-
-    @ApiModelProperty("是否统建应用 0:否 1:是")
-    private Integer isUniteBuild;
-
-    @ApiModelProperty("统建类型 1:全省统建 2:全市统建")
-    private Integer unionBuildKind;
-
-    @ApiModelProperty("是否数改系统 0:否 1:是")
-    private Integer isDigitalModification;
-
-    @ApiModelProperty("数改系统")
-    private String digitalModification;
-
-    @ApiModelProperty("业务领域")
-    private String bizDomain;
-
-    @ApiModelProperty("发布端")
-    private String publishSide;
-
-    @ApiModelProperty("是否一本账场景应用名称 0:否 1:是")
-    private Integer isAccountAppName;
-
-    @ApiModelProperty("一本账应用名称")
-    private String accountAppName;
-
-    @ApiModelProperty("领域大脑一本账")
-    private String domainBrainAccount;
-
-    @ApiModelProperty("是否业务协同 0:否 1:是")
-    private Integer isBizCooperate;
-
-    @ApiModelProperty("业务协同描述")
-    private String bizCooperateInfo;
-
-    @ApiModelProperty("使用范围")
-    private String usesRangeRemark;
-
-    @ApiModelProperty("应用简介")
-    private String applicationSummary;
-
-    @ApiModelProperty("应用备注")
-    private String applicationRemark;
-
-    @ApiModelProperty("应用总投资测算明细-文件")
-    private String applicationEstimateFile;
-
-    @ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级")
-    private Integer secrecyGrade;
-
-    @ApiModelProperty("密码测评级别 1:一级 2:二级 3:三级 4:四级 5:五级")
-    private Integer passwordGrade;
-
-    @ApiModelProperty("是否符合国家信息技术应用创新相关规范 0:否 1:是")
-    private Integer nationalItSpec;
-
-    @ApiModelProperty("是否使用政务云资源 0否 1是")
-    private Integer useGovCloud;
-
-    @ApiModelProperty("云资源类型")
-    private String cloudsType;
-
-    @ApiModelProperty("云资源基础规格")
-    private String cloudsFoundationSpecifications;
-
-    @ApiModelProperty("云资源台数")
-    private Integer cloudsNumber;
-
-    @ApiModelProperty("云资源用户描述")
-    private String cloudsDescription;
-
-    @ApiModelProperty("网络环境 1:政务内网 2:政务外网 3:互联网 4:业务专网 5:单机")
-    private Integer netEnv;
-
-    @ApiModelProperty("是否使用公共数据 0否 1是")
-    private Integer useCommonData;
-
-    @ApiModelProperty("数据名称")
-    private String dataName;
-
-    @ApiModelProperty("是否使用公共组件 0否 1是")
-    private Integer useCommonComponent;
-
-    @ApiModelProperty("使用的公共组件名称")
-    private String commonComponents;
-
-    @ApiModelProperty("是否产生公共组件 0否 1是")
-    private Integer produceCommonComponent;
-
-    @ApiModelProperty("预计产生组件名称")
-    private String produceCommonComponents;
-
-    @ApiModelProperty("试点任务名称")
-    private String pilotTasksName;
-
-    @ApiModelProperty("试点任务编号")
-    private String pilotTasksCode;
-
-    @ApiModelProperty("所属重大应用名称")
-    private String importantTaskName;
-
-    @ApiModelProperty("所属重大应用编号")
-    private String importantTaskCode;
-
-    @ApiModelProperty("所属子场景应用名称")
-    private String subSceneApplicationName;
-
-    @ApiModelProperty("试点文件")
-    private String experimentsFile;
-
-    private Long createBy;
-
-    private Long updateBy;
-
-}
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
new file mode 100644
index 0000000..c0d68aa
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDTO.java
@@ -0,0 +1,295 @@
+package com.ningdatech.pmapi.projectlib.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-02-03
+ */
+@Data
+@ApiModel(value = "NdProjectDto", description = "")
+public class ProjectDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("所属地区编号")
+    private String areaCode;
+
+    @ApiModelProperty("所属地区名称")
+    private String area;
+
+    @ApiModelProperty("项目阶段")
+    private Integer stage;
+
+    @ApiModelProperty("项目状态")
+    private Integer status;
+
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    @ApiModelProperty("是否临时增补 0:否 1:是")
+    private Integer isTemporaryAugment;
+
+    @ApiModelProperty("项目负责人")
+    private String responsibleMan;
+
+    @ApiModelProperty("负责人手机号码")
+    private String responsibleManMobile;
+
+    @ApiModelProperty("项目联系人")
+    private String contactName;
+
+    @ApiModelProperty("项目联系人手机号码")
+    private String contactPhone;
+
+    @ApiModelProperty("建设单位名称")
+    private String buildOrgName;
+
+    @ApiModelProperty("建设单位统一社会信用代码")
+    private String buildOrgCode;
+
+    @ApiModelProperty("建设单位浙政钉ID")
+    private String buildOrgZheJiangGovDingId;
+
+    @ApiModelProperty("项目类型 1:建设 2:运维")
+    private Integer projectType;
+
+    @ApiModelProperty("是否首次新建 0:否 1:是")
+    private Integer isFirst;
+
+    @ApiModelProperty("项目预算年度")
+    private Integer projectYear;
+
+    @ApiModelProperty("项目建设起始时间")
+    private String beginTime;
+
+    @ApiModelProperty("项目建设终止时间")
+    private String endTime;
+
+    @ApiModelProperty("四大体系 1:业务应用 2:应用支撑 3:数据资源 4:基础设施")
+    private Integer fourSystems;
+
+    @ApiModelProperty("是否数字化改革项目 0:否 1:是")
+    private Integer isDigitalReform;
+
+    @ApiModelProperty("综合业务领域")
+    private String bizDomain;
+
+    @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
+    private Integer buildLevel;
+
+    @ApiModelProperty("立项依据")
+    private String buildBasis;
+
+    @ApiModelProperty("发改编码")
+    private String developCode;
+
+    @ApiModelProperty("财政编码")
+    private String financialCode;
+
+    @ApiModelProperty("是否上云 0:否 1:是")
+    private Integer isCloud;
+
+    private String cloudType;
+
+    @ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级")
+    private Integer protectionLevel;
+
+    @ApiModelProperty("是否密评 0:否 1:是")
+    private Integer isSecretComments;
+
+    @ApiModelProperty("项目简介")
+    private String projectIntroduction;
+
+    @ApiModelProperty("资金申报情况-申报金额(万元)")
+    private BigDecimal declareAmount;
+
+    @ApiModelProperty("资金申报情况-自有金额(万元)")
+    private BigDecimal declareHaveAmount;
+
+    @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
+    private BigDecimal declareGovOwnFinanceAmount;
+
+    @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
+    private BigDecimal declareGovSuperiorFinanceAmount;
+
+    @ApiModelProperty("银行贷款(万元)")
+    private BigDecimal declareBankLendingAmount;
+
+    @ApiModelProperty("其它资金(万元)")
+    private BigDecimal declareOtherAmount;
+
+    @ApiModelProperty("资金分配情况-软件开发(万元)")
+    private BigDecimal softwareDevelopmentAmount;
+
+    @ApiModelProperty("资金分配情况-云资源、硬件购置(万元)")
+    private BigDecimal cloudHardwarePurchaseAmount;
+
+    @ApiModelProperty("资金分配情况-第三方服务(万元)")
+    private BigDecimal thirdPartyAmount;
+
+    @ApiModelProperty("年度支付计划-年度支付计划(万元)")
+    private BigDecimal annualPlanAmount;
+
+    @ApiModelProperty("年度支付计划-自有金额(万元)")
+    private BigDecimal annualPlanHaveAmount;
+
+    @ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)")
+    private BigDecimal annualPlanGovOwnFinanceAmount;
+
+    @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
+    private BigDecimal annualPlanGovSuperiorFinanceAmount;
+
+    @ApiModelProperty("年度支付计划-银行贷款(万元)")
+    private BigDecimal annualPlanBankLendingAmount;
+
+    @ApiModelProperty("年度支付计划-其它资金(万元)")
+    private BigDecimal annualPlanOtherAmount;
+
+    @ApiModelProperty("立项批复资金(万元)")
+    private BigDecimal approvalAmount;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime annualPlanAddTime;
+
+    @ApiModelProperty("核心业务-核心业务模块")
+    private String coreBusiness;
+
+    @ApiModelProperty("安全投入-投入项")
+    private String safetyInputTitle;
+
+    @ApiModelProperty("安全投入-内容描述")
+    private String safetyInputDescribe;
+
+    @ApiModelProperty("安全投入-金额(万元)")
+    private BigDecimal safetyInputAmount;
+
+    @ApiModelProperty("附件-初步方案")
+    private String preliminaryPlanFile;
+
+    @ApiModelProperty("附件-佐证材料")
+    private String supportingMaterialsFile;
+
+    @ApiModelProperty("附件-项目总投资测算明细")
+    private String calculationTotalInvestmentFile;
+
+    @ApiModelProperty("附件-申报单位主要职责（单位三定方案）")
+    private String mainResponsibilitiesApplicantFile;
+
+    @ApiModelProperty("备注")
+    private String projectRemarks;
+
+    @ApiModelProperty("是否包含应用 0:否 1:是")
+    private Integer includeApplication;
+
+    @ApiModelProperty("工程形象进度-第一季度")
+    private String engineeringSpeedOne;
+
+    @ApiModelProperty("工程形象进度-第二季度")
+    private String engineeringSpeedTwo;
+
+    @ApiModelProperty("工程形象进度-第三季度")
+    private String engineeringSpeedThree;
+
+    @ApiModelProperty("工程形象进度-第四季度")
+    private String engineeringSpeedFour;
+
+    @ApiModelProperty("核心业务-是否开启核心业务模块 false:关闭 true:开启")
+    private Boolean isOpenCoreBusiness;
+
+    @ApiModelProperty("安全投入-是否开启安全投入模块 false:关闭 true:开启")
+    private Boolean isOpenSafetyInput;
+
+    @ApiModelProperty("工程形象进度-是否开启 false:关闭 true:开启")
+    private Boolean isEngineeringSpeed;
+
+    @ApiModelProperty("附件-是否开启 false:关闭 true:开启")
+    private Boolean isAccessories;
+
+    @ApiModelProperty("备注-是否开启 false:关闭 true:开启")
+    private Boolean isRemarks;
+
+    @ApiModelProperty("年度支付计划-是否开启 false:关闭 true:开启")
+    private Boolean isAnnualPlanAmount;
+
+    @ApiModelProperty("一地创新全省共享项目-是否开启 false:关闭 true:开启")
+    private Boolean isInnovateWholeProvinceShare;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    @ApiModelProperty("流程实例编号")
+    private String instCode;
+
+    @ApiModelProperty("安全投入-模块信息")
+    private String safetyInputModular;
+
+    @ApiModelProperty("项目申报pdf")
+    private String projectPdf;
+
+    @ApiModelProperty("立项申报pdf")
+    private String declarationPdf;
+
+    @ApiModelProperty("建设周期（月）")
+    private String buildCycle;
+
+    @ApiModelProperty("建设方案文件")
+    private String constructionPlanFile;
+
+    @ApiModelProperty("立项批复文件")
+    private String approvedFile;
+
+    @ApiModelProperty("批复金额")
+    private BigDecimal approvedTotalInvestmentIncrease;
+
+    @ApiModelProperty("上级主管部门")
+    private String higherSuperOrg;
+
+    @ApiModelProperty("上级主管部门Code")
+    private String higherSuperOrgCode;
+
+    @ApiModelProperty("主管部门名称")
+    private String superOrg;
+
+    @ApiModelProperty("主管部门Code")
+    private String superOrgCode;
+
+    @ApiModelProperty("前端所需验证字段")
+    private Integer allApplicationsDone;
+
+    @ApiModelProperty("流程实例id")
+    private String processInsId;
+
+    @ApiModelProperty("流程实例 formId")
+    private String formId;
+
+    @ApiModelProperty("项目应用实例")
+    private List<ProjectApplicationDTO> applicationList;
+
+    @ApiModelProperty("流程状态")
+    private Integer processStatus;
+
+    @ApiModelProperty("动态表单 json")
+    private String dynamicForm;
+
+    private Long createBy;
+
+    private Long updateBy;
+
+}
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
deleted file mode 100644
index 03c465c..0000000
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectDto.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package com.ningdatech.pmapi.projectlib.model.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author zpf
- * @since 2023-02-03
- */
-@Data
-@ApiModel(value = "NdProjectDto", description = "")
-public class ProjectDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("主键")
-    private Long id;
-
-    @ApiModelProperty("所属地区编号")
-    private String areaCode;
-
-    @ApiModelProperty("所属地区名称")
-    private String area;
-
-    @ApiModelProperty("项目阶段")
-    private Integer stage;
-
-    @ApiModelProperty("项目状态")
-    private Integer status;
-
-    @ApiModelProperty("项目名称")
-    private String projectName;
-
-    @ApiModelProperty("是否临时增补 0:否 1:是")
-    private Integer isTemporaryAugment;
-
-    @ApiModelProperty("项目负责人")
-    private String responsibleMan;
-
-    @ApiModelProperty("负责人手机号码")
-    private String responsibleManMobile;
-
-    @ApiModelProperty("项目联系人")
-    private String contactName;
-
-    @ApiModelProperty("项目联系人手机号码")
-    private String contactPhone;
-
-    @ApiModelProperty("建设单位名称")
-    private String buildOrgName;
-
-    @ApiModelProperty("建设单位统一社会信用代码")
-    private String buildOrgCode;
-
-    @ApiModelProperty("建设单位浙政钉ID")
-    private String buildOrgZheJiangGovDingId;
-
-    @ApiModelProperty("项目类型 1:建设 2:运维")
-    private Integer projectType;
-
-    @ApiModelProperty("是否首次新建 0:否 1:是")
-    private Integer isFirst;
-
-    @ApiModelProperty("项目预算年度")
-    private Integer projectYear;
-
-    @ApiModelProperty("项目建设起始时间")
-    private String beginTime;
-
-    @ApiModelProperty("项目建设终止时间")
-    private String endTime;
-
-    @ApiModelProperty("四大体系 1:业务应用 2:应用支撑 3:数据资源 4:基础设施")
-    private Integer fourSystems;
-
-    @ApiModelProperty("是否数字化改革项目 0:否 1:是")
-    private Integer isDigitalReform;
-
-    @ApiModelProperty("综合业务领域")
-    private String bizDomain;
-
-    @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
-    private Integer buildLevel;
-
-    @ApiModelProperty("立项依据")
-    private String buildBasis;
-
-    @ApiModelProperty("发改编码")
-    private String developCode;
-
-    @ApiModelProperty("财政编码")
-    private String financialCode;
-
-    @ApiModelProperty("是否上云 0:否 1:是")
-    private Integer isCloud;
-
-    private String cloudType;
-
-    @ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级")
-    private Integer protectionLevel;
-
-    @ApiModelProperty("是否密评 0:否 1:是")
-    private Integer isSecretComments;
-
-    @ApiModelProperty("项目简介")
-    private String projectIntroduction;
-
-    @ApiModelProperty("资金申报情况-申报金额(万元)")
-    private BigDecimal declareAmount;
-
-    @ApiModelProperty("资金申报情况-自有金额(万元)")
-    private BigDecimal declareHaveAmount;
-
-    @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
-    private BigDecimal declareGovOwnFinanceAmount;
-
-    @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
-    private BigDecimal declareGovSuperiorFinanceAmount;
-
-    @ApiModelProperty("银行贷款(万元)")
-    private BigDecimal declareBankLendingAmount;
-
-    @ApiModelProperty("其它资金(万元)")
-    private BigDecimal declareOtherAmount;
-
-    @ApiModelProperty("资金分配情况-软件开发(万元)")
-    private BigDecimal softwareDevelopmentAmount;
-
-    @ApiModelProperty("资金分配情况-云资源、硬件购置(万元)")
-    private BigDecimal cloudHardwarePurchaseAmount;
-
-    @ApiModelProperty("资金分配情况-第三方服务(万元)")
-    private BigDecimal thirdPartyAmount;
-
-    @ApiModelProperty("年度支付计划-年度支付计划(万元)")
-    private BigDecimal annualPlanAmount;
-
-    @ApiModelProperty("年度支付计划-自有金额(万元)")
-    private BigDecimal annualPlanHaveAmount;
-
-    @ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)")
-    private BigDecimal annualPlanGovOwnFinanceAmount;
-
-    @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
-    private BigDecimal annualPlanGovSuperiorFinanceAmount;
-
-    @ApiModelProperty("年度支付计划-银行贷款(万元)")
-    private BigDecimal annualPlanBankLendingAmount;
-
-    @ApiModelProperty("年度支付计划-其它资金(万元)")
-    private BigDecimal annualPlanOtherAmount;
-
-    @ApiModelProperty("立项批复资金(万元)")
-    private BigDecimal approvalAmount;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime annualPlanAddTime;
-
-    @ApiModelProperty("核心业务-核心业务模块")
-    private String coreBusiness;
-
-    @ApiModelProperty("安全投入-投入项")
-    private String safetyInputTitle;
-
-    @ApiModelProperty("安全投入-内容描述")
-    private String safetyInputDescribe;
-
-    @ApiModelProperty("安全投入-金额(万元)")
-    private BigDecimal safetyInputAmount;
-
-    @ApiModelProperty("附件-初步方案")
-    private String preliminaryPlanFile;
-
-    @ApiModelProperty("附件-佐证材料")
-    private String supportingMaterialsFile;
-
-    @ApiModelProperty("附件-项目总投资测算明细")
-    private String calculationTotalInvestmentFile;
-
-    @ApiModelProperty("附件-申报单位主要职责（单位三定方案）")
-    private String mainResponsibilitiesApplicantFile;
-
-    @ApiModelProperty("备注")
-    private String projectRemarks;
-
-    @ApiModelProperty("是否包含应用 0:否 1:是")
-    private Integer includeApplication;
-
-    @ApiModelProperty("工程形象进度-第一季度")
-    private String engineeringSpeedOne;
-
-    @ApiModelProperty("工程形象进度-第二季度")
-    private String engineeringSpeedTwo;
-
-    @ApiModelProperty("工程形象进度-第三季度")
-    private String engineeringSpeedThree;
-
-    @ApiModelProperty("工程形象进度-第四季度")
-    private String engineeringSpeedFour;
-
-    @ApiModelProperty("核心业务-是否开启核心业务模块 false:关闭 true:开启")
-    private Boolean isOpenCoreBusiness;
-
-    @ApiModelProperty("安全投入-是否开启安全投入模块 false:关闭 true:开启")
-    private Boolean isOpenSafetyInput;
-
-    @ApiModelProperty("工程形象进度-是否开启 false:关闭 true:开启")
-    private Boolean isEngineeringSpeed;
-
-    @ApiModelProperty("附件-是否开启 false:关闭 true:开启")
-    private Boolean isAccessories;
-
-    @ApiModelProperty("备注-是否开启 false:关闭 true:开启")
-    private Boolean isRemarks;
-
-    @ApiModelProperty("年度支付计划-是否开启 false:关闭 true:开启")
-    private Boolean isAnnualPlanAmount;
-
-    @ApiModelProperty("一地创新全省共享项目-是否开启 false:关闭 true:开启")
-    private Boolean isInnovateWholeProvinceShare;
-
-    private LocalDateTime createOn;
-
-    private LocalDateTime updateOn;
-
-    @ApiModelProperty("流程实例编号")
-    private String instCode;
-
-    @ApiModelProperty("安全投入-模块信息")
-    private String safetyInputModular;
-
-    @ApiModelProperty("项目申报pdf")
-    private String projectPdf;
-
-    @ApiModelProperty("立项申报pdf")
-    private String declarationPdf;
-
-    @ApiModelProperty("建设周期（月）")
-    private String buildCycle;
-
-    @ApiModelProperty("建设方案文件")
-    private String constructionPlanFile;
-
-    @ApiModelProperty("立项批复文件")
-    private String approvedFile;
-
-    @ApiModelProperty("批复金额")
-    private BigDecimal approvedTotalInvestmentIncrease;
-
-    @ApiModelProperty("上级主管部门")
-    private String higherSuperOrg;
-
-    @ApiModelProperty("上级主管部门Code")
-    private String higherSuperOrgCode;
-
-    @ApiModelProperty("主管部门名称")
-    private String superOrg;
-
-    @ApiModelProperty("主管部门Code")
-    private String superOrgCode;
-
-    @ApiModelProperty("前端所需验证字段")
-    private Integer allApplicationsDone;
-
-    @ApiModelProperty("流程实例id")
-    private String processInsId;
-
-    @ApiModelProperty("流程实例 formId")
-    private String formId;
-
-    @ApiModelProperty("项目应用实例")
-    private List<ProjectApplicationDto> applicationList;
-
-    @ApiModelProperty("流程状态")
-    private Integer processStatus;
-
-    @ApiModelProperty("动态表单 json")
-    private String dynamicForm;
-
-    private Long createBy;
-
-    private Long updateBy;
-
-}