modify:

1. 项目变更修复；

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/model/basic/CompanyProjectCntBO.java

@@ -1,6 +1,5 @@
 package com.hz.pm.api.dashboard.model.basic;
 
-import com.hz.pm.api.common.compare.Compare;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +18,6 @@ public class CompanyProjectCntBO {
     @ApiModelProperty("建设单位名称")
     private String buildOrgName;
 
-    @Compare("建设单位统一社会信用代码")
     private String orgCreditCode;
 
     @ApiModelProperty("项目数量")

hz-pm-api/src/main/java/com/hz/pm/api/dashboard/model/basic/ProjectATIISBO.java

@@ -1,6 +1,5 @@
 package com.hz.pm.api.dashboard.model.basic;
 
-import com.hz.pm.api.common.compare.Compare;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,6 +25,5 @@ public class ProjectATIISBO {
     private String projectName;
 
     @ApiModelProperty("批复金额")
-    @Compare("批复金额")
     private BigDecimal approvedTotalInvestmentIncrease;
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/EditProjectDTO.java

@@ -1,7 +1,6 @@
 package com.hz.pm.api.projectdeclared.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hz.pm.api.common.compare.Compare;
 import com.hz.pm.api.projectlib.model.dto.GovSystemReplaceInfoDTO;
 import com.hz.pm.api.projectlib.model.dto.ProjectApplicationDTO;
 import com.hz.pm.api.projectlib.model.dto.ProjectPaymentPlanDTO;
@@ -81,11 +80,9 @@ public class EditProjectDTO {
     private String buildOrgZheJiangGovDingId;
 
     @ApiModelProperty("主管单位统一社会信用代码")
-    @Compare("主管单位统一社会信用代码")
     private String superOrgCreditCode;
 
     @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("是否省级 1省级 2非省级")
@@ -113,11 +110,9 @@ public class EditProjectDTO {
     private Integer bizDomain;
 
     @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("建设层级")
     private String buildLevel;
 
     @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("贯通层级")
     private String lowestLevel;
 
     @ApiModelProperty("立项依据")
@@ -191,15 +186,12 @@ public class EditProjectDTO {
     private BigDecimal approvalAmount;
 
     @ApiModelProperty("批复-自有金额(万元)")
-    @Compare("批复-自有金额")
     private BigDecimal approvalHaveAmount;
 
     @ApiModelProperty("批复-政府投资-本级财政资金(万元)")
-    @Compare("批复-政府投资-本级财政资金")
     private BigDecimal approvalGovOwnFinanceAmount;
 
     @ApiModelProperty("批复-政府投资-上级补助资金(万元)")
-    @Compare("批复-政府投资-上级补助资金")
     private BigDecimal approvalGovSuperiorFinanceAmount;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/ProjectDraft.java

@@ -3,7 +3,6 @@ package com.hz.pm.api.projectdeclared.model.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.hz.pm.api.common.compare.Compare;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -90,7 +89,6 @@ public class ProjectDraft implements Serializable {
     private String buildOrgZheJiangGovDingId;
 
     @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("是否省级 1省级 2非省级")
@@ -118,11 +116,9 @@ public class ProjectDraft implements Serializable {
     private Integer bizDomain;
 
     @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("建设层级")
     private String buildLevel;
 
     @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("贯通层级")
     private String lowestLevel;
 
     @ApiModelProperty("立项依据")
@@ -329,7 +325,6 @@ public class ProjectDraft implements Serializable {
     private String baseConstructionType;
 
     @ApiModelProperty("主管单位统一社会信用代码")
-    @Compare("主管单位统一社会信用代码")
     private String superOrgCreditCode;
 
     private Long createBy;
@@ -368,15 +363,12 @@ public class ProjectDraft implements Serializable {
     private BigDecimal reviewAmount;
 
     @ApiModelProperty("批复-自有金额(万元)")
-    @Compare("批复-自有金额")
     private BigDecimal approvalHaveAmount;
 
     @ApiModelProperty("批复-政府投资-本级财政资金(万元)")
-    @Compare("批复-政府投资-本级财政资金")
     private BigDecimal approvalGovOwnFinanceAmount;
 
     @ApiModelProperty("批复-政府投资-上级补助资金(万元)")
-    @Compare("批复-政府投资-上级补助资金")
     private BigDecimal approvalGovSuperiorFinanceAmount;
 
     @ApiModelProperty("立项批复资金(万元)")

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/ProjectContractListVO.java

@@ -1,7 +1,6 @@
 package com.hz.pm.api.projectdeclared.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hz.pm.api.common.compare.Compare;
 import com.hz.pm.api.projectlib.model.enumeration.ProjectTypeNewEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -46,7 +45,6 @@ public class ProjectContractListVO {
     private String projectName;
 
     @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("项目阶段")

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/ProjectDraftVO.java

@@ -2,7 +2,6 @@ package com.hz.pm.api.projectdeclared.model.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.hz.pm.api.common.compare.Compare;
 import com.hz.pm.api.projectlib.model.dto.GovSystemReplaceInfoDTO;
 import com.hz.pm.api.projectlib.model.dto.ProjectPaymentPlanDTO;
 import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
@@ -13,7 +12,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -93,7 +91,6 @@ public class ProjectDraftVO {
     private String buildOrgZheJiangGovDingId;
 
     @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("是否省级 1省级 2非省级")
@@ -121,11 +118,9 @@ public class ProjectDraftVO {
     private String bizDomain;
 
     @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("建设层级")
     private String buildLevel;
 
     @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("贯通层级")
     private String lowestLevel;
 
     @ApiModelProperty("立项依据")
@@ -344,7 +339,6 @@ public class ProjectDraftVO {
     private String baseConstructionType;
 
     @ApiModelProperty("主管单位统一社会信用代码")
-    @Compare("主管单位统一社会信用代码")
     private String superOrgCreditCode;
 
     @ApiModelProperty("预算来源说明")
@@ -394,15 +388,12 @@ public class ProjectDraftVO {
     private BigDecimal reviewAmount;
 
     @ApiModelProperty("批复-自有金额(万元)")
-    @Compare("批复-自有金额")
     private BigDecimal approvalHaveAmount;
 
     @ApiModelProperty("批复-政府投资-本级财政资金(万元)")
-    @Compare("批复-政府投资-本级财政资金")
     private BigDecimal approvalGovOwnFinanceAmount;
 
     @ApiModelProperty("批复-政府投资-上级补助资金(万元)")
-    @Compare("批复-政府投资-上级补助资金")
     private BigDecimal approvalGovSuperiorFinanceAmount;
 
 }

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/XcfhxApplyListVO.java

@@ -1,6 +1,5 @@
 package com.hz.pm.api.projectdeclared.model.vo;
 
-import com.hz.pm.api.common.compare.Compare;
 import com.hz.pm.api.projectdeclared.model.enumerization.PurchaseSourceTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
@@ -53,11 +52,9 @@ public class XcfhxApplyListVO {
     private String sourceTypeName;
 
     @ApiModelProperty("建设单位名称")
-    @Compare("建设单位名称")
     private String buildOrgName;
 
     @ApiModelProperty("公司编码code")
-    @Compare("公司编码code")
     private String buildOrgCode;
 
     public String getSourceTypeName() {

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectChangeManage.java

@@ -92,6 +92,7 @@ public class ProjectChangeManage {
         List<FieldDiff> projDiffs = ProjectDetailDiffUtil.diff(projDetailOld, projJsonObj, true,
                 EditProjectDTO.SYSTEM_REPLACE_INFOS, "id", "projectCode");
         int changeFieldsCount = projDiffs.size();
+        // 系统替代信息变更比较
         List<GovSystemReplaceInfoDTO> systemReplaceInfos = reqProj.getSystemReplaceInfos();
         List<GovSystemReplaceInfoDTO> systemReplaceInfosOld = projDetailOld.getSystemReplaceInfos();
         if (!CollUtil.isEqualList(systemReplaceInfos, systemReplaceInfosOld)) {
@@ -104,6 +105,7 @@ public class ProjectChangeManage {
             changeFieldsCount++;
         }
         projectEditDetail.set(EditProjectDetailDTO.FIELD_PROJECT_DIFFS, projDiffs);
+        // 采购信息变更比较
         List<JSONObject> purchaseJsonObjs = projectEditDetail.getBeanList(EditProjectDetailDTO.FIELD_PURCHASES, JSONObject.class);
         if (CollUtil.isNotEmpty(purchaseJsonObjs)) {
             List<PurchaseFullInfoVO> purchaseDetails = projDetailOld.getPurchaseDetails();
@@ -121,8 +123,9 @@ public class ProjectChangeManage {
                     JSONObject reqOperation = reqPurchaseDetail.getJSONObject(EditPurchaseDetailDTO.FIELD_OPERATION);
                     JSONObject reqContract = reqPurchaseDetail.getJSONObject(EditPurchaseDetailDTO.FIELD_CONTRACT);
                     List<PreInsAcceptancePersonVO> reqFirstInspectedPersons = reqPurchaseDetail.getBeanList(EditPurchaseDetailDTO.FIELD_FIRST_INSPECTED_PERSONS, PreInsAcceptancePersonVO.class);
-
+                    // 初验人员变更比较
                     if (!CollUtil.isEqualList(firstInspectedPersons, reqFirstInspectedPersons)) {
+                        changeFieldsCount++;
                         reqPurchaseDetail.set(EditPurchaseDetailDTO.FIELD_FIRST_INSPECTED_PERSONS_DIFF,
                                 FieldDiff.builder()
                                         .fieldName(EditPurchaseDetailDTO.FIELD_FIRST_INSPECTED_PERSONS)

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/dto/ProjectDTO.java

@@ -1,7 +1,6 @@
 package com.hz.pm.api.projectlib.model.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hz.pm.api.common.compare.Compare;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -82,11 +81,9 @@ public class ProjectDTO implements Serializable {
     private String buildOrgZheJiangGovDingId;
 
     @ApiModelProperty("主管单位统一社会信用代码")
-    @Compare("主管单位统一社会信用代码")
     private String superOrgCreditCode;
 
     @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("是否省级 1省级 2非省级")
@@ -114,11 +111,9 @@ public class ProjectDTO implements Serializable {
     private Integer bizDomain;
 
     @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("建设层级")
     private String buildLevel;
 
     @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("贯通层级")
     private String lowestLevel;
 
     @ApiModelProperty("立项依据")
@@ -192,15 +187,12 @@ public class ProjectDTO implements Serializable {
     private BigDecimal approvalAmount;
 
     @ApiModelProperty("批复-自有金额(万元)")
-    @Compare("批复-自有金额")
     private BigDecimal approvalHaveAmount;
 
     @ApiModelProperty("批复-政府投资-本级财政资金(万元)")
-    @Compare("批复-政府投资-本级财政资金")
     private BigDecimal approvalGovOwnFinanceAmount;
 
     @ApiModelProperty("批复-政府投资-上级补助资金(万元)")
-    @Compare("批复-政府投资-上级补助资金")
     private BigDecimal approvalGovSuperiorFinanceAmount;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/Project.java

@@ -1,7 +1,6 @@
 package com.hz.pm.api.projectlib.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.hz.pm.api.common.compare.Compare;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,11 +29,9 @@ public class Project implements Serializable {
     private Long id;
 
     @ApiModelProperty("所属地区编号")
-    @Compare("所属地区编号")
     private String areaCode;
 
     @ApiModelProperty("所属地区名称")
-    @Compare("所属地区名称")
     private String area;
 
     @ApiModelProperty("项目阶段")
@@ -44,7 +41,6 @@ public class Project implements Serializable {
     private Integer status;
 
     @ApiModelProperty("项目名称")
-    @Compare("项目名称")
     private String projectName;
 
     @ApiModelProperty("历年项目名称")
@@ -60,141 +56,108 @@ public class Project implements Serializable {
     private String baseBasisAmountOri;
 
     @ApiModelProperty("是否临时增补 0:否 1:是")
-    @Compare("是否临时增补")
     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("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("是否省级 1省级 2非省级")
     private Integer baseProvManDeprtType;
 
     @ApiModelProperty("是否首次新建 0:否 1:是")
-    @Compare("是否首次新建")
     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("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("建设层级")
     private String buildLevel;
 
     @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("贯通层级")
     private String lowestLevel;
 
     @ApiModelProperty("立项依据")
-    @Compare("立项依据")
     private String buildBasis;
 
     @ApiModelProperty("立项依据说明")
     private String baseBasisEstablish;
 
     @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("资金申报情况-申报金额(万元)")
-    @Compare("资金申报情况-申报金额")
     private BigDecimal declareAmount;
 
     @ApiModelProperty("资金申报情况-自有金额(万元)")
-    @Compare("资金申报情况-自有金额")
     private BigDecimal declareHaveAmount;
 
     @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
-    @Compare("资金申报情况-政府投资-本级财政资金")
     private BigDecimal declareGovOwnFinanceAmount;
 
     @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
-    @Compare("资金申报情况-政府投资-上级补助资金")
     private BigDecimal declareGovSuperiorFinanceAmount;
 
     @ApiModelProperty("申报资金-银行贷款(万元)")
-    @Compare("银行贷款")
     private BigDecimal declareBankLendingAmount;
 
     @ApiModelProperty("申报资金-其它资金(万元)")
-    @Compare("其它资金")
     private BigDecimal declareOtherAmount;
 
     @ApiModelProperty("申报资金-分配情况-软件开发(万元)")
@@ -209,15 +172,12 @@ public class Project implements Serializable {
     //==================================================================================================================
 
     @ApiModelProperty("批复-软件开发(万元)")
-    @Compare("批复-软件开发")
     private BigDecimal softwareDevelopmentAmount;
 
     @ApiModelProperty("批复-云资源、硬件购置(万元)")
-    @Compare("批复-云资源、硬件购置")
     private BigDecimal cloudHardwarePurchaseAmount;
 
     @ApiModelProperty("批复-第三方服务(万元)")
-    @Compare("批复-第三方服务")
     private BigDecimal thirdPartyAmount;
 
     @ApiModelProperty("评审金额")
@@ -226,111 +186,84 @@ public class Project implements Serializable {
     //==================================================================================================================
 
     @ApiModelProperty("批复-自有金额(万元)")
-    @Compare("批复-自有金额")
     private BigDecimal approvalHaveAmount;
 
     @ApiModelProperty("批复-政府投资-本级财政资金(万元)")
-    @Compare("批复-政府投资-本级财政资金")
     private BigDecimal approvalGovOwnFinanceAmount;
 
     @ApiModelProperty("批复-政府投资-上级补助资金(万元)")
-    @Compare("批复-政府投资-上级补助资金")
     private BigDecimal approvalGovSuperiorFinanceAmount;
 
     @ApiModelProperty("立项批复总投资(万元)")
-    @Compare("立项批复总投资")
     private BigDecimal approvalAmount;
 
     @ApiModelProperty("立项批复总预算(万元)")
-    @Compare("立项批复总预算")
     private BigDecimal approvalBudget;
 
     @ApiModelProperty("年度计划添加时间")
-    @Compare("年度计划添加时间")
     private LocalDateTime annualPlanAddTime;
 
     @ApiModelProperty("核心业务-核心业务模块")
-    @Compare("核心业务-核心业务模块")
     private String coreBusiness;
 
     @ApiModelProperty("安全投入-投入项")
-    @Compare("安全投入-投入项")
     private String safetyInputTitle;
 
     @ApiModelProperty("安全投入-内容描述")
-    @Compare("安全投入-内容描述")
     private String safetyInputDescribe;
 
     @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;
@@ -340,95 +273,72 @@ 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 Integer originBuildCycle;
 
     @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 superOrgCreditCode;
 
     @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)
@@ -438,27 +348,21 @@ 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("省级联审 审批结果")
@@ -480,11 +384,9 @@ public class Project implements Serializable {
     private LocalDateTime deliveryTime;
 
     @ApiModelProperty("终验材料")
-    @Compare("终验材料")
     private String finalAcceptanceMaterials;
 
     @ApiModelProperty("合同总金额")
-    @Compare("合同总金额")
     private BigDecimal contractAmount;
 
     @ApiModelProperty("计划验收时间(有可能是延期后的)")

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/po/ProjectPO.java

@@ -1,7 +1,6 @@
 package com.hz.pm.api.projectlib.model.po;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.hz.pm.api.common.compare.Compare;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,11 +30,9 @@ public class ProjectPO implements Serializable {
     private Long id;
 
     @ApiModelProperty("所属地区编号")
-    @Compare("所属地区编号")
     private String areaCode;
 
     @ApiModelProperty("所属地区名称")
-    @Compare("所属地区名称")
     private String area;
 
     @ApiModelProperty("项目阶段")
@@ -45,7 +42,6 @@ public class ProjectPO implements Serializable {
     private Integer status;
 
     @ApiModelProperty("项目名称")
-    @Compare("项目名称")
     private String projectName;
 
     @ApiModelProperty("历年项目名称")
@@ -61,276 +57,210 @@ public class ProjectPO implements Serializable {
     private String baseBasisAmountOri;
 
     @ApiModelProperty("是否临时增补 0:否 1:是")
-    @Compare("是否临时增补")
     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("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("是否省级 1省级 2非省级")
     private Integer baseProvManDeprtType;
 
     @ApiModelProperty("是否首次新建 0:否 1:是")
-    @Compare("是否首次新建")
     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("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("建设层级")
     private String buildLevel;
 
     @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("贯通层级")
     private String lowestLevel;
 
     @ApiModelProperty("立项依据")
-    @Compare("立项依据")
     private String buildBasis;
 
     @ApiModelProperty("立项依据说明")
     private String baseBasisEstablish;
 
     @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("资金申报情况-申报金额(万元)")
-    @Compare("资金申报情况-申报金额")
     private BigDecimal declareAmount;
 
     @ApiModelProperty("资金申报情况-自有金额(万元)")
-    @Compare("资金申报情况-自有金额")
     private BigDecimal declareHaveAmount;
 
     @ApiModelProperty("资金申报情况-政府投资-本级财政资金(万元)")
-    @Compare("资金申报情况-政府投资-本级财政资金")
     private BigDecimal declareGovOwnFinanceAmount;
 
     @ApiModelProperty("资金申报情况-政府投资-上级补助资金(万元)")
-    @Compare("资金申报情况-政府投资-上级补助资金")
     private BigDecimal declareGovSuperiorFinanceAmount;
 
     @ApiModelProperty("银行贷款(万元)")
-    @Compare("银行贷款")
     private BigDecimal declareBankLendingAmount;
 
     @ApiModelProperty("其它资金(万元)")
-    @Compare("其它资金")
     private BigDecimal declareOtherAmount;
 
     @ApiModelProperty("资金分配情况-软件开发(万元)")
-    @Compare("资金分配情况-软件开发")
     private BigDecimal softwareDevelopmentAmount;
 
     @ApiModelProperty("资金分配情况-云资源、硬件购置(万元)")
-    @Compare("资金分配情况-云资源、硬件购置")
     private BigDecimal cloudHardwarePurchaseAmount;
 
     @ApiModelProperty("资金分配情况-第三方服务(万元)")
-    @Compare("资金分配情况-第三方服务")
     private BigDecimal thirdPartyAmount;
 
     @ApiModelProperty("年度支付计划-年度支付计划(万元)")
-    @Compare("年度支付计划-年度支付计划")
     private BigDecimal annualPlanAmount;
 
     @ApiModelProperty("年度支付计划-自有金额(万元)")
-    @Compare("年度支付计划-自有金额")
     private BigDecimal annualPlanHaveAmount;
 
     @ApiModelProperty("年度支付计划-政府投资-本级财政资金(万元)")
-    @Compare("年度支付计划-政府投资-本级财政资金")
     private BigDecimal annualPlanGovOwnFinanceAmount;
 
     @ApiModelProperty("年度支付计划-政府投资-上级补助资金(万元)")
-    @Compare("年度支付计划-政府投资-上级补助资金")
     private BigDecimal annualPlanGovSuperiorFinanceAmount;
 
     @ApiModelProperty("年度支付计划-银行贷款(万元)")
-    @Compare("年度支付计划-银行贷款")
     private BigDecimal annualPlanBankLendingAmount;
 
     @ApiModelProperty("年度支付计划-其它资金(万元)")
-    @Compare("年度支付计划-其它资金")
     private BigDecimal annualPlanOtherAmount;
 
     @ApiModelProperty("立项批复总投资(万元)")
-    @Compare("立项批复总投资")
     private BigDecimal approvalAmount;
 
     @ApiModelProperty("评审金额")
     private BigDecimal reviewAmount;
 
     @ApiModelProperty("立项批复总预算(万元)")
-    @Compare("立项批复总预算")
     private BigDecimal approvalBudget;
 
     @ApiModelProperty("年度计划添加时间")
-    @Compare("年度计划添加时间")
     private LocalDateTime annualPlanAddTime;
 
     @ApiModelProperty("核心业务-核心业务模块")
-    @Compare("核心业务-核心业务模块")
     private String coreBusiness;
 
     @ApiModelProperty("安全投入-投入项")
-    @Compare("安全投入-投入项")
     private String safetyInputTitle;
 
     @ApiModelProperty("安全投入-内容描述")
-    @Compare("安全投入-内容描述")
     private String safetyInputDescribe;
 
     @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;
@@ -340,95 +270,72 @@ public class ProjectPO 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 Integer originBuildCycle;
 
     @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 superOrgCreditCode;
 
     @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)
@@ -438,27 +345,21 @@ public class ProjectPO 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("省级联审 审批结果")
@@ -480,15 +381,12 @@ public class ProjectPO implements Serializable {
     private LocalDateTime deliveryTime;
 
     @ApiModelProperty("初验材料")
-    @Compare("初验材料")
     private String preliminaryInspectionMaterials;
 
     @ApiModelProperty("终验材料")
-    @Compare("终验材料")
     private String finalAcceptanceMaterials;
 
     @ApiModelProperty("合同总金额")
-    @Compare("合同总金额")
     private BigDecimal contractAmount;
 
     @ApiModelProperty("计划验收时间(有可能是延期后的)")

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectDetailVO.java

@@ -3,9 +3,7 @@ package com.hz.pm.api.projectlib.model.vo;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
-import com.hz.pm.api.common.compare.Compare;
 import com.hz.pm.api.dashboard.model.vo.PortraitProjectOutputVO;
-import com.hz.pm.api.expert.model.vo.ProjectReviewDetailVO;
 import com.hz.pm.api.meeting.entity.dto.ProjectReviewResultDTO;
 import com.hz.pm.api.portrait.model.vo.TagVO;
 import com.hz.pm.api.projectdeclared.model.vo.PurchaseFullInfoVO;
@@ -101,7 +99,6 @@ public class ProjectDetailVO {
     private String buildOrgZheJiangGovDingId;
 
     @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("是否省级 1省级 2非省级")
@@ -129,11 +126,9 @@ public class ProjectDetailVO {
     private Integer bizDomain;
 
     @ApiModelProperty("建设层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("建设层级")
     private String buildLevel;
 
     @ApiModelProperty("贯通层级 P省级 M市级 C县级 T乡镇级 V村级")
-    @Compare("贯通层级")
     private String lowestLevel;
 
     @ApiModelProperty("立项依据")
@@ -222,7 +217,6 @@ public class ProjectDetailVO {
     private BigDecimal approvalAmount;
 
     @ApiModelProperty("立项批复总预算(万元)")
-    @Compare("立项批复总预算")
     private BigDecimal approvalBudget;
 
     private LocalDateTime annualPlanAddTime;
@@ -443,18 +437,15 @@ public class ProjectDetailVO {
     private Boolean isBackReject;
 
     @ApiModelProperty("原本计划验收时间")
-    @Compare("原本计划验收时间")
     private LocalDateTime originPlanAcceptanceTime;
 
     @ApiModelProperty("延期月份数")
     private Integer applyDelayMonths;
 
     @ApiModelProperty("原始建设周期（月）")
-    @Compare("建设周期（月）")
     private Integer originBuildCycle;
 
     @ApiModelProperty("计划验收时间(有可能是延期后的)")
-    @Compare("计划验收时间")
     private LocalDateTime planAcceptanceTime;
 
     public String getVersionStr() {
@@ -526,7 +517,6 @@ public class ProjectDetailVO {
     private String actualPerformanceIndicators;
 
     @ApiModelProperty("主管单位统一社会信用代码")
-    @Compare("主管单位统一社会信用代码")
     private String superOrgCreditCode;
 
     @ApiModelProperty("终验信息 IRS档案")
@@ -578,15 +568,12 @@ public class ProjectDetailVO {
     private List<GovSystemReplaceInfoDTO> systemReplaceInfos;
 
     @ApiModelProperty("批复-自有金额(万元)")
-    @Compare("批复-自有金额")
     private BigDecimal approvalHaveAmount;
 
     @ApiModelProperty("批复-政府投资-本级财政资金(万元)")
-    @Compare("批复-政府投资-本级财政资金")
     private BigDecimal approvalGovOwnFinanceAmount;
 
     @ApiModelProperty("批复-政府投资-上级补助资金(万元)")
-    @Compare("批复-政府投资-上级补助资金")
     private BigDecimal approvalGovSuperiorFinanceAmount;
 
     @ApiModelProperty("建设方案详情")

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectLibListItemVO.java

@@ -2,7 +2,6 @@ package com.hz.pm.api.projectlib.model.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hz.pm.api.common.compare.Compare;
 import com.hz.pm.api.portrait.model.vo.TagVO;
 import com.hz.pm.api.projectlib.model.enumeration.ProjectTypeNewEnum;
 import com.hz.pm.api.user.security.model.UserFullInfoDTO;
@@ -68,7 +67,6 @@ public class ProjectLibListItemVO {
     private LocalDateTime approvalDate;
 
     @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("项目阶段")

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/vo/ProjectReviewCheckListItemVO.java

@@ -2,7 +2,6 @@ package com.hz.pm.api.projectlib.model.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hz.pm.api.common.compare.Compare;
 import com.hz.pm.api.projectlib.model.enumeration.ProjectTypeNewEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -60,7 +59,6 @@ public class ProjectReviewCheckListItemVO {
     private LocalDateTime approvalDate;
 
     @ApiModelProperty("项目类型 01:首次建设 02:迭代升级 03:结转建设 04新运维 05续运维")
-    @Compare("项目类型")
     private String projectType;
 
     @ApiModelProperty("项目阶段")