diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileAddCmd.java index 50726adb..984b32aa 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileAddCmd.java @@ -2,6 +2,7 @@ package org.qinan.safetyeval.client.file.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.qinan.safetyeval.domain.constant.ArchiveTypeEnum; import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -35,11 +36,12 @@ public class EvalProjectArchiveFileAddCmd implements Serializable { @NotBlank(message = "文件名称不能为空") private String fileName; /** - * 档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他 + * ArchiveTypeEnum.REMARKS */ - @ApiModelProperty(value = "档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他", required = true) - @NotBlank(message = "档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他不能为空") + @ApiModelProperty(value = ArchiveTypeEnum.REMARKS, required = true) + @NotBlank(message = ArchiveTypeEnum.REMARKS + "不能为空") private String archiveType; + /** * 业务节点 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java index 63994610..64c6eb26 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java @@ -3,6 +3,7 @@ package org.qinan.safetyeval.client.file.request; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.qinan.safetyeval.domain.constant.ArchiveTypeEnum; /** * 安全评价项目档案文件分页查询Qry @@ -19,20 +20,16 @@ public class EvalProjectArchiveFilePageQry extends PageQuery { */ @ApiModelProperty(value = "项目ID") private String projectId; - /** - * 文件地址 - */ - @ApiModelProperty(value = "文件地址") - private String fileUrl; + /** * 文件名称 */ @ApiModelProperty(value = "文件名称") private String fileName; /** - * 档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他 + * ArchiveTypeEnum.REMARKS */ - @ApiModelProperty(value = "档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他") + @ApiModelProperty(value = ArchiveTypeEnum.REMARKS) private String archiveType; /** * 业务节点 @@ -44,10 +41,5 @@ public class EvalProjectArchiveFilePageQry extends PageQuery { */ @ApiModelProperty(value = "来源 auto_process_record流程自动记录，upload_additional_files 补充上传") private String recordSource; - /** - * 环境 - */ - @ApiModelProperty(value = "环境") - private String env; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileUpdateCmd.java index 6069a04b..3b4cdde8 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileUpdateCmd.java @@ -3,6 +3,7 @@ package org.qinan.safetyeval.client.file.request; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.qinan.safetyeval.domain.constant.ArchiveTypeEnum; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -38,10 +39,10 @@ public class EvalProjectArchiveFileUpdateCmd implements Serializable { @NotBlank(message = "文件名称不能为空") private String fileName; /** - * 档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他 + * ArchiveTypeEnum.REMARKS */ - @ApiModelProperty(value = "档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他", required = true) - @NotBlank(message = "档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他不能为空") + @ApiModelProperty(value = ArchiveTypeEnum.REMARKS, required = true) + @NotBlank(message = ArchiveTypeEnum.REMARKS + "不能为空") private String archiveType; /** * 业务节点 @@ -55,12 +56,4 @@ public class EvalProjectArchiveFileUpdateCmd implements Serializable { @ApiModelProperty(value = "来源 auto_process_record流程自动记录，upload_additional_files 补充上传", required = true) @NotBlank(message = "来源 auto_process_record流程自动记录，upload_additional_files 补充上传不能为空") private String recordSource; - /** - * 环境 - */ - @ApiModelProperty(value = "环境") - private String env; - @NotNull(message = "version不能为空") - @ApiModelProperty(value = "version") - private Integer version; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java index 5e5708d3..038ee175 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.ClientObject; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.qinan.safetyeval.domain.constant.ArchiveTypeEnum; /** * 安全评价项目档案文件Co @@ -32,9 +33,9 @@ public class EvalProjectArchiveFileCo extends ClientObject { @ApiModelProperty(value = "文件名称") private String fileName; /** - * 档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他 + * ArchiveTypeEnum.REMARKS */ - @ApiModelProperty(value = "档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他") + @ApiModelProperty(value = ArchiveTypeEnum.REMARKS) private String archiveType; /** * 业务节点 diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ArchiveTypeEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ArchiveTypeEnum.java index 433eaf0d..7d619801 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ArchiveTypeEnum.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ArchiveTypeEnum.java @@ -106,20 +106,8 @@ public enum ArchiveTypeEnum { */ private final String desc; - public static final String REMARKS; + public static final String REMARKS = "档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他"; - static { - StringBuilder sb = new StringBuilder(); - sb.append("项目档案类型枚举->"); - ArchiveTypeEnum[] types = values(); - for (int i = 0; i < types.length; i++) { - sb.append(types[i].code).append(":").append(types[i].desc); - if (i < types.length - 1) { - sb.append(", "); - } - } - REMARKS = sb.toString(); - } /** * 根据编码获取枚举 diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/file/model/EvalProjectArchiveFileE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/file/model/EvalProjectArchiveFileE.java index be6f0bbf..0e4de516 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/file/model/EvalProjectArchiveFileE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/file/model/EvalProjectArchiveFileE.java @@ -33,7 +33,7 @@ public class EvalProjectArchiveFileE extends BaseE { */ private String fileName; /** - * 档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他 + * ArchiveTypeEnum.REMARKS */ private String archiveType; /** diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectArchiveFileDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectArchiveFileDO.java index 299240d3..3fd8c357 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectArchiveFileDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectArchiveFileDO.java @@ -30,7 +30,7 @@ public class EvalProjectArchiveFileDO extends BaseDO { */ private String fileName; /** - * 档案类型 RISK_ANALYSIS:项目风险分析, TECH_SERVICE_CONTRACT:技术服务合同, PROJECT_ORG_FILE:项目组织文件, IMPLEMENT_PLAN:实施计划, PRACTICE_NOTICE:从业告知, SITE_RECORD:现场记录, SITE_SURVEY:现场勘察资料, SITE_CHECK:现场检查资料, RECTIFICATION_REVIEW:整改复查资料, EVALUATION_REPORT:评价报告, REVIEW_RECORD:审核记录, PROCESS_CONTROL:过程控制文件, SIGN_ISSUE:签发文件, EXPERT_REVIEW:专家评审材料, PROJECT_ATTACHMENT:项目附图, REPORT_MODIFICATION:报告修改材料, CORRESPONDENCE:往来文件, OTHER:其他 + * ArchiveTypeEnum.REMARKS */ private String archiveType; /** diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java index 42bef45f..2262e328 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java @@ -7,6 +7,7 @@ import com.jjb.saas.framework.enums.enums.BooleanEnum; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import lombok.AllArgsConstructor; import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry; +import org.qinan.safetyeval.domain.constant.BooleanQAEnum; import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectArchiveFileDO; import org.qinan.safetyeval.infrastructure.persistence.mapper.EvalProjectArchiveFileMapper; import org.qinan.safetyeval.infrastructure.persistence.repository.EvalProjectArchiveFileRepository; @@ -37,9 +38,7 @@ public class EvalProjectArchiveFileRepositoryImpl extends BaseRepositoryImpl