Merge remote-tracking branch 'puhui/feature/crm' into feature/crm

# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java
This commit is contained in:
YunaiV
2023-12-06 19:33:04 +08:00
16 changed files with 458 additions and 74 deletions

View File

@ -69,7 +69,10 @@ public interface ErrorCodeConstants {
// ========== 商机状态 1_020_011_000 ==========
ErrorCode BUSINESS_STATUS_NOT_EXISTS = new ErrorCode(1_020_011_000, "商机状态不存在");
// ========== 客户公海规则设置 1_020_011_000 ==========
// ========== 客户公海规则设置 1_020_012_000 ==========
ErrorCode CUSTOMER_LIMIT_CONFIG_NOT_EXISTS = new ErrorCode(1_020_012_000, "客户限制配置不存在");
// ========== 关注的数据 1_020_013_000 ==========
ErrorCode CRM_CONCERNED_NOT_EXISTS = new ErrorCode(1_020_013_000, "关注数据不存在");
}

View File

@ -17,7 +17,8 @@ import java.util.Arrays;
public enum CrmSceneEnum implements IntArrayValuable {
OWNER(1, "我负责的"),
FOLLOW(2, "我关注的");
FOLLOW(2, "我关注的"),
SUBORDINATE(3, "下属负责的");
public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmSceneEnum::getType).toArray();
@ -38,6 +39,10 @@ public enum CrmSceneEnum implements IntArrayValuable {
return ObjUtil.equal(FOLLOW.getType(), type);
}
public static boolean isSubordinate(Integer type) {
return ObjUtil.equal(SUBORDINATE.getType(), type);
}
@Override
public int[] array() {
return ARRAYS;