用户管理导入调整

wangqian
1 parent 5f6887bb
Showing 2 changed files with 15 additions and 23 deletions
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/UserController.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserImportExcelVO.java
@@ -217,25 +217,14 @@ public class UserController {
         // 手动创建导出 demo
         List<UserImportExcelVO> list = Arrays.asList(
                 UserImportExcelVO.builder()
-                        .username("yunai")
-                        .deptId(255L)
-                        .email("yunai@iocoder.cn")
+                        .username("示例：zhangshan")
+                        .nickname("张山")
                         .mobile("15601691300")
-                        .nickname("全域")
-                       // .status(CommonStatusEnum.ENABLE.getStatus())
                         .sex(SexEnum.MALE.getSex())
-                        .busiLine("园林") // 简洁示例
-                        .isInner(1)
-                        .build(),
-                UserImportExcelVO.builder()
-                        .username("yuanma")
+                        .email("yunai@iocoder.cn")
                         .deptId(255L)
-                        .email("yuanma@iocoder.cn")
-                        .mobile("15601701300")
-                        .nickname("源码")
-                        //.status(CommonStatusEnum.DISABLE.getStatus())
-                        .sex(SexEnum.FEMALE.getSex())
-                        .busiLine("园林,物业")
+                       // .status(CommonStatusEnum.ENABLE.getStatus())
+                        .busiLine("yl,sz") // 简洁示例
                         .isInner(1)
                         .build()
         );
@@ -28,13 +28,6 @@ public class UserImportExcelVO {
     @ExcelProperty("用户名称")
     private String nickname;
  
-    @ExcelProperty(value = "部门编号", converter = DeptConvert.class)
-    @ExcelColumnSelect(functionName = DeptExcelColumnSelectFunction.NAME)
-    private Long deptId;
-
-    @ExcelProperty("用户邮箱")
-    private String email;
-
     @ExcelProperty("手机号码")
     private String mobile;
  
@@ -42,6 +35,13 @@ public class UserImportExcelVO {
     @DictFormat(DictTypeConstants.USER_SEX)
     private Integer sex;
  
+    @ExcelProperty("邮箱")
+    private String email;
+
+    @ExcelProperty(value = "归属部门名称", converter = DeptConvert.class)
+    @ExcelColumnSelect(functionName = DeptExcelColumnSelectFunction.NAME)
+    private Long deptId;
+
     //@ExcelProperty(value = "账号状态", converter = DictConvert.class)
     //@DictFormat(DictTypeConstants.COMMON_STATUS)
     //private Integer status;
@@ -52,4 +52,7 @@ public class UserImportExcelVO {
     @ExcelProperty(value = "是否是内部员工", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.SYSTEM_IS_INNER)
     private Integer isInner;
+
+    @ExcelProperty(value = "备注")
+    private String remark;
 }