diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index 96895d8d..208d6e7c 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -22,9 +22,13 @@ import lombok.NoArgsConstructor; @OrganizationTable(pageId = "80e7830c-18e8-4e14-8241-18821195ef31", fields = "t.id," + "t.lastname," + - "t.mobile," + - "t.companystartdate," + - "t.sex", + "t.workcode," + + "t.sex," + + "t.status," + + "t.managerid," + + "t.jobtitle," + + "t.loginid," + + "t.seclevel", fromSql = "FROM hrmresource t ", orderby = "id", primarykey = "id", @@ -35,17 +39,26 @@ public class EmployeeTableVO { @OrganizationTableColumn(column = "id", display = false) private Long id; - @OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname") + @OrganizationTableColumn(text = "姓名", width = "10%", column = "lastname") private String lastname; - @OrganizationTableColumn(text = "性别", width = "25%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName") + @OrganizationTableColumn(text = "编号", width = "10%", column = "workcode") + private String workcode; + + @OrganizationTableColumn(text = "性别", width = "10%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName") private String sex; - @OrganizationTableColumn(text = "手机", width = "25%", column = "mobile") - private String mobile; + @OrganizationTableColumn(text = "直接上级", width = "10%", column = "managerid",transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getManagerName") + private String managerid; - @OrganizationTableColumn(text = "入职日期", width = "25%", column = "companystartdate") - private String companystartdate; + @OrganizationTableColumn(text = "岗位", width = "10%", column = "jobtitle",transmethod = "com.engine.organization.transmethod.JobTransMethod.getJobTitleName") + private String jobtitle; + + @OrganizationTableColumn(text = "登录名", width = "10%", column = "loginid") + private String loginid; + + @OrganizationTableColumn(text = "安全级别", width = "10%", column = "seclevel") + private String seclevel; } diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index 4e2e5e0f..38b60fea 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -25,8 +25,11 @@ import lombok.NoArgsConstructor; operates = { @OrganizationTableOperate(text = "编辑"), @OrganizationTableOperate(index = "1", text = "删除"), - @OrganizationTableOperate(index = "2", text = "变更") - }, tableType = WeaTableType.CHECKBOX + @OrganizationTableOperate(index = "2", text = "变更"), + @OrganizationTableOperate(index = "3", text = "详情") + }, tableType = WeaTableType.CHECKBOX, + operatePopedom = @OperatePopedom(transmethod = "com.engine.organization.util.ConfigTrans.formatStaffOperates", otherpara = "column:control_dimension") + ) public class StaffTableVO { @@ -35,11 +38,7 @@ public class StaffTableVO { */ @OrganizationTableColumn(column = "id", display = false) private Long id; - /** - * 是否被引用 - */ - @OrganizationTableColumn(column = "isUsed", display = false) - private Integer isUsed; + /** * 方案id */ diff --git a/src/com/engine/organization/mapper/job/JobMapper.java b/src/com/engine/organization/mapper/job/JobMapper.java index e1a03e49..796691d1 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.java +++ b/src/com/engine/organization/mapper/job/JobMapper.java @@ -149,4 +149,6 @@ public interface JobMapper { List isAllowDelete(@Param("jobId") Long jobId); JobPO getJobByResource(@Param("resourcePO") ResourcePO resourcePO); + + String selectJobTitleById(@Param("id") String id); } diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml index fdf615f2..c41d004b 100644 --- a/src/com/engine/organization/mapper/job/JobMapper.xml +++ b/src/com/engine/organization/mapper/job/JobMapper.xml @@ -512,12 +512,21 @@ t.ec_department = h.departmentid where h.status < 4 + + + + + +