diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java
index f0697fa..00e5ec5 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java
@@ -197,6 +197,7 @@ public class PrequalificationDeclaredProjectManage {
         String instanceId = processInstanceService.newStartProcess(model.getProcessDefId(),model.getFormId(), params,orgModelMap);
         log.info("提交预审项目成功 【{}】", instanceId);
 
+        log.info("restart 【{}】", restart);
         //保存预审项目
         if(restart){
             //如果是重新提交 不用生成新版本 前面已经生成过了
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
index a0fd7af..cc706c2 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
@@ -1134,10 +1134,11 @@ public class ProjectLibManage {
             return Boolean.FALSE;
         }
 
+        List<Long> projectIds = projectService.getAllVersionProjectId(project);
         //2.要判断 项目在当前状态 有没有被驳回和退回过
         //当前项目状态流程的 实例 看看是不是有2个以上 有2个说明 有退回 驳回
         List<ProjectInst> pis = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class)
-                .eq(ProjectInst::getProjectId, projectId)
+                .in(ProjectInst::getProjectId, projectIds)
                 .orderByDesc(ProjectInst::getInstType)
                 .last("limit 2"));
         if(CollUtil.isEmpty(pis)){
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 f7dfd23..5e7a0b2 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
@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.projectlib.model.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
+import com.ningdatech.pmapi.common.compare.Compare;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,208 +32,279 @@ public class Project implements Serializable {
     private Long id;
 
     @ApiModelProperty("所属地区编号")
+    @Compare("所属地区编号")
     private String areaCode;
 
     @ApiModelProperty("所属地区名称")
+    @Compare("所属地区名称")
     private String area;
 
     @ApiModelProperty("项目阶段")
+    @Compare("项目阶段")
     private Integer stage;
 
     @ApiModelProperty("项目状态")
+    @Compare("项目状态")
     private Integer status;
 
     @ApiModelProperty("项目名称")
+    @Compare("项目名称")
     private String projectName;
 
     @ApiModelProperty("是否临时增补 0:否 1:是")
+    @Compare("是否临时增补 0:否 1:是")
     private Integer isTemporaryAugment;
 
     @ApiModelProperty("项目负责人")
+    @Compare("项目负责人")
     private String responsibleMan;
 
     @ApiModelProperty("负责人手机号码")
+    @Compare("负责人手机号码")
     private String responsibleManMobile;
 
     @ApiModelProperty("项目联系人")
+    @Compare("项目联系人")
     private String contactName;
 
     @ApiModelProperty("项目联系人手机号码")
+    @Compare("项目联系人手机号码")
     private String contactPhone;
 
     @ApiModelProperty("建设单位名称")
+    @Compare("建设单位名称")
     private String buildOrgName;
 
     @ApiModelProperty("建设单位统一社会信用代码")
+    @Compare("建设单位统一社会信用代码")
     private String orgCreditCode;
 
     @ApiModelProperty("公司编码code")
+    @Compare("公司编码code")
     private String buildOrgCode;
 
     @ApiModelProperty("建设单位浙政钉ID")
+    @Compare("建设单位浙政钉ID")
     private String buildOrgZheJiangGovDingId;
 
     @ApiModelProperty("项目类型 1:建设 2:运维")
+    @Compare("项目类型 1:建设 2:运维")
     private Integer projectType;
 
     @ApiModelProperty("是否首次新建 0:否 1:是")
+    @Compare("是否首次新建 0:否 1:是")
     private Integer isFirst;
 
     @ApiModelProperty("项目预算年度")
+    @Compare("项目预算年度")
     private Integer projectYear;
 
     @ApiModelProperty("项目建设起始时间")
+    @Compare("项目建设起始时间")
     private String beginTime;
 
     @ApiModelProperty("项目建设终止时间")
+    @Compare("项目建设终止时间")
     private String endTime;
 
     @ApiModelProperty("四大体系 1:业务应用 2:应用支撑 3:数据资源 4:基础设施")
+    @Compare("四大体系")
     private Integer fourSystems;
 
     @ApiModelProperty("是否数字化改革项目 0:否 1:是")
+    @Compare("是否数字化改革项目")
     private Integer isDigitalReform;
 
     @ApiModelProperty("综合业务领域 1: '党政机关整体智治',2: '数字政府',3: '数字经济',4: '数字社会',7: '数字文化',5: '数字法治',6: '一体化智能化公共数据平台', 8: '基层智治'")
+    @Compare("综合业务领域")
     private Integer bizDomain;
 
     @ApiModelProperty("建设层级 1:国家级 2:省级 3:省本级 4:市级 5:市本级 6:区县 7乡镇")
+    @Compare("建设层级")
     private Integer buildLevel;
 
     @ApiModelProperty("立项依据")
+    @Compare("立项依据")
     private String buildBasis;
 
     @ApiModelProperty("发改编码")
+    @Compare("发改编码")
     private String developCode;
 
     @ApiModelProperty("财政编码")
+    @Compare("财政编码")
     private String financialCode;
 
     @ApiModelProperty("是否上云 0:否 1:是")
+    @Compare("是否上云")
     private Integer isCloud;
 
+    @ApiModelProperty("云类型")
+    @Compare("云类型")
     private String cloudType;
 
     @ApiModelProperty("等保级别 1:一级 2:二级 3:三级 4:四级 5:五级")
+    @Compare("等保级别")
     private Integer protectionLevel;
 
     @ApiModelProperty("是否密评 0:否 1:是")
+    @Compare("是否密评")
     private Integer isSecretComments;
 
     @ApiModelProperty("项目简介")
+    @Compare("项目简介")
     private String projectIntroduction;
 
-    @ApiModelProperty("资金申报情况-申报金额(元)")
+    @ApiModelProperty("资金申报情况-申报金额(万元)")
+    @Compare("资金申报情况-申报金额")
     private BigDecimal declareAmount;
 
-    @ApiModelProperty("资金申报情况-自有金额(元)")
+    @ApiModelProperty("资金申报情况-自有金额(万元)")
+    @Compare("资金申报情况-自有金额")
     private BigDecimal declareHaveAmount;
 
-    @ApiModelProperty("资金申报情况-政府投资-本级财政资金(元)")
+    @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
+    @Compare("资金申报情况-政府投资-本级财政资金")
     private BigDecimal declareGovOwnFinanceAmount;
 
-    @ApiModelProperty("资金申报情况-政府投资-上级补助资金(元)")
+    @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
+    @Compare("资金申报情况-政府投资-上级补助资金")
     private BigDecimal declareGovSuperiorFinanceAmount;
 
-    @ApiModelProperty("银行贷款(元)")
+    @ApiModelProperty("银行贷款(万元)")
+    @Compare("银行贷款")
     private BigDecimal declareBankLendingAmount;
 
-    @ApiModelProperty("其它资金(元)")
+    @ApiModelProperty("其它资金(万元)")
+    @Compare("其它资金")
     private BigDecimal declareOtherAmount;
 
-    @ApiModelProperty("资金分配情况-软件开发(元)")
+    @ApiModelProperty("资金分配情况-软件开发(万元)")
+    @Compare("资金分配情况-软件开发")
     private BigDecimal softwareDevelopmentAmount;
 
-    @ApiModelProperty("资金分配情况-云资源、硬件购置(元)")
+    @ApiModelProperty("资金分配情况-云资源、硬件购置(万元)")
+    @Compare("资金分配情况-云资源、硬件购置")
     private BigDecimal cloudHardwarePurchaseAmount;
 
-    @ApiModelProperty("资金分配情况-第三方服务(元)")
+    @ApiModelProperty("资金分配情况-第三方服务(万元)")
+    @Compare("资金分配情况-第三方服务")
     private BigDecimal thirdPartyAmount;
 
-    @ApiModelProperty("年度支付计划-年度支付计划(元)")
+    @ApiModelProperty("年度支付计划-年度支付计划(万元)")
+    @Compare("年度支付计划-年度支付计划")
     private BigDecimal annualPlanAmount;
 
-    @ApiModelProperty("年度支付计划-自有金额(元)")
+    @ApiModelProperty("年度支付计划-自有金额(万元)")
+    @Compare("年度支付计划-自有金额")
     private BigDecimal annualPlanHaveAmount;
 
-    @ApiModelProperty("年度支付计划-政府投资-本级财政资金(元)")
+    @ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)")
+    @Compare("年度支付计划-政府投资-本级财政资金")
     private BigDecimal annualPlanGovOwnFinanceAmount;
 
-    @ApiModelProperty("年度支付计划-政府投资-上级补助资金(元)")
+    @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
+    @Compare("年度支付计划-政府投资-上级补助资金")
     private BigDecimal annualPlanGovSuperiorFinanceAmount;
 
-    @ApiModelProperty("年度支付计划-银行贷款(元)")
+    @ApiModelProperty("年度支付计划-银行贷款(万元)")
+    @Compare("年度支付计划-银行贷款")
     private BigDecimal annualPlanBankLendingAmount;
 
-    @ApiModelProperty("年度支付计划-其它资金(元)")
+    @ApiModelProperty("年度支付计划-其它资金(万元)")
+    @Compare("年度支付计划-其它资金")
     private BigDecimal annualPlanOtherAmount;
 
-    @ApiModelProperty("立项批复资金(元)")
+    @ApiModelProperty("立项批复资金(万元)")
+    @Compare("立项批复资金")
     private BigDecimal approvalAmount;
 
+    @ApiModelProperty("年度计划添加时间")
+    @Compare("年度计划添加时间")
     private LocalDateTime annualPlanAddTime;
 
     @ApiModelProperty("核心业务-核心业务模块")
+    @Compare("核心业务-核心业务模块")
     private String coreBusiness;
 
     @ApiModelProperty("安全投入-投入项")
+    @Compare("安全投入-投入项")
     private String safetyInputTitle;
 
     @ApiModelProperty("安全投入-内容描述")
+    @Compare("安全投入-内容描述")
     private String safetyInputDescribe;
 
-    @ApiModelProperty("安全投入-金额(元)")
+    @ApiModelProperty("安全投入-金额(万元)")
+    @Compare("安全投入-金额")
     private BigDecimal safetyInputAmount;
 
     @ApiModelProperty("附件-初步方案")
+    @Compare("附件-初步方案")
     private String preliminaryPlanFile;
 
     @ApiModelProperty("附件-佐证材料")
+    @Compare("附件-佐证材料")
     private String supportingMaterialsFile;
 
     @ApiModelProperty("附件-项目总投资测算明细")
+    @Compare("附件-项目总投资测算明细")
     private String calculationTotalInvestmentFile;
 
     @ApiModelProperty("附件-申报单位主要职责（单位三定方案）")
+    @Compare("附件-申报单位主要职责（单位三定方案）")
     private String mainResponsibilitiesApplicantFile;
 
     @ApiModelProperty("备注")
+    @Compare("备注")
     private String projectRemarks;
 
     @ApiModelProperty("是否包含应用 0:否 1:是")
+    @Compare("是否包含应用")
     private Integer includeApplication;
 
     @ApiModelProperty("工程形象进度-第一季度")
+    @Compare("工程形象进度-第一季度")
     private String engineeringSpeedOne;
 
     @ApiModelProperty("工程形象进度-第二季度")
+    @Compare("工程形象进度-第二季度")
     private String engineeringSpeedTwo;
 
     @ApiModelProperty("工程形象进度-第三季度")
+    @Compare("工程形象进度-第三季度")
     private String engineeringSpeedThree;
 
     @ApiModelProperty("工程形象进度-第四季度")
+    @Compare("工程形象进度-第四季度")
     private String engineeringSpeedFour;
 
     @ApiModelProperty("核心业务-是否开启核心业务模块 false:关闭 true:开启")
+    @Compare("核心业务-是否开启核心业务模块")
     private Boolean isOpenCoreBusiness;
 
     @ApiModelProperty("安全投入-是否开启安全投入模块 false:关闭 true:开启")
+    @Compare("安全投入-是否开启安全投入模块")
     private Boolean isOpenSafetyInput;
 
     @ApiModelProperty("工程形象进度-是否开启 false:关闭 true:开启")
+    @Compare("工程形象进度-是否开启")
     private Boolean isEngineeringSpeed;
 
     @ApiModelProperty("附件-是否开启 false:关闭 true:开启")
+    @Compare("附件-是否开启")
     private Boolean isAccessories;
 
     @ApiModelProperty("备注-是否开启 false:关闭 true:开启")
+    @Compare("备注-是否开启")
     private Boolean isRemarks;
 
     @ApiModelProperty("年度支付计划-是否开启 false:关闭 true:开启")
+    @Compare("年度支付计划-是否开启")
     private Boolean isAnnualPlanAmount;
 
     @ApiModelProperty("一地创新全省共享项目-是否开启 false:关闭 true:开启")
+    @Compare("一地创新全省共享项目-是否开启")
     private Boolean isInnovateWholeProvinceShare;
 
     private LocalDateTime createOn;
@@ -242,66 +314,87 @@ public class Project implements Serializable {
     private String instCode;
 
     @ApiModelProperty("安全投入-模块信息")
+    @Compare("安全投入-模块信息")
     private String safetyInputModular;
 
     @ApiModelProperty("项目申报pdf")
+    @Compare("项目申报pdf")
     private String projectPdf;
 
     @ApiModelProperty("立项申报pdf")
+    @Compare("立项申报pdf")
     private String declarationPdf;
 
     @ApiModelProperty("建设周期（月）")
+    @Compare("建设周期（月）")
     private String buildCycle;
 
     @ApiModelProperty("建设方案文件")
+    @Compare("建设方案文件")
     private String constructionPlanFile;
 
     @ApiModelProperty("立项批复建设方案文件")
+    @Compare("立项批复建设方案文件")
     private String approvedConstructionPlanFile;
 
     @ApiModelProperty("立项批复文件")
+    @Compare("立项批复文件")
     private String approvedFile;
 
     @ApiModelProperty("立项批复时间")
+    @Compare("立项批复时间")
     private LocalDateTime approvalDate;
 
     @ApiModelProperty("批复金额")
+    @Compare("批复金额")
     private BigDecimal approvedTotalInvestmentIncrease;
 
     @ApiModelProperty("是否有上级条线主管部门 0没有 1有")
+    @Compare("是否有上级条线主管部门")
     private Integer isHigherSuperOrg;
 
     @ApiModelProperty("上级条线主管部门")
+    @Compare("上级条线主管部门")
     private String higherSuperOrg;
 
     @ApiModelProperty("上级主管部门Code")
+    @Compare("上级主管部门Code")
     private String higherSuperOrgCode;
 
     @ApiModelProperty("是否有主管部门 0没有 1有")
+    @Compare("是否有主管部门")
     private Integer isSuperOrg;
 
     @ApiModelProperty("主管部门名称")
+    @Compare("主管部门名称")
     private String superOrg;
 
     @ApiModelProperty("主管部门Code")
+    @Compare("主管部门Code")
     private String superOrgCode;
 
     @ApiModelProperty("前端所需验证字段")
+    @Compare("前端所需验证字段")
     private String allApplicationsDone;
 
     @ApiModelProperty("流程状态")
+    @Compare("流程状态")
     private Integer processStatus;
 
     @ApiModelProperty("动态表单 json")
+    @Compare("动态表单 json")
     private String dynamicForm;
 
     @ApiModelProperty("项目发起人 员工code")
+    @Compare("项目发起人 员工code")
     private String sponsor;
 
     @ApiModelProperty("预审发起人 员工code")
+    @Compare("预审发起人 员工code")
     private String preStartUserId;
 
     @ApiModelProperty("上级条线单位审核意见")
+    @Compare("上级条线单位审核意见")
     private String higherLineSuperOrgReviewComments;
 
     @TableField(fill = FieldFill.INSERT)
@@ -311,21 +404,27 @@ public class Project implements Serializable {
     private Long updateBy;
 
     @ApiModelProperty("项目预审申请单文件ID")
+    @Compare("项目预审申请单文件ID")
     private Long pretrialFileId;
 
     @ApiModelProperty("项目预审申请单文件名")
+    @Compare("项目预审申请单文件名")
     private String pretrialFileName;
 
     @ApiModelProperty("项目建设方案申请单文件ID")
+    @Compare("项目建设方案申请单文件ID")
     private Long constructFileId;
 
     @ApiModelProperty("项目建设方案申请单文件名")
+    @Compare("项目建设方案申请单文件名")
     private String constructFileName;
 
     @ApiModelProperty("21位项目编号")
+    @Compare("项目编号")
     private String projectCode;
 
     @ApiModelProperty("项目申报书")
+    @Compare("项目申报书")
     private String projectApplicationForm;
 
     @ApiModelProperty("省级联审 审批结果")
@@ -347,15 +446,19 @@ public class Project implements Serializable {
     private LocalDateTime deliveryTime;
 
     @ApiModelProperty("初验材料")
+    @Compare("初验材料")
     private String preliminaryInspectionMaterials;
 
     @ApiModelProperty("终验材料")
+    @Compare("终验材料")
     private String finalAcceptanceMaterials;
 
     @ApiModelProperty("合同总金额")
+    @Compare("合同总金额")
     private BigDecimal contractAmount;
 
     @ApiModelProperty("计划验收时间")
+    @Compare("计划验收时间")
     private LocalDateTime planAcceptanceTime;
 
     @ApiModelProperty("申请延期佐证材料")
@@ -371,11 +474,14 @@ public class Project implements Serializable {
     private Long prePlanProjectId;
 
     @ApiModelProperty("区县预审上级条线主管单位盖章审核意见")
+    @Compare("区县预审上级条线主管单位盖章审核意见")
     private String countrySealAuditOpinion;
 
     @ApiModelProperty("区县预审上级条线主管单位盖章审核日期")
+    @Compare("区县预审上级条线主管单位盖章审核日期")
     private String countrySealAuditDate;
 
     @ApiModelProperty("区县预审盖章上级条线主管单位印章编号")
+    @Compare("区县预审盖章上级条线主管单位印章编号")
     private String countrySealNo;
 }