!131 人员导入

Merge pull request !131 from dxfeng/feature/dxf

src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java

@@ -23,9 +23,11 @@ import lombok.NoArgsConstructor;
                 "t.company_id," +
                 "t.mobile," +
                 "t.telephone," +
-                "t.manager_id ",
+                "t.manager_id, " +
+                "t.show_order ",
         fromSql = "FROM jcl_org_hrmresource t ",
-        orderby = " id ",
+        orderby = " show_order ",
+        sortway = " asc",
         primarykey = "id",
         operates = {
                 @OrganizationTableOperate(index = "0", text = "发消息"),
@@ -75,4 +77,7 @@ public class HrmResourceVO {
      */
     @OrganizationTableColumn(text = "直接上级", width = "25%", column = "manager_id", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getManagerName")
     private String managerName;
+
+    @OrganizationTableColumn(text = "显示顺序", width = "25%", column = "show_order", orderkey = "show_order")
+    private Integer showOrder;
 }

src/com/engine/organization/util/excel/ExcelUtil.java

@@ -93,7 +93,7 @@ public class ExcelUtil {
         //自适应宽度
         sheet.autoSizeColumn(0, true);
         //默认列宽
-        sheet.setDefaultColumnWidth(100);
+        sheet.setDefaultColumnWidth(25);
         //默认行高
         sheet.setDefaultRowHeightInPoints(18);