Pre Merge pull request !24 from dxfeng/feature/dxf

src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java

@@ -27,7 +27,8 @@ import java.util.Date;
         primarykey = "id",
         operates = {
                 @OrganizationTableOperate(index = "0", text = "编辑"),
-                @OrganizationTableOperate(index = "1", text = "删除")
+                @OrganizationTableOperate(index = "1", text = "删除"),
+                @OrganizationTableOperate(index = "2", text = "发起编制流程")
         }
 )
 public class StaffPlanTableVO {
@@ -35,6 +36,7 @@ public class StaffPlanTableVO {
     /**
      * 主键
      */
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     /**
      * 编号

src/com/engine/organization/entity/staff/vo/StaffTableVO.java

@@ -33,6 +33,7 @@ public class StaffTableVO {
     /**
      * 主键
      */
+    @OrganizationTableColumn(column = "id", display = false)
     private Long id;
     /**
      * 方案id

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

@@ -91,7 +91,7 @@ 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, "年度", "179", "planYear", "");
+        SearchConditionItem planYearItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "年度", "402", "planYear", "");
         // 时间开始
         SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "时间开始", "timeStart");
         // 时间结束
@@ -134,7 +134,7 @@ 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, "年度", "178", "planYear", "");
+        SearchConditionItem planYearItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "年度", "402", "planYear", "");
         planYearItem.setRules("required|string");
         // 时间开始
         SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间开始", "timeStart");
@@ -143,7 +143,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间结束", "timeEnd");
         timeEndItem.setRules("required|string");
         // 适用公司
-        SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "companyId", "162", "planYear", "compBrowser");
+        SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "适用公司", "162", "companyId", "compBrowser");
         companyIdtItem.setRules("required|string");
         // 说明
         SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description");

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

@@ -51,6 +51,9 @@ public class StaffServiceImpl extends Service implements StaffService {
     private DepartmentMapper getDepartmentMapper() {
         return MapperProxyFactory.getProxy(DepartmentMapper.class);
     }
+    //private JobMapper getJobMapper() {
+    //    return MapperProxyFactory.getProxy(JobMapper.class);
+    //}
 
 
     @Override
@@ -91,13 +94,13 @@ public class StaffServiceImpl extends Service implements StaffService {
         List<SearchConditionItem> conditionItems = new ArrayList<>();
 
         // 方案
-        SearchConditionItem planIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "方案", "161", "planId", "staffPlanBrowser");
+        SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "方案", "161", "planId", "staffPlanBrowser");
         // 分部
-        SearchConditionItem compIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "161", "compId", "compBrowser");
+        SearchConditionItem compIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "161", "compId", "compBrowser");
         // 部门
-        SearchConditionItem deptIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "161", "deptId", "deptBrowser");
+        SearchConditionItem deptIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "161", "deptId", "deptBrowser");
         // 岗位
-        SearchConditionItem jobIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位", "161", "jobId", "jobBrowser");
+        SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位", "161", "jobId", "jobBrowser");
         // 编制数
         SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, "编制数", "staffNum");
         // 在编
@@ -117,10 +120,11 @@ public class StaffServiceImpl extends Service implements StaffService {
         SearchConditionItem staffDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编制描述", "staffDesc");
         // 说明
         SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description");
-        conditionItems.add(planIdtItem);
-        conditionItems.add(compIdtItem);
-        conditionItems.add(deptIdtItem);
-        conditionItems.add(jobIdtItem);
+
+        conditionItems.add(planIdItem);
+        conditionItems.add(compIdItem);
+        conditionItems.add(deptIdItem);
+        conditionItems.add(jobIdItem);
         conditionItems.add(staffNumItem);
         conditionItems.add(permanentNumItem);
         conditionItems.add(freezeNumItem);
@@ -172,12 +176,34 @@ public class StaffServiceImpl extends Service implements StaffService {
             OrganizationAssert.notNull(staffPO, "选择的数据不存在，或数据已删除");
 
             BrowserBean planIdItemBean = planIdItem.getBrowserConditionParam();
-            List<Map<String, Object>> maps = getStaffPlanMapper().listPlansByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds());
-            planIdItemBean.setReplaceDatas(maps);
+            List<Map<String, Object>> planIdMaps = getStaffPlanMapper().listPlansByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds());
+            planIdItemBean.setReplaceDatas(planIdMaps);
             planIdItem.setBrowserConditionParam(planIdItemBean);
 
+            BrowserBean compIdItemBean = compIdItem.getBrowserConditionParam();
+            List<Map<String, Object>> compIdMaps = getCompMapper().listCompsByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds());
+            compIdItemBean.setReplaceDatas(compIdMaps);
+            compIdItem.setBrowserConditionParam(compIdItemBean);
+
+            BrowserBean deptIdItemBean = deptIdItem.getBrowserConditionParam();
+            List<Map<String, Object>> deptIdMaps = getDepartmentMapper().listDeptsByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds());
+            deptIdItemBean.setReplaceDatas(deptIdMaps);
+            deptIdItem.setBrowserConditionParam(deptIdItemBean);
+            // TODO
+            //BrowserBean jobIdItemBean = jobIdItem.getBrowserConditionParam();
+            //List<Map<String, Object>> jobIdMaps = getJobMapper().listJobsByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds());
+            //jobIdItemBean.setReplaceDatas(jobIdMaps);
+            //jobIdItem.setBrowserConditionParam(jobIdItemBean);
 
+            staffNumItem.setValue(staffPO.getStaffNum());
+            controlPolicyItem.setValue(staffPO.getControlPolicy());
         }
+        selectItems.add(planIdItem);
+        selectItems.add(compIdItem);
+        selectItems.add(deptIdItem);
+        selectItems.add(jobIdItem);
+        selectItems.add(staffNumItem);
+        selectItems.add(controlPolicyItem);
 
         addGroups.add(new SearchConditionGroup("基本信息", true, selectItems));
         apiDatas.put("condition", addGroups);