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

编制导入

This commit is contained in:
dxfeng 2022-09-15 18:31:11 +08:00
parent 5522cb7058
commit 16fcd76468
6 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/orgimport/service/OrgImportAdapter.java → src/com/engine/organization/enums/OrgImportAdapter.java
View File

@ -1,4 +1,4 @@
package com.orgimport.service;
package com.engine.organization.enums;
import weaver.hrm.User;

6
src/com/orgimport/service/OrgImportEnum.java → src/com/engine/organization/enums/OrgImportEnum.java
View File

@ -1,7 +1,7 @@
package com.orgimport.service;
package com.engine.organization.enums;
import com.engine.organization.exception.OrganizationRunTimeException;
import com.orgimport.service.action.StaffInfoImportUtil;
import com.engine.organization.util.saveimport.StaffInfoImportUtil;
import weaver.hrm.User;
import java.util.HashMap;
@ -14,7 +14,7 @@ import java.util.Map;
* @version: 1.0
*/
public enum OrgImportEnum implements OrgImportAdapter {
STAFF("staff_info") {
STAFF("staff") {
@Override
public Map<String, Object> orgImport(Map<String, Object> params, User user) {
Map<String, Object> resultMap = new HashMap<>();

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

@ -42,7 +42,7 @@ import com.engine.organization.util.excel.ExcelUtil;
import com.engine.organization.util.relation.EcHrmRelationUtil;
import com.engine.organization.util.saveimport.hrmimport.HrmImportAdaptExcelE9;
import com.engine.organization.util.saveimport.hrmimport.HrmImportProcessE9;
import com.orgimport.service.OrgImportEnum;
import com.engine.organization.enums.OrgImportEnum;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.xssf.usermodel.XSSFCell;
@ -1181,7 +1181,7 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
map.put("update_time", new Date());
map.put("jobactivityid", JobServiceImpl.JOB_ACTIVITY_ID);
map.put("id", jobId);
Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, map, false).sync();
Map<String, Object> syncMap = new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, map, MapperProxyFactory.getProxy(JobMapper.class).getJobById(jobId), false).sync();
if (isThrowError(syncMap)) {
map.remove("id");
map.remove("jobactivityid");

14
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.engine.organization.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.api.browser.bean.BrowserBean;
import com.api.browser.bean.SearchConditionGroup;
import com.api.browser.bean.SearchConditionItem;
import com.api.browser.bean.SearchConditionOption;
@ -11,6 +12,7 @@ import com.engine.core.impl.Service;
import com.engine.hrm.entity.RuleCodeType;
import com.engine.organization.component.OrganizationWeaTable;
import com.engine.organization.entity.DeleteParam;
import com.engine.organization.entity.browser.po.CustomBrowserBean;
import com.engine.organization.entity.codesetting.po.CodeRulePO;
import com.engine.organization.entity.commom.RecordInfo;
import com.engine.organization.entity.company.bo.CompBO;
@ -215,6 +217,12 @@ public class JobServiceImpl extends Service implements JobService {
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
// 上级岗位
SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "666", "parentJob", "");
BrowserBean browserBean = parentJobBrowserItem.getBrowserConditionParam();
String s = JSONObject.toJSONString(browserBean);
CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class);
customBrowserBean.setHasLeftTree(true);
customBrowserBean.setLeftToSearchKey("treeKey");
parentJobBrowserItem.setBrowserConditionParam(customBrowserBean);
// 是否关键岗
List<SearchConditionOption> isKeyOptions = new ArrayList<>();
SearchConditionOption yesOption = new SearchConditionOption("0", "否");
@ -484,6 +492,12 @@ public class JobServiceImpl extends Service implements JobService {
List<SearchConditionItem> condition = new ArrayList<>();
SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到岗位", "666", "targetJob", "");
deptBrowserItem.setRules("required");
BrowserBean browserBean = deptBrowserItem.getBrowserConditionParam();
String s = JSONObject.toJSONString(browserBean);
CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class);
customBrowserBean.setHasLeftTree(true);
customBrowserBean.setLeftToSearchKey("treeKey");
deptBrowserItem.setBrowserConditionParam(customBrowserBean);
SearchConditionItem mergeNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "合并后名称", "mergeName");
mergeNameItem.setRules("required|string");
JobPO jobById = getJobMapper().getJobById(id);

8
src/com/engine/organization/thread/OrganizationSyncEc.java
View File

@ -67,6 +67,14 @@ public class OrganizationSyncEc {
this.user = user;
this.oldJobPO = oldJobPO;
}
public OrganizationSyncEc(User user, LogModuleNameEnum moduleName, OperateTypeEnum operateType, Map<String, Object> params, JobPO oldJobPO, boolean throwException) {
this.moduleName = moduleName;
this.operateType = operateType;
this.params = params;
this.user = user;
this.oldJobPO = oldJobPO;
this.throwException = throwException;
}
public Map<String, Object> sync() {
switch (moduleName) {

3
src/com/orgimport/service/action/StaffInfoImportUtil.java → src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
View File

@ -1,4 +1,4 @@
package com.orgimport.service.action;
package com.engine.organization.util.saveimport;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@ -19,7 +19,6 @@ import com.engine.organization.mapper.staff.StaffPlanMapper;
import com.engine.organization.util.OrganizationAssert;
import com.engine.organization.util.db.MapperProxyFactory;
import com.engine.organization.util.relation.EcHrmRelationUtil;
import com.engine.organization.util.saveimport.OrgImportUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.usermodel.XSSFCell;