Merge branch 'refs/heads/feature-Contract-8.12-wyw' into feature-pms-8.8-shl

This commit is contained in:
shl
2024-08-12 11:04:53 +08:00
66 changed files with 2627 additions and 67 deletions

View File

@@ -12,11 +12,11 @@ import lombok.Getter;
@AllArgsConstructor
public enum ChargingStandardEnum {
//厦建设
XIA_BUILDING("xia_building","XB"),
XIA_BUILDING("0","xia_building"),
//包干价
LUMP("lump","LU"),
LUMP("1","lump"),
//其他省份
OTHER("other","OT");
OTHER("2","other");
/**
* 类型编号

View File

@@ -12,15 +12,15 @@ import lombok.Getter;
@AllArgsConstructor
public enum ContractStatusEnum {
//应签未签
NO_SIGN("no_sign","NS"),
NO_SIGN("0","no_sign"),
//已拟定
PREPARED("prepared","PP"),
PREPARED("1","prepared"),
//已盖章
STAMP("stamp","ST"),
STAMP("2","stamp"),
//已签订
SIGN("sign","SI"),
SIGN("3","sign"),
//已终止
TERMINATION("termination","TE"),;
TERMINATION("4","termination"),;
/**
* 类型编号

View File

@@ -12,13 +12,13 @@ import lombok.Getter;
@AllArgsConstructor
public enum ContractTypeEnum {
//勘察设计
SURVEY("survey","KS"),
SURVEY("0","survey"),
//检测
DETECTION("detection","JC"),
DETECTION("1","detection"),
//总承包合同
GENERAL_CONTRACT("general_contract","GC"),
GENERAL_CONTRACT("2","general_contract"),
//全过程咨询
PROCESS_CONSULTATION("process_consultation","PC");
PROCESS_CONSULTATION("3","process_consultation");
/**

View File

@@ -12,9 +12,9 @@ import lombok.Getter;
@AllArgsConstructor
public enum CountTypeEnum {
//费率合同
RATE_CONTRACT("rate_contract","RC"),
RATE_CONTRACT("0","rate_contract"),
//包干合同
RES_CONTRACT("res_contract","RC");
RES_CONTRACT("1","res_contract");
/**
* 类型编号
*/

View File

@@ -8,9 +8,11 @@ package cn.iocoder.yudao.module.cms.enums;
public interface DictTypeConstants {
// ***** 字典名称 ******
String Contract_Type = "contract_type"; // 合同类型
String CONTRACT_TYPE = "contract_type"; // 合同类型
String CONTRACT_STATUS = "contract_status"; // 合同类型
String COUNT_TYPE = "count_type";
String SOURCE = "source";
String PROCESS_STATUS = "process_status";
String CHARGING_STANDARD = "charging_standard";
String OUTS_CONTRACT_MAJOR = "outs_contract_major";
}

View File

@@ -12,15 +12,15 @@ import lombok.Getter;
@AllArgsConstructor
public enum OutsContractMajorEnum {
//地勘
GROUND_SERVICE("ground_service","GE"),
GROUND_SERVICE("0","ground_service"),
//景观
SCENERY("scenery","SC"),
SCENERY("1","scenery"),
//建筑
ARCHITECTURE("architecture","AR"),
ARCHITECTURE("2","architecture"),
//测量
MEASURE("measure","ME"),
MEASURE("3","measure"),
//效果图
EFFECT_PICTURE("effect_picture","EF");
EFFECT_PICTURE("4","effect_picture");
/**
* 类型编号

View File

@@ -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 ProcessStatusEnum {
//未执行
NO_EXECUTION("0","no_execution"),
//正在执行
EXECUTING("1","executing"),
//执行完成
COMPLETED("2","completed");
/**
* 类型编号
*/
private final String code;
/**
* 类型编码
*/
private final String no;
/**
* 通过code获取no
* @param code 字典编号
* @return 类型编码
*/
public static String getNoByCode(String code) {
for (ProcessStatusEnum value : values()) {
if (value.getCode().equals(code)) {
return value.getNo();
}
}
return null;
}
}

View File

@@ -12,11 +12,11 @@ import lombok.Getter;
@AllArgsConstructor
public enum SourceEnum {
//市财政
MUNICIPAL_FINANCE("municipal_finance","MF"),
MUNICIPAL_FINANCE("0","municipal_finance"),
//区财政
DISTRICT_FINANCE("district_finance","DF"),
DISTRICT_FINANCE("1","district_finance"),
//业主自筹
OWNER_FINANCE("owner_finance","OF");
OWNER_FINANCE("2","owner_finance");
/**
* 类型编号
*/