!25 编制方案 年度字段优化

Merge pull request !25 from dxfeng/feature/dxf

src/com/engine/organization/service/impl/StaffPlanServiceImpl.java

@@ -91,7 +91,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         // 名称
         SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "planName");
         // 年度
-        SearchConditionItem planYearItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "年度", "402", "planYear", "");
+        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "年度", "planYear");
+        planYearItem.setFormat("YYYY");
         // 时间开始
         SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "时间开始", "timeStart");
         // 时间结束
@@ -134,7 +135,8 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "名称", "planName");
         planNameItem.setRules("required|string");
         // 年度
-        SearchConditionItem planYearItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "年度", "402", "planYear", "");
+        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "年度", "planYear");
+        planYearItem.setFormat("YYYY");
         planYearItem.setRules("required|string");
         // 时间开始
         SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间开始", "timeStart");
@@ -160,7 +162,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
             timeEndItem.setValue(staffPlanPO.getTimeEnd());
 
             BrowserBean browserBean = companyIdtItem.getBrowserConditionParam();
-            List<Map<String, Object>> maps = getCompMapper().listCompsByIds(QueryParam.builder().ids(staffPlanPO.getCompanyId().toString()).build().getIds());
+            List<Map<String, Object>> maps = getCompMapper().listCompsByIds(QueryParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds());
             browserBean.setReplaceDatas(maps);
             companyIdtItem.setBrowserConditionParam(browserBean);