diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 1b51b49b..4b1e3841 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -171,7 +171,7 @@ public class DepartmentBO { tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString()); tree.setSelected(false); tree.setType("2"); - tree.setParentComp(null == item.getSupDepId() ? "0" : item.getSubCompanyId1().toString()); + tree.setParentComp(null == item.getSubCompanyId1() ? "0" : item.getSubCompanyId1().toString()); tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder().intValue()); tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0.00 : item.getShowOrderOfTree()); return tree; diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index b16a3186..af6e170f 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -36,7 +36,7 @@ public class DepartmentListDTO { /** * 名称 */ - @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200") + @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentMark", key = "departmentMark", width = "200") private String departmentMark; /** @@ -48,7 +48,7 @@ public class DepartmentListDTO { /** * 简称 */ - @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentName", key = "departmentName") + @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentName", key = "departmentName") private String departmentName; /** diff --git a/src/com/engine/organization/entity/job/dto/JobListDTO.java b/src/com/engine/organization/entity/job/dto/JobListDTO.java index 25f07db3..57d8ed61 100644 --- a/src/com/engine/organization/entity/job/dto/JobListDTO.java +++ b/src/com/engine/organization/entity/job/dto/JobListDTO.java @@ -89,6 +89,8 @@ public class JobListDTO { //@TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag") //private Integer forbiddenTag; + + /** * 操作列 */ diff --git a/src/com/engine/organization/enums/OrgImportEnum.java b/src/com/engine/organization/enums/OrgImportEnum.java index 0662f434..d317ee32 100644 --- a/src/com/engine/organization/enums/OrgImportEnum.java +++ b/src/com/engine/organization/enums/OrgImportEnum.java @@ -1,6 +1,7 @@ package com.engine.organization.enums; import com.engine.organization.exception.OrganizationRunTimeException; +import com.engine.organization.util.saveimport.JobInfoImportUtil; import com.engine.organization.util.saveimport.PostInfoImportUtil; import com.engine.organization.util.saveimport.SequenceImportUtil; import com.engine.organization.util.saveimport.StaffInfoImportUtil; @@ -30,6 +31,22 @@ public enum OrgImportEnum implements OrgImportAdapter { return StaffInfoImportUtil.importForm(user); } }, + JOB("job") { + @Override + public Map orgImport(Map params, User user) { + Map resultMap = new HashMap<>(); + String excelFile = (String) params.get("excelfile"); + resultMap.put("pId", JobInfoImportUtil.saveImport("add", excelFile, user)); + return resultMap; + } + + @Override + public List> orgForm(User user) { + return JobInfoImportUtil.importForm(user); + } + }, + + SEQUENCE("sequence"){ @Override public Map orgImport(Map params, User user) { diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index 8309dab9..648c966a 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -148,6 +148,8 @@ public interface JobMapper { int selectByConditions(@Param("resourcePO") ResourcePO resourcePO); + int selectByE9(@Param("jobTitleName") String jobTitleName,@Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark); + List listUsedId(); List isAllowDelete(@Param("jobId") Long jobId); diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index bea46ff1..9cfdcf89 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -482,6 +482,16 @@ and delete_type = 0 + + +