聚才林岗位新增功能

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

@@ -196,10 +196,12 @@ public class JobServiceImpl extends Service implements JobService {
         // 批量删除
         topMenuList.add(MenuBtn.topMenu_batchDelete());
         topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
+        topMenuList.add(MenuBtn.topMenu_addNew());
         btnDatas.put("topMenu", topMenuList);
         // 日志
         rightMenuList.add(MenuBtn.rightMenu_btnLog());
         rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
+        rightMenuList.add(MenuBtn.rightMenu_addNew());
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
     }
@@ -340,10 +342,10 @@ public class JobServiceImpl extends Service implements JobService {
     public Long saveBaseForm(Map<String, Object> params) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class);
-        String jobNo = (String) params.get("job_no");
-        // 判断是否开启自动编号
-        jobNo = repeatDetermine(jobNo);
-        params.put("job_no", jobNo);
+        //String jobNo = (String) params.get("job_no");
+        //// 判断是否开启自动编号
+        //jobNo = repeatDetermine(jobNo);
+        //params.put("job_no", jobNo);
         params.put("is_key", null == searchParam.getIsKey() ? 0 : searchParam.getIsKey());
         if (null != searchParam.getParentJob()) {
             JobPO parentJob = getJobMapper().getJobById(searchParam.getParentJob());
@@ -363,6 +365,15 @@ public class JobServiceImpl extends Service implements JobService {
             }
             params.put("show_order", maxShowOrder + 1);
         }
+        // 判断岗位是否重复
+        ResourcePO build = ResourcePO.builder().subcompanyid1(Integer.parseInt(Util.null2String(params.get("ec_company")))).departmentid(Integer.parseInt(Util.null2String(params.get("ec_department")))).jobtitle(Integer.parseInt(Util.null2String(params.get("ec_jobTitle")))).build();
+        int count = getJobMapper().selectByConditions(build);
+        OrganizationAssert.isTrue(count <= 0, "已存在相同维度岗位,请勿重复添加");
+
+        String jobNo = (String) params.get("job_no");
+        // 判断是否开启自动编号
+        jobNo = repeatDetermine(jobNo);
+        params.put("job_no", jobNo);
         //params.put("jobactivityid", JOB_ACTIVITY_ID);
         //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.ADD, params).sync();
         return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null);
@@ -400,14 +411,7 @@ public class JobServiceImpl extends Service implements JobService {
                 params.put("ec_department", jclDepartment.getId());
                 params.put("ec_company", jclDepartment.getSubCompanyId1());
             }
-            //params.put("jobactivityid", JOB_ACTIVITY_ID);
-            //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, params, oldJobPO).sync();
             getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", searchParam.getId());
-
-            JobPO jobById = getJobMapper().getJobById(searchParam.getId());
-            //TODO new JobTriggerRunnable(oldJobPO, jobById).run();
-            // 更新人员关联字段
-            // updateResourceJob(jobById);
         }
         // 更新主表拓展表
         getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOBEXT, params, "", searchParam.getId());

src/com/engine/organization/wrapper/JobWrapper.java

@@ -110,10 +110,9 @@ public class JobWrapper extends OrganizationWrapper {
     @Log(operateType = OperateTypeEnum.ADD, operateModule = LogModuleNameEnum.JOB, operateDesc = "新增岗位")
     public Long saveBaseForm(Map<String, Object> params) {
         Long jobId = getJobService(user).saveBaseForm(params);
+        JobPO jobPO = getJobMapper().getJobById(jobId);
         writeOperateLog(new Object() {
-        }.getClass(), params.get("job_name").toString(), JSON.toJSONString(params), "新增岗位");
-        // 更新组织架构图
-        //TODO new Thread(new JobTriggerRunnable(jobId)).start();
+        }.getClass(), jobPO.getJobTitleName(), JSON.toJSONString(params), "新增岗位");
         return jobId;
     }