liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '多语言支持' (#247) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/247
This commit is contained in:
dxfeng 2024-06-05 15:53:12 +08:00
parent 940838cc1d eed628b156
commit 0fba281b73
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java
View File

@ -61,7 +61,7 @@ public class StaffPlanTableVO {
/** /**
* 年度 * 年度
*/ */
@OrganizationTableColumn(labelId = 546937, text = "年度", width = "16%", column = "plan_year") @OrganizationTableColumn(labelId = 547336, text = "年度", width = "16%", column = "plan_year")
private Integer planYear; private Integer planYear;
/** /**
* 时间开始 * 时间开始

4
src/com/engine/organization/service/impl/StaffPlanServiceImpl.java
View File

@ -129,7 +129,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
// 名称 // 名称
SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "planName"); SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "planName");
// 年度 // 年度
SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 546937, "planYear"); SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547336, "planYear");
planYearItem.setFormat("YYYY"); planYearItem.setFormat("YYYY");
// 时间开始 // 时间开始
SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547337, "timeStart"); SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547337, "timeStart");
@ -174,7 +174,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547141, "planName"); SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547141, "planName");
planNameItem.setRules("required|string"); planNameItem.setRules("required|string");
// 年度 // 年度
SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 546937, "planYear"); SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 547336, "planYear");
planYearItem.setFormat("YYYY"); planYearItem.setFormat("YYYY");
planYearItem.setRules("required|string"); planYearItem.setRules("required|string");
// 时间开始 // 时间开始