草稿箱开始开发

ningda-generator/pom.xml

@@ -35,14 +35,14 @@
             <groupId>com.kingbase8</groupId>
             <artifactId>kingbase8-8.2.0</artifactId>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/lib/kingbase8-8.2.0.jar</systemPath>
+            <systemPath>${project.basedir}/lib/kingbase8-8.2.0.jar</systemPath>
         </dependency>
 
         <dependency>
             <groupId>com.kingbase.dialect</groupId>
             <artifactId>kingbase8-8.2.0</artifactId>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/lib/kingbase8-8.2.0.jar</systemPath>
+            <systemPath>${project.basedir}/lib/kingbase8-8.2.0.jar</systemPath>
         </dependency>
     </dependencies>
 </project>

pmapi/pom.xml

@@ -215,7 +215,7 @@
         <!--KingBase-->
         <dependency>
             <groupId>com.kingbase8</groupId>
-            <artifactId>kingbase8-8.6.0</artifactId>
+            <artifactId>kingbase8-8.2.0</artifactId>
             <version>8.2.0</version>
             <scope>system</scope>
             <systemPath>${project.basedir}/src/lib/kingbase8-8.2.0.jar</systemPath>

pmapi/src/main/java/com/ningdatech/pmapi/declared/controller/DeclaredProjectController.java

@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.declared.controller;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.declared.entity.dto.DeclaredProjectDto;
 import com.ningdatech.pmapi.declared.entity.dto.DeclaredProjectListParamDto;
+import com.ningdatech.pmapi.declared.entity.vo.ProjectDraftVo;
 import com.ningdatech.pmapi.declared.manage.DeclaredProjectManage;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
 import com.wflow.workflow.bean.vo.ProcessStartParamsVo;
@@ -36,8 +37,8 @@ public class DeclaredProjectController {
 
     @ApiOperation(value = "申报项目草稿箱", notes = "申报项目草稿箱")
     @GetMapping("/draft")
-    public PageVo<ProjectLibListItemVO> draft(@Validated @ModelAttribute ProcessStartParamsVo params) {
-        return PageVo.empty();
+    public PageVo<ProjectDraftVo> draft(@Validated @ModelAttribute DeclaredProjectListParamDto params) {
+        return declaredProjectManage.pageDraft(params);
     }
 
     @ApiOperation(value = "申报项目", notes = "申报项目")

pmapi/src/main/java/com/ningdatech/pmapi/declared/entity/ProjectDraft.java

@@ -0,0 +1,409 @@
+package com.ningdatech.pmapi.declared.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目草稿箱
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-02-06
+ */
+@TableName("nd_project_draft")
+@ApiModel(value = "NdProjectDraft对象", description = "")
+@Data
+@Builder
+public class ProjectDraft implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("应用ID")
+    @TableId(type = IdType.AUTO)
+    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 buildUnitName;
+
+    @ApiModelProperty("建设单位统一社会信用代码")
+    private String buildUnitCode;
+
+    @ApiModelProperty("建设单位浙政钉ID")
+    private String buildUnitZheJiangGovernmentDingId;
+
+    @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 declareGovernmentOwnFinanceAmount;
+
+    @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
+    private BigDecimal declareGovernmentSuperiorFinanceAmount;
+
+    @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 annualPlanGovernmentOwnFinanceAmount;
+
+    @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
+    private BigDecimal annualPlanGovernmentSuperiorFinanceAmount;
+
+    @ApiModelProperty("年度支付计划-银行贷款(万元)")
+    private BigDecimal annualPlanBankLendingAmount;
+
+    @ApiModelProperty("年度支付计划-其它资金(万元)")
+    private BigDecimal annualPlanOtherAmount;
+
+    @ApiModelProperty("立项批复资金(万元)")
+    private BigDecimal approvalAmount;
+
+    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 higherSuperUnit;
+
+    @ApiModelProperty("上级主管部门Code")
+    private String higherSuperUnitCode;
+
+    @ApiModelProperty("主管部门名称")
+    private String superUnit;
+
+    @ApiModelProperty("主管部门Code")
+    private String superUnitCode;
+
+    @ApiModelProperty("前端所需验证字段")
+    private Integer allApplicationsDone;
+
+    @ApiModelProperty("项目一级状态 10000 20000 30000")
+    private Integer projectStatusFirst;
+
+    @ApiModelProperty("项目二级状态")
+    private Integer projectStatusSecond;
+
+    @ApiModelProperty("应用名称")
+    private String applicationName;
+
+    @ApiModelProperty("关联IRS现有应用")
+    private String relatedExistsApplication;
+
+    @ApiModelProperty("关联IRS现有应用-IRS应用编码")
+    private String relatedExistsApplicationCode;
+
+    @ApiModelProperty("应用类型")
+    private String applicationType;
+
+    @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 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;
+
+    @ApiModelProperty("新增form内容")
+    private String formData;
+
+
+    private Long createBy;
+    private Long updateBy;
+}

pmapi/src/main/java/com/ningdatech/pmapi/declared/entity/vo/ProjectDraftVo.java

@@ -0,0 +1,412 @@
+package com.ningdatech.pmapi.declared.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目草稿箱
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-02-06
+ */
+@ApiModel(value = "NdProjectDraft对象", description = "")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProjectDraftVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("应用ID")
+    @TableId(type = IdType.AUTO)
+    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 buildUnitName;
+
+    @ApiModelProperty("建设单位统一社会信用代码")
+    private String buildUnitCode;
+
+    @ApiModelProperty("建设单位浙政钉ID")
+    private String buildUnitZheJiangGovernmentDingId;
+
+    @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 declareGovernmentOwnFinanceAmount;
+
+    @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
+    private BigDecimal declareGovernmentSuperiorFinanceAmount;
+
+    @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 annualPlanGovernmentOwnFinanceAmount;
+
+    @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
+    private BigDecimal annualPlanGovernmentSuperiorFinanceAmount;
+
+    @ApiModelProperty("年度支付计划-银行贷款(万元)")
+    private BigDecimal annualPlanBankLendingAmount;
+
+    @ApiModelProperty("年度支付计划-其它资金(万元)")
+    private BigDecimal annualPlanOtherAmount;
+
+    @ApiModelProperty("立项批复资金(万元)")
+    private BigDecimal approvalAmount;
+
+    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 higherSuperUnit;
+
+    @ApiModelProperty("上级主管部门Code")
+    private String higherSuperUnitCode;
+
+    @ApiModelProperty("主管部门名称")
+    private String superUnit;
+
+    @ApiModelProperty("主管部门Code")
+    private String superUnitCode;
+
+    @ApiModelProperty("前端所需验证字段")
+    private Integer allApplicationsDone;
+
+    @ApiModelProperty("项目一级状态 10000 20000 30000")
+    private Integer projectStatusFirst;
+
+    @ApiModelProperty("项目二级状态")
+    private Integer projectStatusSecond;
+
+    @ApiModelProperty("应用名称")
+    private String applicationName;
+
+    @ApiModelProperty("关联IRS现有应用")
+    private String relatedExistsApplication;
+
+    @ApiModelProperty("关联IRS现有应用-IRS应用编码")
+    private String relatedExistsApplicationCode;
+
+    @ApiModelProperty("应用类型")
+    private String applicationType;
+
+    @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 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;
+
+    @ApiModelProperty("新增form内容")
+    private String formData;
+
+
+    private Long createBy;
+    private Long updateBy;
+}

pmapi/src/main/java/com/ningdatech/pmapi/declared/manage/DeclaredProjectManage.java

@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.declared.entity.ProjectDraft;
 import com.ningdatech.pmapi.declared.entity.dto.DeclaredProjectDto;
 import com.ningdatech.pmapi.declared.entity.dto.DeclaredProjectListParamDto;
+import com.ningdatech.pmapi.declared.entity.vo.ProjectDraftVo;
+import com.ningdatech.pmapi.declared.service.IProjectDraftService;
 import com.ningdatech.pmapi.projectlib.enums.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
@@ -24,6 +27,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -43,6 +48,8 @@ public class DeclaredProjectManage {
 
     private final IProjectService projectService;
 
+    private final IProjectDraftService projectDraftService;
+
     private final ProcessInstanceService processService;
 
     private final ProcessModelService processModelService;
@@ -70,6 +77,29 @@ public class DeclaredProjectManage {
         return PageVo.of(res,page.getTotal());
     }
 
+    public PageVo<ProjectDraftVo> pageDraft(DeclaredProjectListParamDto params) {
+        Page<ProjectDraft> page = params.page();
+        LambdaQueryWrapper<ProjectDraft> wrapper = Wrappers.lambdaQuery(ProjectDraft.class)
+                .ge(Objects.nonNull(params.getStartTime()), ProjectDraft::getCreateOn, params.getStartTime())
+                .le(Objects.nonNull(params.getEndTime()), ProjectDraft::getCreateOn, params.getEndTime())
+                .eq(Objects.nonNull(params.getProjectType()), ProjectDraft::getProjectType, params.getProjectType())
+                .eq(Objects.nonNull(params.getProjectYear()), ProjectDraft::getProjectYear, params.getProjectYear())
+                .eq(Objects.nonNull(params.getProjectStatusFirst()), ProjectDraft::getProjectStatusFirst, params.getProjectStatusFirst())
+                .eq(Objects.nonNull(params.getProjectStatusSecond()), ProjectDraft::getProjectStatusSecond, params.getProjectStatusSecond())
+                .like(StringUtils.isNotBlank(params.getProjectName()), ProjectDraft::getProjectName, params.getProjectName())
+                .orderByDesc(ProjectDraft::getUpdateOn);
+        projectDraftService.page(page,wrapper);
+        if(0L == page.getTotal()){
+            return PageVo.empty();
+        }
+        List<ProjectDraftVo> res = page.getRecords().stream().map(record -> {
+            ProjectDraftVo vo = new ProjectDraftVo();
+            BeanUtils.copyProperties(record, vo);
+            return vo;
+        }).collect(Collectors.toList());
+        return PageVo.of(res,page.getTotal());
+    }
+
     /**
      * 启动实例
      * @param dto

pmapi/src/main/java/com/ningdatech/pmapi/declared/mapper/ProjectDraftMapper.java

@@ -0,0 +1,17 @@
+package com.ningdatech.pmapi.declared.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.declared.entity.ProjectDraft;
+import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-02-05
+ */
+public interface ProjectDraftMapper extends BaseMapper<ProjectDraft> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/declared/mapper/ProjectDraftMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.pmapi.declared.mapper.ProjectDraftMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/declared/service/IProjectDraftService.java

@@ -0,0 +1,17 @@
+package com.ningdatech.pmapi.declared.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.declared.entity.ProjectDraft;
+import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-02-05
+ */
+public interface IProjectDraftService extends IService<ProjectDraft> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/declared/service/impl/ProjectDraftServiceImpl.java

@@ -0,0 +1,24 @@
+package com.ningdatech.pmapi.declared.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.declared.entity.ProjectDraft;
+import com.ningdatech.pmapi.declared.mapper.ProjectDraftMapper;
+import com.ningdatech.pmapi.declared.service.IProjectDraftService;
+import com.ningdatech.pmapi.projectlib.mapper.ProjectApplicationMapper;
+import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication;
+import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-02-05
+ */
+@Service
+public class ProjectDraftServiceImpl extends ServiceImpl<ProjectDraftMapper, ProjectDraft>
+        implements IProjectDraftService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -287,11 +287,6 @@ public class Project implements Serializable {
     @ApiModelProperty("项目二级状态")
     private Integer projectStatusSecond;
 
-    @ApiModelProperty("单位名称")
-    private String orgName;
-    @ApiModelProperty("单位code")
-    private String orgCode;
-
     private Long createBy;
     private Long updateBy;
 

pmapi/src/test/java/com/ningdatech/pmapi/sys/processDef/ProcessDefTest.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import org.junit.Test;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -25,6 +27,11 @@ public class ProcessDefTest {
         System.out.println(props.getOrgCode());
     }
 
+    @Test
+    public void date(){
+        System.out.println(LocalDateTime.parse("2023-02-05 10:25", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
+    }
+
     public static class OrgProps {
         private String regionCode;