!35 岗位表单更改

Merge pull request !35 from dxfeng/feature/dxf

src/com/engine/organization/entity/company/dto/CompListDTO.java

@@ -9,7 +9,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -95,9 +94,4 @@ public class CompListDTO {
      * 子节点
      */
     private List<CompListDTO> children;
-
-    private Long creator;
-    private int deleteType;
-    private Date createTime;
-    private Date updateTime;
 }

src/com/engine/organization/entity/department/dto/DepartmentListDTO.java

@@ -90,7 +90,11 @@ public class DepartmentListDTO {
      */
     @TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag")
     private int forbiddenTag;
-
+    /**
+     * 操作列
+     */
+    @TableTitle(title = "", dataIndex = "operate", key = "operate")
+    private String operate;
     /**
      * 子节点
      */

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

@@ -293,7 +293,7 @@ public class JobServiceImpl extends Service implements JobService {
         isKeyOptions.add(yesOption);
         isKeyOptions.add(noOption);
         SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "forbiddenTag");
-        isKeyItem.setDetailtype(2);
+        isKeyItem.setDetailtype(3);
 
         conditionItems.add(jobNoItem);
         conditionItems.add(jobNameItem);
@@ -349,6 +349,7 @@ public class JobServiceImpl extends Service implements JobService {
         List<JobPO> list = getJobMapper().listByNo(Util.null2String(params.getJobNo()));
         OrganizationAssert.isEmpty(list, "编号不允许重复");
         JobPO jobPO = JobBO.convertParamsToPO(params, (long) user.getUID());
+        // 设置对应的等级方案
         return getJobMapper().insertIgnoreNull(jobPO);
     }
 
@@ -617,7 +618,7 @@ public class JobServiceImpl extends Service implements JobService {
         // 岗位序列
         SearchConditionItem sequenceBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位序列", "161", "sequenceId", "sequenceBrowser");
         // 等级方案
-        SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
+        SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 1, false, "等级方案", "161", "schemeId", "schemeBrowser");
         // 上级岗位
         SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "161", "parentJob", "jobBrowser");
         // 是否关键岗
@@ -627,6 +628,7 @@ public class JobServiceImpl extends Service implements JobService {
         isKeyOptions.add(yesOption);
         isKeyOptions.add(noOption);
         SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "禁用标记", "forbiddenTag");
+        isKeyItem.setDetailtype(3);
         // 工作地点
         SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "工作地点", "workplace");
         // 工作概述