From 615a86d50a81ca8692a9bde323433b54aae6027c Mon Sep 17 00:00:00 2001 From: 17602169347 Date: Tue, 10 Oct 2023 18:51:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/user/UserController.java | 2 +- .../admin/user/UserProfileController.java | 14 ++ .../user/vo/profile/UserProfileRespVO.java | 35 ++++ .../vo/profile/UserProfileUpdateReqVO.java | 2 +- .../vo/SubjectFollowManagementPageReqVO.java | 9 + .../module/xxjj/enums/ErrorCodeConstants.java | 2 + yunxi-server/pom.xml | 12 +- yunxi-ui-admin-vben/src/utils/dict.ts | 1 + .../src/views/system/user/user.data.ts | 60 ++++++ .../src/views/users/mine/index.vue | 193 +++++++++++------- 10 files changed, 247 insertions(+), 83 deletions(-) diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java index fc91ade..e354df9 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserController.java @@ -22,6 +22,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Operation; +import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -204,5 +205,4 @@ public class UserController { list.sort(Comparator.comparing(AdminUserDO::getId)); return success(UserConvert.INSTANCE.convertList04(list)); } - } diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserProfileController.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserProfileController.java index c1f811d..e714057 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserProfileController.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/UserProfileController.java @@ -65,16 +65,30 @@ public class UserProfileController { // 获得用户角色 List userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(user.getId())); resp.setRoles(UserConvert.INSTANCE.convertList(userRoles)); + String deptNames = ""; // 获得部门信息 if (user.getDeptId() != null) { DeptDO dept = deptService.getDept(user.getDeptId()); resp.setDept(UserConvert.INSTANCE.convert02(dept)); + deptNames = deptNames + dept.getName() + ","; } + if(deptNames.length() > 0){ + deptNames = deptNames.substring(0, deptNames.length() - 1); + } + resp.setDeptNames(deptNames); + String postNames = ""; // 获得岗位信息 if (CollUtil.isNotEmpty(user.getPostIds())) { List posts = postService.getPostList(user.getPostIds()); resp.setPosts(UserConvert.INSTANCE.convertList02(posts)); + for (PostDO postDO : posts) { + postNames = postNames + postDO.getName() + ","; + } + } + if(postNames.length() > 0){ + postNames = postNames.substring(0, postNames.length() - 1); } + resp.setPostNames(postNames); // 获得社交用户信息 List socialUsers = socialService.getSocialUserList(user.getId(), UserTypeEnum.ADMIN.getValue()); resp.setSocialUsers(UserConvert.INSTANCE.convertList03(socialUsers)); diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java index dad3c36..b376f81 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java @@ -33,6 +33,41 @@ public class UserProfileRespVO extends UserBaseVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式") private LocalDateTime createTime; + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "事业部,传感部") + private String deptNames; + + @Schema(description = "职务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "董事长,周经理") + private String postNames; + + /** + * 籍贯 + */ + private String nativePlace; + /** + * 学历 + */ + private String education; + /** + * 专业 + */ + private String speciality; + /** + * 毕业院校 + */ + private String graduationInstitution; + /** + * 毕业时间 + */ + private LocalDateTime institutionDatatime; + /** + * 毕业时间 + */ + private LocalDateTime birthDatetime; + /** + * 个人简介 + */ + private String personalProfile; + /** * 所属角色 */ diff --git a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java index efd4114..98cbed1 100644 --- a/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java +++ b/yunxi-module-system/yunxi-module-system-biz/src/main/java/com/yunxi/scm/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java @@ -10,7 +10,7 @@ import javax.validation.constraints.Size; @Schema(description = "管理后台 - 用户个人信息更新 Request VO") @Data -public class UserProfileUpdateReqVO { +public class UserProfileUpdateReqVO extends UserProfileRespVO{ @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") @Size(max = 30, message = "用户昵称长度不能超过 30 个字符") diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectfollowmanagement/vo/SubjectFollowManagementPageReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectfollowmanagement/vo/SubjectFollowManagementPageReqVO.java index cb90c0c..e4a49c4 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectfollowmanagement/vo/SubjectFollowManagementPageReqVO.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/subjectfollowmanagement/vo/SubjectFollowManagementPageReqVO.java @@ -21,6 +21,15 @@ public class SubjectFollowManagementPageReqVO extends PageParam { @Schema(description = "代表人类型(0：客户 1：供应商 2：服务商)", example = "2") private String businessType; + @Schema(description = "分类(0：一级 1：二级 2：三级)", example = "2") + private String calssify; + + @Schema(description = "行业分类(0：家用电器 1：交通运输 2：商务服务 3：家具用品 4：电工电气 5：通信产品 6：办公文教 7：运动休闲 8：传媒广电)", example = "2") + private String industryClassify; + + @Schema(description = "企业性质(0：国有企业 1：集体企业 2：私营企业 3：股份制企业 4：外资企业 5：合资企业)", example = "2") + private String enterpriseNature; + @Schema(description = "任务标题") private String title; diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java index 624b9ce..46aed77 100644 --- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java +++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/enums/ErrorCodeConstants.java @@ -69,4 +69,6 @@ public interface ErrorCodeConstants { ErrorCode ENTERPRISE_CONTRACT_NOT_EXISTS = new ErrorCode(1002004016, "企业合约不存在"); ErrorCode SUBJECT_BASIC_NOT_EXISTS = new ErrorCode(1002004017, "基础业务信息表(客户，供应商，服务商主体)不存在"); + // ========== 主体跟进管理 TODO 补充编号 ========== + ErrorCode SUBJECT_FOLLOW_MANAGEMENT_NOT_EXISTS = new ErrorCode(1002004018, "主体跟进管理不存在"); } diff --git a/yunxi-server/pom.xml b/yunxi-server/pom.xml index 14456cd..25c75ba 100644 --- a/yunxi-server/pom.xml +++ b/yunxi-server/pom.xml @@ -42,11 +42,11 @@ - + com.yunxi.scm @@ -55,17 +55,17 @@ - + - + diff --git a/yunxi-ui-admin-vben/src/utils/dict.ts b/yunxi-ui-admin-vben/src/utils/dict.ts index 75a8f67..e7b0d1f 100644 --- a/yunxi-ui-admin-vben/src/utils/dict.ts +++ b/yunxi-ui-admin-vben/src/utils/dict.ts @@ -169,4 +169,5 @@ export enum DICT_TYPE { industryClassify = 'industry_classify', //客户星级 customerSource = 'customer_source', //客户星级 enterpriseNature = 'enterprise_nature', //客户星级 + XUELI = 'XUELI', //学历 } diff --git a/yunxi-ui-admin-vben/src/views/system/user/user.data.ts b/yunxi-ui-admin-vben/src/views/system/user/user.data.ts index 5c8b3a6..e0fca05 100644 --- a/yunxi-ui-admin-vben/src/views/system/user/user.data.ts +++ b/yunxi-ui-admin-vben/src/views/system/user/user.data.ts @@ -154,6 +154,12 @@ export const formSchema: FormSchema[] = [ handleTree: 'id', }, }, + { + label: '工号', + field: 'jobNumber', + required: true, + component: 'Input', + }, { label: '手机号码', field: 'mobile', @@ -161,6 +167,12 @@ export const formSchema: FormSchema[] = [ defaultValue: 0, component: 'InputNumber', }, + { + label: '微信号', + field: 'wechatAccount', + required: true, + component: 'Input', + }, { label: '邮箱', field: 'email', @@ -187,6 +199,54 @@ export const formSchema: FormSchema[] = [ options: getDictOptions(DICT_TYPE.SYSTEM_USER_SEX), }, }, + { + label: '出生日期', + field: 'birthDatetime', + component: 'DatePicker', + componentProps: { + showTime: false, + format: 'YYYY-MM-DD', + valueFormat: 'x', + }, + }, + { + label: '籍贯', + field: 'nativePlace', + component: 'Input', + }, + { + label: '学历', + field: 'education', + component: 'Select', + componentProps: { + options: getDictOptions(DICT_TYPE.XUELI), + }, + }, + { + label: '专业', + field: 'speciality', + component: 'Input', + }, + { + label: '毕业院校', + field: 'graduationInstitution', + component: 'Input', + }, + { + label: '毕业时间', + field: 'institutionDatatime', + component: 'DatePicker', + componentProps: { + showTime: false, + format: 'YYYY-MM-DD', + valueFormat: 'x', + }, + }, + { + label: '个人简介', + field: 'personalProfile', + component: 'InputTextArea', + }, { label: '岗位', field: 'postIds', diff --git a/yunxi-ui-admin-vben/src/views/users/mine/index.vue b/yunxi-ui-admin-vben/src/views/users/mine/index.vue index a263626..1f69a5c 100644 --- a/yunxi-ui-admin-vben/src/views/users/mine/index.vue +++ b/yunxi-ui-admin-vben/src/views/users/mine/index.vue @@ -1,8 +1,8 @@