diff --git a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java index ae72c035..28d0b13f 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java @@ -56,22 +56,22 @@ public class StaffPlanTableVO { /** * w维度 */ - @OrganizationTableColumn(text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension") + @OrganizationTableColumn(labelId = 547293, text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension") private String controlDimension; /** * 年度 */ - @OrganizationTableColumn(text = "年度", width = "16%", column = "plan_year") + @OrganizationTableColumn(labelId = 546937, text = "年度", width = "16%", column = "plan_year") private Integer planYear; /** * 时间开始 */ - @OrganizationTableColumn(text = "时间开始", width = "16%", column = "time_start", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") + @OrganizationTableColumn(labelId = 547337, text = "时间开始", width = "16%", column = "time_start", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") private String timeStart; /** * 时间结束 */ - @OrganizationTableColumn(text = "时间结束", width = "16%", column = "time_end", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") + @OrganizationTableColumn(labelId = 547338, text = "时间结束", width = "16%", column = "time_end", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString") private String timeEnd; /** * 状态 diff --git a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java index 05f4c52b..0f10fc8f 100644 --- a/src/com/engine/organization/entity/staff/vo/StaffTableVO.java +++ b/src/com/engine/organization/entity/staff/vo/StaffTableVO.java @@ -43,52 +43,52 @@ public class StaffTableVO { /** * 方案id */ - @OrganizationTableColumn(text = "方案", width = "10%", column = "plan_id", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getSpanById") + @OrganizationTableColumn(labelId = 547344, text = "方案", width = "10%", column = "plan_id", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getSpanById") private String planId; /** * 维度 */ - @OrganizationTableColumn(text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension") + @OrganizationTableColumn(labelId = 547293, text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension") private String controlDimension; /** * 分部 */ - @OrganizationTableColumn(text = "分部", width = "10%", column = "comp_id", transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById") + @OrganizationTableColumn(labelId = 547332, text = "分部", width = "10%", column = "comp_id", transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById") private String compId; /** * 部门 */ - @OrganizationTableColumn(text = "部门", width = "10%", column = "dept_id", transmethod = "com.engine.organization.transmethod.DepartmentTransMethod.getSpanById") + @OrganizationTableColumn(labelId = 547331, text = "部门", width = "10%", column = "dept_id", transmethod = "com.engine.organization.transmethod.DepartmentTransMethod.getSpanById") private String deptId; /** * 岗位 */ - @OrganizationTableColumn(text = "岗位", width = "10%", column = "job_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSpanById") + @OrganizationTableColumn(labelId = 547333, text = "岗位", width = "10%", column = "job_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSpanById") private String jobId; /** * 编制数 */ - @OrganizationTableColumn(text = "编制数", width = "10%", column = "staff_num") + @OrganizationTableColumn(labelId = 547345, text = "编制数", width = "10%", column = "staff_num") private Integer staffNum; /** * 在编 */ - @OrganizationTableColumn(text = "在编", width = "10%", column = "permanent_num") + @OrganizationTableColumn(labelId = 547346, text = "在编", width = "10%", column = "permanent_num") private Integer permanentNum; /** * 冻结数 */ - @OrganizationTableColumn(text = "冻结数", width = "10%", column = "freeze_num") + @OrganizationTableColumn(labelId = 547347, text = "冻结数", width = "10%", column = "freeze_num") private Integer freezeNum; /** * 缺编状态 */ - @OrganizationTableColumn(text = "缺编状态", width = "10%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan") + @OrganizationTableColumn(labelId = 547348, text = "缺编状态", width = "10%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan") private String lackStatus; /** * 编制描述 */ - @OrganizationTableColumn(text = "编制描述", width = "10%", column = "staff_desc") + @OrganizationTableColumn(labelId = 547349, text = "编制描述", width = "10%", column = "staff_desc") private String staffDesc; } diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java index f1efbd2b..a1e12ad2 100644 --- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java @@ -4,14 +4,15 @@ import com.engine.organization.entity.staff.param.StaffOutParam; import com.engine.organization.entity.staff.po.StaffPO; import com.engine.organization.enums.ModuleTypeEnum; import com.engine.organization.enums.StaffChangeEnum; -import com.engine.organization.exception.OrganizationRunTimeException; import com.engine.organization.mapper.staff.StaffMapper; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.MapperProxyFactory; import lombok.SneakyThrows; import org.apache.commons.collections.CollectionUtils; +import weaver.hrm.User; import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.company.SubCompanyComInfo; +import weaver.systeminfo.SystemEnv; import java.util.*; import java.util.function.Function; @@ -33,13 +34,16 @@ public class FunctionOutStaffServiceImpl { return MapperProxyFactory.getProxy(StaffMapper.class); } - FunctionOutStaffServiceImpl(){ + private User user; + + FunctionOutStaffServiceImpl(User user){ affairFunctionS.put(StaffChangeEnum.ADD, this::addStaffNums); affairFunctionS.put(StaffChangeEnum.REDUCE, this::reduceStaffNums); affairFunctionS.put(StaffChangeEnum.FROZEN, this::frozenStaffNums); affairFunctionS.put(StaffChangeEnum.ENTRY, this::entryAdd); affairFunctionS.put(StaffChangeEnum.DIMISSION, this::dimissionReduce); affairFunctionS.put(StaffChangeEnum.TRANSFER, this::transfer); + this.user = user; } @@ -62,7 +66,7 @@ public class FunctionOutStaffServiceImpl { .orElse(0); Integer sums = staffPO.getPermanentNum() + staffPO.getFreezeNum(); if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) { - OrganizationAssert.isFalse(difference.compareTo(sums) < 0,"存在编制超编风险,请先修改控制策略"); + OrganizationAssert.isFalse(difference.compareTo(sums) < 0, SystemEnv.getHtmlLabelName(547453,user.getLanguage())); } staffPO.setStaffNum(difference < 0 ? 0 :difference); buildStaffPO(staffPO); @@ -77,7 +81,7 @@ public class FunctionOutStaffServiceImpl { .mapToInt(Integer::intValue) .sum(); if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) { - OrganizationAssert.isFalse(sum.compareTo(staffPO.getStaffNum()) > 0, "冻结数不能大于剩余编制数！"); + OrganizationAssert.isFalse(sum.compareTo(staffPO.getStaffNum()) > 0, SystemEnv.getHtmlLabelName(547469,user.getLanguage())); } staffPO.setFreezeNum(sum); buildStaffPO(staffPO); @@ -98,8 +102,8 @@ public class FunctionOutStaffServiceImpl { //强控策略下不容许超编 if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) { //冻结数释放 - OrganizationAssert.isFalse((sums > staffPO.getStaffNum() && staffPO.getFreezeNum() > 0),"强控策略下请先释放当前冻结数后再完成入职操作"); - OrganizationAssert.isFalse( sums > staffPO.getStaffNum(),"强控策略下不容许超编"); + OrganizationAssert.isFalse((sums > staffPO.getStaffNum() && staffPO.getFreezeNum() > 0),SystemEnv.getHtmlLabelName(547470,user.getLanguage())); + OrganizationAssert.isFalse( sums > staffPO.getStaffNum(),SystemEnv.getHtmlLabelName(547471,user.getLanguage())); } //向上部门 分部在编数调整 upwardReviewSums(param); @@ -117,7 +121,7 @@ public class FunctionOutStaffServiceImpl { private Integer dimissionReduce(StaffOutParam param) { StaffPO staffPO = select(param); - OrganizationAssert.isFalse(param.getNum().compareTo(staffPO.getPermanentNum()) > 0,"调整数量不可大于在编数"); + OrganizationAssert.isFalse(param.getNum().compareTo(staffPO.getPermanentNum()) > 0,SystemEnv.getHtmlLabelName(547472,user.getLanguage())); List numbers = Arrays.asList(staffPO.getPermanentNum(),param.getNum()); Integer difference = numbers.stream() .reduce((a, b) -> a - b) @@ -219,7 +223,7 @@ public class FunctionOutStaffServiceImpl { private StaffPO select(StaffOutParam param) { List staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob()); - OrganizationAssert.notEmpty(staffPO,"未查询到对应编制方案下的组织编制信息！"); + OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage())); return staffPO.get(0); } diff --git a/src/com/engine/organization/service/impl/StaffOutServiceImpl.java b/src/com/engine/organization/service/impl/StaffOutServiceImpl.java index d8069006..54f12b02 100644 --- a/src/com/engine/organization/service/impl/StaffOutServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffOutServiceImpl.java @@ -4,6 +4,7 @@ import com.engine.core.impl.Service; import com.engine.organization.entity.staff.param.StaffOutParam; import com.engine.organization.service.StaffOutService; import com.engine.organization.util.OrganizationAssert; +import weaver.systeminfo.SystemEnv; /** * @Author liang.cheng @@ -16,16 +17,16 @@ public class StaffOutServiceImpl extends Service implements StaffOutService { @Override public Integer changeStaff(StaffOutParam staffOutParam) { - OrganizationAssert.notNull(staffOutParam.getNum(),"调整数量不能为空！"); - OrganizationAssert.notNull(staffOutParam.getPlanId(),"未指定所属编制方案！"); - FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl(); + OrganizationAssert.notNull(staffOutParam.getNum(), SystemEnv.getHtmlLabelName(547466,user.getLanguage())); + OrganizationAssert.notNull(staffOutParam.getPlanId(),SystemEnv.getHtmlLabelName(547467,user.getLanguage())); + FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl(user); buildStaffOutParam(staffOutParam); return functionFactory.actuator(staffOutParam.getType(), staffOutParam); } @Override public Integer transactionOnJob(StaffOutParam staffOutParam) { - FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl(); + FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl(user); buildStaffOutParam(staffOutParam); return functionFactory.actuator(staffOutParam.getType(), staffOutParam); } diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 3866969d..794b765f 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -74,9 +74,9 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { String timeEnd = param.getTimeEnd(); Date startDate = DateUtil.parseToDate(timeStart); Date endDate = DateUtil.parseToDate(timeEnd); - OrganizationAssert.isFalse(startDate.after(endDate), "开始时间不允许在结束时间之后"); + OrganizationAssert.isFalse(startDate.after(endDate), SystemEnv.getHtmlLabelName(547445,user.getLanguage())); List staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension()); - OrganizationAssert.isEmpty(staffPlanPO1,"同一维度下，相同适用公司编制方案的时间段不允许出现交叉"); + OrganizationAssert.isEmpty(staffPlanPO1,SystemEnv.getHtmlLabelName(547446,user.getLanguage())); return getStaffPlanMapper().insertIgnoreNull(staffPlanPO); } @@ -95,10 +95,10 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { String timeEnd = param.getTimeEnd(); Date startDate = DateUtil.parseToDate(timeStart); Date endDate = DateUtil.parseToDate(timeEnd); - OrganizationAssert.isFalse(startDate.after(endDate), "开始时间不允许在结束时间之后"); + OrganizationAssert.isFalse(startDate.after(endDate), SystemEnv.getHtmlLabelName(547445,user.getLanguage())); List staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension()); if (staffPlanPO1.size() > 1) { - throw new OrganizationRunTimeException("同一维度下，相同适用公司编制方案已存在"); + throw new OrganizationRunTimeException(SystemEnv.getHtmlLabelName(547458,user.getLanguage())); } // 多选赋值 staffPlanPO.setCompanyId(staffPlanPO.getEcCompany()); @@ -129,23 +129,23 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { // 名称 SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "planName"); // 年度 - SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "年度", "planYear"); + SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 546937, "planYear"); planYearItem.setFormat("YYYY"); // 时间开始 - SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "时间开始", "timeStart"); + SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547337, "timeStart"); // 时间结束 - SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "时间结束", "timeEnd"); + SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547338, "timeEnd"); // 适用公司 - SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "适用公司", "164", "ecCompany", ""); + SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547340, "164", "ecCompany", ""); // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547142, "description"); // 状态 List selectOptions = new ArrayList<>(); SearchConditionOption enableOption = new SearchConditionOption("true", SystemEnv.getHtmlLabelName(547186, user.getLanguage())); SearchConditionOption disableOption = new SearchConditionOption("false", SystemEnv.getHtmlLabelName(547192, user.getLanguage())); selectOptions.add(enableOption); selectOptions.add(disableOption); - SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "禁用标记", "forbiddenTag"); + SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547130, "forbiddenTag"); conditionItems.add(planNoItem); @@ -174,31 +174,31 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547141, "planName"); planNameItem.setRules("required|string"); // 年度 - SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "年度", "planYear"); + SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 546937, "planYear"); planYearItem.setFormat("YYYY"); planYearItem.setRules("required|string"); // 时间开始 - SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间开始", "timeStart"); + SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 547337, "timeStart"); timeStartItem.setRules("required|string"); // 时间结束 - SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间结束", "timeEnd"); + SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 547338, "timeEnd"); timeEndItem.setRules("required|string"); // 适用公司 - SearchConditionItem ecCompanyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "适用公司", "194", "ecCompany", "compBrowser"); + SearchConditionItem ecCompanyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547340, "194", "ecCompany", "compBrowser"); ecCompanyIdtItem.setRules("required|string"); List selectOptions = new ArrayList<>(); - SearchConditionOption option1 = new SearchConditionOption("1", "分部"); - SearchConditionOption option2 = new SearchConditionOption("2", "部门"); - SearchConditionOption option3 = new SearchConditionOption("3", "岗位"); + SearchConditionOption option1 = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547332,user.getLanguage())); + SearchConditionOption option2 = new SearchConditionOption("2", SystemEnv.getHtmlLabelName(547331,user.getLanguage())); + SearchConditionOption option3 = new SearchConditionOption("3", SystemEnv.getHtmlLabelName(547333,user.getLanguage())); selectOptions.add(option1); selectOptions.add(option2); selectOptions.add(option3); // 控制维度 - SearchConditionItem dimensionItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, true, "控制维度", "controlDimension"); + SearchConditionItem dimensionItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, true, 547341, "controlDimension"); dimensionItem.setViewAttr(3); dimensionItem.setRules("required|string"); // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, "说明", "description"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, 547142, "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 7994d9ca..a56370fa 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -179,8 +179,6 @@ public class StaffServiceImpl extends Service implements StaffService { } // 更新主表 int updateStaff = getStaffMapper().updateStaff(staffPO); - // 同步组织架构图编制信息 - //new StaffTriggerRunnable(staffPO).run(); return updateStaff; } @@ -189,12 +187,7 @@ public class StaffServiceImpl extends Service implements StaffService { public int deleteByIds(Collection ids) { HasRightUtil.hasRight(user, RIGHT_NAME, false); OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage())); - List staffsByIds = getStaffMapper().getStaffsByIds(ids); - int deleteByIds = getStaffMapper().deleteByIds(ids); - //for (StaffPO staffsById : staffsByIds) { - // new StaffTriggerRunnable(staffsById).run(); - //} - return deleteByIds; + return getStaffMapper().deleteByIds(ids); } @Override @@ -205,32 +198,31 @@ public class StaffServiceImpl extends Service implements StaffService { // 分部 - SearchConditionItem compIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "164", "ecCompany", ""); + SearchConditionItem compIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547332, "164", "ecCompany", ""); // 部门 - SearchConditionItem deptIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "4", "ecDepartment", ""); + SearchConditionItem deptIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547331, "4", "ecDepartment", ""); // 岗位 - SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位", "666", "jobId", ""); + SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547333, "666", "jobId", ""); // 编制数 - SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, "编制数", "staffNum"); + SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, 547345, "staffNum"); // 在编 - SearchConditionItem permanentNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, "在编", "permanentNum"); + SearchConditionItem permanentNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, 547346, "permanentNum"); // 冻结数 - SearchConditionItem freezeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, "冻结数", "freezeNum"); + SearchConditionItem freezeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, 547347, "freezeNum"); // 缺编状态 List selectOptions = new ArrayList<>(); - SearchConditionOption lackOption = new SearchConditionOption("1", "缺编"); - SearchConditionOption fullOption = new SearchConditionOption("2", "满员"); - SearchConditionOption overOption = new SearchConditionOption("3", "超编"); + SearchConditionOption lackOption = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547351,user.getLanguage())); + SearchConditionOption fullOption = new SearchConditionOption("2", SystemEnv.getHtmlLabelName(547350,user.getLanguage())); + SearchConditionOption overOption = new SearchConditionOption("3", SystemEnv.getHtmlLabelName(547352,user.getLanguage())); selectOptions.add(lackOption); selectOptions.add(fullOption); selectOptions.add(overOption); - SearchConditionItem lackStatusItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "缺编状态", "lackStatus"); + SearchConditionItem lackStatusItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547348, "lackStatus"); // 编制描述 - SearchConditionItem staffDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编制描述", "staffDesc"); + SearchConditionItem staffDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547349, "staffDesc"); // 说明 - SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description"); + SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547142, "description"); - //conditionItems.add(planIdItem); conditionItems.add(compIdItem); conditionItems.add(deptIdItem); conditionItems.add(jobIdItem); @@ -253,16 +245,16 @@ public class StaffServiceImpl extends Service implements StaffService { List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); // 方案 - SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "方案", "161", "planId", "staffPlanBrowser"); + SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547344, "161", "planId", "staffPlanBrowser"); planIdItem.setRules("required|string"); planIdItem.setIsQuickSearch(false); planIdItem.setEntSearch(false); // 分部 - SearchConditionItem ecCompanyItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "164", "ecCompany", "compBrowser"); + SearchConditionItem ecCompanyItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547332, "164", "ecCompany", "compBrowser"); // 部门 - SearchConditionItem ecDepartmentItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "4", "ecDepartment", "deptBrowser"); + SearchConditionItem ecDepartmentItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547331, "4", "ecDepartment", "deptBrowser"); // 岗位 - SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位", "666", "jobId", ""); + SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547333, "666", "jobId", ""); BrowserBean browserBean = jobIdItem.getBrowserConditionParam(); String s = JSONObject.toJSONString(browserBean); CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class); @@ -271,18 +263,18 @@ public class StaffServiceImpl extends Service implements StaffService { jobIdItem.setBrowserConditionParam(customBrowserBean); // 编制数 - SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "编制数", "staffNum"); + SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, 547345, "staffNum"); staffNumItem.setRules("required"); staffNumItem.setMin("0"); // 控制策略 List selectOptions = new ArrayList<>(); - SearchConditionOption option1 = new SearchConditionOption("1", "弱控"); - SearchConditionOption option2 = new SearchConditionOption("2", "强控"); - SearchConditionOption option3 = new SearchConditionOption("3", "不控"); + SearchConditionOption option1 = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547454,user.getLanguage())); + SearchConditionOption option2 = new SearchConditionOption("2", SystemEnv.getHtmlLabelName(547455,user.getLanguage())); + SearchConditionOption option3 = new SearchConditionOption("3", SystemEnv.getHtmlLabelName(547456,user.getLanguage())); selectOptions.add(option1); selectOptions.add(option2); selectOptions.add(option3); - SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "控制策略", "controlPolicy"); + SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547457, "controlPolicy"); controlPolicyItem.setViewAttr(3); controlPolicyItem.setValue("1"); controlPolicyItem.setRules("required|string"); @@ -340,11 +332,11 @@ public class StaffServiceImpl extends Service implements StaffService { item.setViewAttr(1); item.setRules(null); }); - SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "调整数量", "changeNum"); - changeNumItem.setHelpfulTip("提示:正数为增加，负数为减少编制数"); + SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, 547357, "changeNum"); + changeNumItem.setHelpfulTip(SystemEnv.getHtmlLabelName(547359,user.getLanguage())); staffNumItem.setRules("required"); selectItems.add(changeNumItem); - SearchConditionItem changeDescriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, "变更说明", "changeDescription"); + SearchConditionItem changeDescriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, 547358, "changeDescription"); selectItems.add(changeDescriptionItem); } @@ -363,9 +355,9 @@ public class StaffServiceImpl extends Service implements StaffService { List addGroups = new ArrayList<>(); List selectItems = new ArrayList<>(); // 方案 - SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, "编制方案", "162", "planId", "staffPlanBrowser"); + SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, 547459, "162", "planId", "staffPlanBrowser"); planIdItem.setRules("required|string"); - planIdItem.setHelpfulTip("请选择编制方案后查看数据"); + planIdItem.setHelpfulTip(SystemEnv.getHtmlLabelName(547343,user.getLanguage())); planIdItem.setLabelcol(2); selectItems.add(planIdItem); @@ -456,11 +448,11 @@ public class StaffServiceImpl extends Service implements StaffService { StaffPlanPO staffPlanByID = getStaffPlanMapper().getStaffPlanByID(staffPO.getPlanId()); switch (staffPlanByID.getControlDimension()) { case "1":// 分部 - OrganizationAssert.notNull(staffPO.getEcCompany(), "编制维度选择分部时，分部必填！"); + OrganizationAssert.notNull(staffPO.getEcCompany(), SystemEnv.getHtmlLabelName(547461,user.getLanguage())); staffPO.setCompId(staffPO.getEcCompany()); break; case "2":// 部门 - OrganizationAssert.notNull(staffPO.getEcDepartment(), "编制维度选择部门时，部门必填！"); + OrganizationAssert.notNull(staffPO.getEcDepartment(), SystemEnv.getHtmlLabelName(547460,user.getLanguage())); DepartmentPO jclDepartmentId = getDepartmentMapper().getDeptById(staffPO.getEcDepartment()); if (null != jclDepartmentId) { staffPO.setDeptId(jclDepartmentId.getId()); @@ -469,7 +461,7 @@ public class StaffServiceImpl extends Service implements StaffService { } break; case "3": // 岗位 - OrganizationAssert.notNull(staffPO.getJobId(), "编制维度选择岗位时，岗位必填！"); + OrganizationAssert.notNull(staffPO.getJobId(), SystemEnv.getHtmlLabelName(547462,user.getLanguage())); JobPO jobById = getJobMapper().getJobById(Long.valueOf(staffPO.getJobId())); if (null != jobById) { staffPO.setDeptId(jobById.getEcDepartment()); diff --git a/src/com/engine/organization/util/OrganizationFormItemUtil.java b/src/com/engine/organization/util/OrganizationFormItemUtil.java index a70ea337..b376dc95 100644 --- a/src/com/engine/organization/util/OrganizationFormItemUtil.java +++ b/src/com/engine/organization/util/OrganizationFormItemUtil.java @@ -101,6 +101,11 @@ public class OrganizationFormItemUtil { return inputnumber; } + public static SearchConditionItem inputNumberItem(User user, int colSpan, int fieldcol, + int viewAttr, int label, String name) { + return inputNumberItem(user,colSpan,fieldcol,viewAttr,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name); + } + /** * 输入框文本 @@ -322,6 +327,11 @@ public class OrganizationFormItemUtil { return datePicker; } + public static SearchConditionItem datePickerItem(User user, int colSpan, int fieldcol, boolean isQuickSearch, + int viewAttr, int label, String name) { + return datePickerItem(user,colSpan,fieldcol,isQuickSearch,viewAttr,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name); + } + public static SearchConditionItem dateGroupItem(User user, int colSpan, int fieldcol, boolean isQuickSearch, int viewAttr, String label, String name) {