diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java index 4973e807..8c12d663 100644 --- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java +++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java @@ -106,6 +106,7 @@ public class DepartmentBO { SingleDeptTreeVO .builder() .id(e.getId()) + .deptNo(e.getDeptNo()) .deptName(e.getDeptName()) .parentComp(e.getParentComp()) .parentDept(e.getParentDept()) diff --git a/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java b/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java index 319d1f26..5ba4493d 100644 --- a/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java +++ b/src/com/engine/organization/entity/department/vo/SingleDeptTreeVO.java @@ -26,6 +26,9 @@ public class SingleDeptTreeVO { private Long id; + @TableTitle(title = "编号", dataIndex = "deptNo", key = "deptNo") + private String deptNo; + @TableTitle(title = "部门名称", dataIndex = "deptName", key = "deptName") private String deptName; diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index 1743372a..7e3c7e6c 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -22,6 +22,8 @@ import lombok.NoArgsConstructor; @OrganizationTable(pageId = "80e7830c-18e8-4e14-8241-18821195ef31", fields = "t.id," + "t.lastname," + + "t.mobile," + + "t.," + "t.sex", fromSql = "FROM HrmResource t ", orderby = "id desc", @@ -33,11 +35,17 @@ public class EmployeeTableVO { @OrganizationTableColumn(column = "id", display = false) private Long id; - @OrganizationTableColumn(text = "姓名", width = "50%", column = "lastname") + @OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname") private String lastname; - @OrganizationTableColumn(text = "性别", width = "50%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName") + @OrganizationTableColumn(text = "性别", width = "25%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName") private String sex; + @OrganizationTableColumn(text = "手机", width = "25%", column = "mobile") + private String mobile; + + @OrganizationTableColumn(text = "入职日期", width = "25%", column = "companystartdate") + private String companystartdate; + } diff --git a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java index 56e2b718..00ac4781 100644 --- a/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java +++ b/src/com/engine/organization/entity/job/vo/SingleJobTreeVO.java @@ -29,7 +29,7 @@ public class SingleJobTreeVO { @TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo") private String jobNo; - @TableTitle(title = "名称", dataIndex = "jobName", key = "jobName") + @TableTitle(title = "岗位名称", dataIndex = "jobName", key = "jobName") private String jobName; @TableTitle(title = "上级岗位", dataIndex = "parentJobName", key = "parentJobName") diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 6238b90d..57970c69 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -192,7 +192,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { dimensionItem.setViewAttr(3); dimensionItem.setRules("required|string"); // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, "说明", "description"); // 编辑状态下赋值操作 String id = Util.null2String(params.get("id")); diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 2b53021f..b03a9c6b 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -214,10 +214,11 @@ public class StaffServiceImpl extends Service implements StaffService { selectOptions.add(option1); selectOptions.add(option2); selectOptions.add(option3); - SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, true, "控制策略", "controlPolicy"); + SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "控制策略", "controlPolicy"); controlPolicyItem.setViewAttr(3); + controlPolicyItem.setValue("1"); controlPolicyItem.setRules("required|string"); - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "描述说明", "description"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, "描述说明", "description"); // 编辑状态下赋值操作 diff --git a/src/com/engine/organization/util/MenuBtn.java b/src/com/engine/organization/util/MenuBtn.java index 1125aa45..3e2b74df 100644 --- a/src/com/engine/organization/util/MenuBtn.java +++ b/src/com/engine/organization/util/MenuBtn.java @@ -51,7 +51,7 @@ public class MenuBtn { * @return */ public static MenuBtn topMenu_copy() { - return MenuBtn.builder().isBatch("1").isTop("1").menuFun("copy").menuIcon("icon-coms-form-copy").menuName("复制").type( "BTN_Copy").build(); + return MenuBtn.builder().isBatch("1").isTop("1").menuFun("copy").menuIcon("icon-coms-form-copy").menuName("批量复制").type( "BTN_Copy").build(); } /**