diff --git a/ensign-framework/ensign-common/src/main/java/com/ensign/crm/framework/common/enums/CrmFunctionEnum.java b/ensign-framework/ensign-common/src/main/java/com/ensign/crm/framework/common/enums/CrmFunctionEnum.java new file mode 100644 index 0000000..f6ce0a3 --- /dev/null +++ b/ensign-framework/ensign-common/src/main/java/com/ensign/crm/framework/common/enums/CrmFunctionEnum.java @@ -0,0 +1,42 @@ +package com.ensign.crm.framework.common.enums; + +import com.ensign.crm.framework.common.core.IntArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * @Classname CrmFunction + * @Description TODO + * @Date 2024/10/9 16:21 + * @Created by violet + */ + + +@AllArgsConstructor +@Getter +public enum CrmFunctionEnum implements IntArrayValuable { + FACTORY_BACKSTAGE(1, "厂家后台"), + REGIONAL_MANAGER(2, "区域经理"), + BUSINESS_MANAGER(3, "业务经理"); + + + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmFunctionEnum::getValue).toArray(); + + /** + * 类型 + */ + private final Integer value; + /** + * 类型名 + */ + private final String name; + + + + @Override + public int[] array() { + return ARRAYS; + } +} diff --git a/ensign-framework/ensign-common/src/main/java/com/ensign/crm/framework/common/enums/CrmUserTypeEnum.java b/ensign-framework/ensign-common/src/main/java/com/ensign/crm/framework/common/enums/CrmUserTypeEnum.java new file mode 100644 index 0000000..c7899bc --- /dev/null +++ b/ensign-framework/ensign-common/src/main/java/com/ensign/crm/framework/common/enums/CrmUserTypeEnum.java @@ -0,0 +1,41 @@ +package com.ensign.crm.framework.common.enums; + +import com.ensign.crm.framework.common.core.IntArrayValuable; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * @Classname CrmUserTypeEnum + * @Description TODO + * @Date 2024/10/9 16:17 + * @Created by violet + */ + +@AllArgsConstructor +@Getter +public enum CrmUserTypeEnum implements IntArrayValuable { + + DEALER(1, "经销商人员"), + MANUFACTURER(2, "厂家人员"); + + + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CrmUserTypeEnum::getValue).toArray(); + + /** + * 类型 + */ + private final Integer value; + /** + * 类型名 + */ + private final String name; + + + + @Override + public int[] array() { + return ARRAYS; + } +} diff --git a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index adb892e..2fb48cd 100644 --- a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -1,6 +1,7 @@ package com.ensign.crm.module.system.controller.admin.user.vo.user; import cn.hutool.core.util.ObjectUtil; +import com.ensign.crm.framework.common.enums.CommonStatusEnum; import com.ensign.crm.framework.common.validation.Mobile; import com.ensign.crm.module.system.framework.operatelog.core.DeptParseFunction; import com.ensign.crm.module.system.framework.operatelog.core.PostParseFunction; @@ -77,4 +78,25 @@ public class UserSaveReqVO { || (ObjectUtil.isAllNotEmpty(password)); // 新增时,必须都传递 password } + + /** + * 是否同步苍穹 + * 枚举 {@link CommonStatusEnum} + */ + @Schema(description = "是否同步苍穹", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer isSyncKingdee; + + /** + * CRM用户类型 + * 枚举 {@link com.ensign.crm.framework.common.enums.CrmUserTypeEnum} + */ + @Schema(description = "CRM用户类型", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer crmUserType; + + /** + * CRM职能 + * 枚举 {@link com.ensign.crm.framework.common.enums.CrmFunctionEnum} + */ + @Schema(description = "CRM职能", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer crmUserFunction; } diff --git a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/dal/dataobject/user/AdminUserDO.java b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/dal/dataobject/user/AdminUserDO.java index 09091f6..f062871 100644 --- a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/dal/dataobject/user/AdminUserDO.java +++ b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/dal/dataobject/user/AdminUserDO.java @@ -95,6 +95,19 @@ public class AdminUserDO extends TenantBaseDO { /** * 是否同步苍穹 + * 枚举 {@link CommonStatusEnum} */ private Integer isSyncKingdee; + + /** + * CRM用户类型 + * 枚举 {@link com.ensign.crm.framework.common.enums.CrmUserTypeEnum} + */ + private Integer crmUserType; + + /** + * CRM职能 + * 枚举 {@link com.ensign.crm.framework.common.enums.CrmFunctionEnum} + */ + private Integer crmUserFunction; }