Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

src/com/engine/organization/service/impl/HrmResourceServiceImpl.java

@@ -13,6 +13,7 @@ import com.engine.core.impl.Service;
 import com.engine.hrm.util.face.HrmFaceCheckManager;
 import com.engine.organization.component.OrganizationWeaTable;
 import com.engine.organization.entity.DeleteParam;
+import com.engine.organization.entity.chart.ResourceListColumns;
 import com.engine.organization.entity.company.bo.CompBO;
 import com.engine.organization.entity.company.po.CompPO;
 import com.engine.organization.entity.department.bo.DepartmentBO;
@@ -22,10 +23,7 @@ import com.engine.organization.entity.extend.po.ExtendInfoPO;
 import com.engine.organization.entity.hrmresource.bo.HrmRelationBO;
 import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam;
 import com.engine.organization.entity.hrmresource.param.SearchTemplateParam;
-import com.engine.organization.entity.hrmresource.po.HrmRelationPO;
-import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO;
-import com.engine.organization.entity.hrmresource.po.SearchTemplatePO;
-import com.engine.organization.entity.hrmresource.po.TransferDataPO;
+import com.engine.organization.entity.hrmresource.po.*;
 import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
 import com.engine.organization.entity.jclimport.po.CusFormFieldPO;
 import com.engine.organization.entity.job.bo.JobBO;
@@ -425,8 +423,28 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
     @Override
     public Map<String, Object> chartResourceList(Integer departmentId) {
+        Map<String, Object> dataMap = new HashMap<>();
+        List<ResourceListColumns> resourceListColumns = getTableColumns();
+        List<ResourceChartPO> resourceChartPOS = getHrmResourceMapper().selectByDepartmentId(departmentId);
+        dataMap.put("columns",resourceListColumns);
+        dataMap.put("dataSource",resourceChartPOS);
+        return dataMap;
+    }
+
+    private List<ResourceListColumns> getTableColumns() {
+        List<ResourceListColumns> list = new ArrayList<>();
+        list.add(ResourceListColumns.builder().title("序号").dataIndex("id").key("id").build());
+        list.add(ResourceListColumns.builder().title("工号").dataIndex("workCode").key("workCode").build());
+        list.add(ResourceListColumns.builder().title("姓名").dataIndex("lastName").key("lastName").build());
+        list.add(ResourceListColumns.builder().title("性别").dataIndex("sex").key("sex").build());
+        list.add(ResourceListColumns.builder().title("部门").dataIndex("departmentId").key("departmentId").build());
+        list.add(ResourceListColumns.builder().title("分部").dataIndex("subcompamyid1").key("subcompamyid1").build());
+        list.add(ResourceListColumns.builder().title("岗位").dataIndex("jobTitle").key("jobTitle").build());
+        //list.add(ResourceListColumns.builder().title("状态").dataIndex("status").key("status").build());
+        list.add(ResourceListColumns.builder().title("手机号").dataIndex("mobile").key("mobile").build());
+
+        return list;
 
-        return null;
     }
 
     @Override