From e0c60dd15b14ef500e3f566ab565756ba7ec74a2 Mon Sep 17 00:00:00 2001 From: wyw <13885678+wyw0828@user.noreply.gitee.com> Date: Thu, 1 Aug 2024 15:34:47 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/enums/ChargingStandardEnum.java | 43 +++++++++++++++++ .../module/cms/enums/ContractStatusEnum.java | 47 +++++++++++++++++++ .../module/cms/enums/ContractTypeEnum.java | 46 ++++++++++++++++++ .../yudao/module/cms/enums/CountTypeEnum.java | 40 ++++++++++++++++ .../module/cms/enums/DictTypeConstants.java | 16 +++++++ .../module/cms/enums/ErrorCodeConstants.java | 21 ++++++--- .../cms/enums/OutsContractMajorEnum.java | 47 +++++++++++++++++++ .../yudao/module/cms/enums/SourceEnum.java | 42 +++++++++++++++++ .../module/pms/enums/TrackingDepEnum.java | 42 +++++++++++++++++ 9 files changed, 338 insertions(+), 6 deletions(-) create mode 100644 yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ChargingStandardEnum.java create mode 100644 yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ContractStatusEnum.java create mode 100644 yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ContractTypeEnum.java create mode 100644 yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/CountTypeEnum.java create mode 100644 yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/DictTypeConstants.java create mode 100644 yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/OutsContractMajorEnum.java create mode 100644 yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/SourceEnum.java create mode 100644 yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/TrackingDepEnum.java diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ChargingStandardEnum.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ChargingStandardEnum.java new file mode 100644 index 000000000..2d193587d --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ChargingStandardEnum.java @@ -0,0 +1,43 @@ +package cn.iocoder.yudao.module.cms.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author wyw + * @description 收费标注枚举 + * @date 2024/7/31 + */ +@Getter +@AllArgsConstructor +public enum ChargingStandardEnum { + //厦建设 + XIA_BUILDING("xia_building","XB"), + //包干价 + LUMP("lump","LU"), + //其他省份 + OTHER("other","OT"); + + /** + * 类型编号 + */ + private final String code; + /** + * 类型编码 + */ + private final String no; + + /** + * 通过code获取no + * @param code 字典编号 + * @return 类型编码 + */ + public static String getNoByCode(String code) { + for (ChargingStandardEnum value : values()) { + if (value.getCode().equals(code)) { + return value.getNo(); + } + } + return null; + } +} diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ContractStatusEnum.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ContractStatusEnum.java new file mode 100644 index 000000000..2a04d132f --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ContractStatusEnum.java @@ -0,0 +1,47 @@ +package cn.iocoder.yudao.module.cms.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author wyw + * @description 合同状态枚举 + * @date 2024/7/31 + */ +@Getter +@AllArgsConstructor +public enum ContractStatusEnum { + //应签未签 + NO_SIGN("no_sign","NS"), + //已拟定 + PREPARED("prepared","PP"), + //已盖章 + STAMP("stamp","ST"), + //已签订 + SIGN("sign","SI"), + //已终止 + TERMINATION("termination","TE"),; + + /** + * 类型编号 + */ + private final String code; + /** + * 类型编码 + */ + private final String no; + + /** + * 通过code获取no + * @param code 字典编号 + * @return 类型编码 + */ + public static String getNoByCode(String code) { + for (ContractStatusEnum value : values()) { + if (value.getCode().equals(code)) { + return value.getNo(); + } + } + return null; + } +} diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ContractTypeEnum.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ContractTypeEnum.java new file mode 100644 index 000000000..9444d6f71 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ContractTypeEnum.java @@ -0,0 +1,46 @@ +package cn.iocoder.yudao.module.cms.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author wyw + * @description 合同类型枚举 + * @date 2024/7/31 + */ +@Getter +@AllArgsConstructor +public enum ContractTypeEnum { + //勘察设计 + SURVEY("survey","KS"), + //检测 + DETECTION("detection","JC"), + //总承包合同 + GENERAL_CONTRACT("general_contract","GC"), + //全过程咨询 + PROCESS_CONSULTATION("process_consultation","PC"); + + + /** + * 类型编号 + */ + private final String code; + /** + * 类型编码 + */ + private final String no; + + /** + * 通过code获取no + * @param code 字典编号 + * @return 类型编码 + */ + public static String getNoByCode(String code) { + for (ContractTypeEnum value : values()) { + if (value.getCode().equals(code)) { + return value.getNo(); + } + } + return null; + } +} diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/CountTypeEnum.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/CountTypeEnum.java new file mode 100644 index 000000000..8724675b0 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/CountTypeEnum.java @@ -0,0 +1,40 @@ +package cn.iocoder.yudao.module.cms.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author wyw + * @description 计费方式枚举 + * @date 2024/7/31 + */ +@Getter +@AllArgsConstructor +public enum CountTypeEnum { + //费率合同 + RATE_CONTRACT("rate_contract","RC"), + //包干合同 + RES_CONTRACT("res_contract","RC"); + /** + * 类型编号 + */ + private final String code; + /** + * 类型编码 + */ + private final String no; + + /** + * 通过code获取no + * @param code 字典编号 + * @return 类型编码 + */ + public static String getNoByCode(String code) { + for (CountTypeEnum value : values()) { + if (value.getCode().equals(code)) { + return value.getNo(); + } + } + return null; + } +} diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/DictTypeConstants.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/DictTypeConstants.java new file mode 100644 index 000000000..1a947294a --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/DictTypeConstants.java @@ -0,0 +1,16 @@ +package cn.iocoder.yudao.module.cms.enums; + +/** + * @author hhyykk + * @description 字典枚举 + * @date 2024/7/3 + */ +public interface DictTypeConstants { + + // ***** 字典名称 ****** + String Contract_Type = "contract_type"; // 合同类型 + + + + +} diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java index c10c0d59e..89c395d52 100644 --- a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/ErrorCodeConstants.java @@ -8,11 +8,14 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode; * @date 2024/7/3 */ public interface ErrorCodeConstants { - ErrorCode CUSTOMER_COMPANY_NOT_EXISTS = new ErrorCode(1_020_000_000, "客户公司管理不存在"); - + // ========== 客户公司 1_020_000_000 ========== + ErrorCode CUSTOMER_COMPANY_NOT_EXISTS = new ErrorCode(1_020_000_000, "客户公司不存在"); + // ========== 项目信息 1_021_000_000 ========== ErrorCode PROJECT_NOT_EXISTS = new ErrorCode(1_021_000_000, "项目信息不存在"); + // ========== 请求参数 1_022_000_000 ========== + ErrorCode PARAM_NOT_EXISTS = new ErrorCode(1_022_000_000, "请求参数不存在"); - ErrorCode PARAM_NOT_EXISTS = new ErrorCode(1_022_000_000, "请求参数错误"); + ErrorCode PARAM_ERROR = new ErrorCode(1_022_001_000, "请求参数错误"); // ========== 外包合同 2_021_000_000 ========== ErrorCode OUTS_CONTRACT_NOT_EXISTS = new ErrorCode(2_021_000_000, "外包合同不存在"); @@ -23,21 +26,27 @@ public interface ErrorCodeConstants { // ========== 外包合同关联 2_023_000_000 ========== ErrorCode CONTRACT_OUTS_NOT_EXISTS = new ErrorCode(2_023_000_000, "外包合同关联不存在"); - ErrorCode CONTRACT_OUTS_ALREADY_EXISTS = new ErrorCode(2_023_000_000, "外包合同关联已经存在"); + ErrorCode CONTRACT_OUTS_ALREADY_EXISTS = new ErrorCode(2_023_001_000, "外包合同关联已经存在"); + // ========== 合同信息 2_024_000_000 ========== ErrorCode CONTRACT_NOT_EXISTS = new ErrorCode(2_024_000_000, "合同不存在"); + ErrorCode CONTRACT_NAME_NOT_EXISTS = new ErrorCode(2_024_001_000, "合同名称不存在"); + ErrorCode CONTRACT_ALREADY_EXISTS = new ErrorCode(2_024_002_000, "该合同已经创建"); + + // ========== 历史合同信息 2_025_000_000 ========== ErrorCode CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_025_000_000, "历史合同不存在"); - + // ========== 外部合同信息 2_026_000_000 ========== ErrorCode EXT_CONTRACT_NOT_EXISTS = new ErrorCode(2_026_000_000, "外部合同不存在"); - + // ========== 历史外部合同信息 2_027_000_000 ========== ErrorCode EXT_CONTRACT_HISTORY_NOT_EXISTS = new ErrorCode(2_027_000_000, "历史外部合同不存在"); + // ========== 外部合同关联 2_028_000_000 ========== ErrorCode CONTRACT_EXT_NOT_EXISTS = new ErrorCode(2_028_000_000, "外部合同关联不存在"); diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/OutsContractMajorEnum.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/OutsContractMajorEnum.java new file mode 100644 index 000000000..3755a157b --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/OutsContractMajorEnum.java @@ -0,0 +1,47 @@ +package cn.iocoder.yudao.module.cms.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author wyw + * @description 外包合同专业枚举 + * @date 2024/7/31 + */ +@Getter +@AllArgsConstructor +public enum OutsContractMajorEnum { + //地勘 + GROUND_SERVICE("ground_service","GE"), + //景观 + SCENERY("scenery","SC"), + //建筑 + ARCHITECTURE("architecture","AR"), + //测量 + MEASURE("measure","ME"), + //效果图 + EFFECT_PICTURE("effect_picture","EF"); + + /** + * 类型编号 + */ + private final String code; + /** + * 类型编码 + */ + private final String no; + + /** + * 通过code获取no + * @param code 字典编号 + * @return 类型编码 + */ + public static String getNoByCode(String code) { + for (OutsContractMajorEnum value : values()) { + if (value.getCode().equals(code)) { + return value.getNo(); + } + } + return null; + } +} diff --git a/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/SourceEnum.java b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/SourceEnum.java new file mode 100644 index 000000000..2a4ec6b85 --- /dev/null +++ b/yudao-module-cms/yudao-module-cms-api/src/main/java/cn/iocoder/yudao/module/cms/enums/SourceEnum.java @@ -0,0 +1,42 @@ +package cn.iocoder.yudao.module.cms.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author wyw + * @description 资金来源枚举 + * @date 2024/7/31 + */ +@Getter +@AllArgsConstructor +public enum SourceEnum { + //市财政 + MUNICIPAL_FINANCE("municipal_finance","MF"), + //区财政 + DISTRICT_FINANCE("district_finance","DF"), + //业主自筹 + OWNER_FINANCE("owner_finance","OF"); + /** + * 类型编号 + */ + private final String code; + /** + * 类型编码 + */ + private final String no; + + /** + * 通过code获取no + * @param code 字典编号 + * @return 类型编码 + */ + public static String getNoByCode(String code) { + for (SourceEnum value : values()) { + if (value.getCode().equals(code)) { + return value.getNo(); + } + } + return null; + } +} diff --git a/yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/TrackingDepEnum.java b/yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/TrackingDepEnum.java new file mode 100644 index 000000000..0fc224fe1 --- /dev/null +++ b/yudao-module-pms/yudao-module-pms-api/src/main/java/cn/iocoder/yudao/module/pms/enums/TrackingDepEnum.java @@ -0,0 +1,42 @@ +package cn.iocoder.yudao.module.pms.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author wyw + * @description 主控部门枚举 + * @date 2024/7/31 + */ +@Getter +@AllArgsConstructor +public enum TrackingDepEnum { + // 生产一部 + FIRST_PRODUCE("first-produce", "FP"), + // 生产二部 + SECOND_PRODUCE("second_produce", "DP"), + // 检测院 + LOD("lod", "LO"); + /** + * 类型编号 + */ + private final String code; + /** + * 类型编码 + */ + private final String no; + + /** + * 通过code获取no + * @param code 字典编号 + * @return 类型编码 + */ + public static String getNoByCode(String code) { + for (TrackingDepEnum value : values()) { + if (value.getCode().equals(code)) { + return value.getNo(); + } + } + return null; + } +}