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

多语言支持

This commit is contained in:
dxfeng 2024-06-03 14:03:38 +08:00
parent c9b41c98e6
commit 0901dc28e2
8 changed files with 50 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/api/browser/service/impl/JobBrowserService.java
View File

@ -124,7 +124,7 @@ public class JobBrowserService extends BrowserService {
// 所属分部 // 所属分部
SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "ecCompany", ""); SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "ecCompany", "");
// 所属部门 // 所属部门
SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "ecDepartment", ""); SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547431, "4", "ecDepartment", "");
conditions.add(jobNoItem); conditions.add(jobNoItem);
conditions.add(jobNameItem); conditions.add(jobNameItem);

8
src/com/engine/organization/entity/job/dto/JobListDTO.java
View File

@ -49,19 +49,19 @@ public class JobListDTO {
/** /**
* 所属部门 * 所属部门
*/ */
@TableTitle(title = "所属部门", dataIndex = "departmentName", key = "departmentName") @TableTitle(labelId = 547431, title = "所属部门", dataIndex = "departmentName", key = "departmentName")
private String departmentName; private String departmentName;
/** /**
* 职务类别 * 职务类别
*/ */
@TableTitle(title = "职务类别", dataIndex = "jobGroupName", key = "jobGroupName") @TableTitle(labelId = 547433, title = "职务类别", dataIndex = "jobGroupName", key = "jobGroupName")
private String jobGroupName; private String jobGroupName;
/** /**
* 所属职务 * 所属职务
*/ */
@TableTitle(title = "所属职务", dataIndex = "jobActivityName", key = "jobActivityName") @TableTitle(labelId = 547434, title = "所属职务", dataIndex = "jobActivityName", key = "jobActivityName")
private String jobActivityName; private String jobActivityName;
/** /**
* 上级岗位 * 上级岗位
@ -74,7 +74,7 @@ public class JobListDTO {
/** /**
* 是否关键岗 * 是否关键岗
*/ */
@TableTitle(title = "是否关键岗", dataIndex = "isKey", key = "isKey") @TableTitle(labelId = 547417, title = "是否关键岗", dataIndex = "isKey", key = "isKey")
private String isKey; private String isKey;
/** /**

18
src/com/engine/organization/entity/logview/vo/LogViewVO.java
View File

@ -27,31 +27,31 @@ import java.util.Date;
) )
public class LogViewVO { public class LogViewVO {
@OrganizationTableColumn(text = "操作时间", width = "20%", column = "create_time", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getDateTimeFormat") @OrganizationTableColumn(labelId = 547159, text = "操作时间", width = "20%", column = "create_time", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getDateTimeFormat")
private Date createTime; private Date createTime;
@OrganizationTableColumn(text = "操作者", width = "16%", column = "operator_name") @OrganizationTableColumn(labelId = 547160, text = "操作者", width = "16%", column = "operator_name")
private String operator; private String operator;
@OrganizationTableColumn(text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType") @OrganizationTableColumn(labelId = 547161, text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType")
private String operateType; private String operateType;
@OrganizationTableColumn(text = "操作描述", width = "16%", column = "operate_desc") @OrganizationTableColumn(labelId = 547162, text = "操作描述", width = "16%", column = "operate_desc")
private String operateDesc; private String operateDesc;
@OrganizationTableColumn(text = "对象", width = "16%", column = "value") @OrganizationTableColumn(labelId = 547163, text = "对象", width = "16%", column = "value")
private String value; private String value;
@OrganizationTableColumn(text = "所属模块", width = "16%", column = "operate_module_name") @OrganizationTableColumn(labelId = 547164, text = "所属模块", width = "16%", column = "operate_module_name")
private String operateModuleName; private String operateModuleName;
@OrganizationTableColumn(text = "修改详情", width = "16%", column = "message") @OrganizationTableColumn(labelId = 547165, text = "修改详情", width = "16%", column = "message")
private String showDetail; private String showDetail;
@OrganizationTableColumn(text = "操作IP", width = "16%", column = "client_ip") @OrganizationTableColumn(labelId = 547166, text = "操作IP", width = "16%", column = "client_ip")
private String clientIp; private String clientIp;
@OrganizationTableColumn(text = "操作参数", width = "16%", column = "params_str", display = false) @OrganizationTableColumn(labelId = 547413, text = "操作参数", width = "16%", column = "params_str", display = false)
private String paramsStr; private String paramsStr;
} }

10
src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java
View File

@ -40,22 +40,22 @@ public class CardAccessVO {
@OrganizationTableColumn(column = "id", display = false) @OrganizationTableColumn(column = "id", display = false)
private Long id; private Long id;
@OrganizationTableColumn(text = "栏目", width = "15%", column = "type_name") @OrganizationTableColumn(labelId = 547389, text = "栏目", width = "15%", column = "type_name")
private Integer typeName; private Integer typeName;
@OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "15%", column = "status") @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "15%", column = "status")
private Integer status; private Integer status;
@OrganizationTableColumn(text = "所有人可见", width = "15%", column = "all_people") @OrganizationTableColumn(labelId = 547390, text = "所有人可见", width = "15%", column = "all_people")
private Integer allPeople; private Integer allPeople;
@OrganizationTableColumn(text = "上级可见", width = "15%", column = "superior") @OrganizationTableColumn(labelId = 547392, text = "上级可见", width = "15%", column = "superior")
private Integer superior; private Integer superior;
@OrganizationTableColumn(text = "所有上级可见", width = "15%", column = "all_superior") @OrganizationTableColumn(labelId = 547392, text = "所有上级可见", width = "15%", column = "all_superior")
private Integer allSuperior; private Integer allSuperior;
@OrganizationTableColumn(text = "查看自定义", width = "30%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName") @OrganizationTableColumn(labelId = 547414, text = "查看自定义", width = "30%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName")
private String custom; private String custom;
} }

6
src/com/engine/organization/service/impl/CardAccessServiceImpl.java
View File

@ -102,10 +102,10 @@ public class CardAccessServiceImpl extends Service implements CardAccessService
@Override @Override
public Map<String, Object> getCardButtonTable() { public Map<String, Object> getCardButtonTable() {
List<ExtendInfoPO> infoPOList = new ArrayList<>(); List<ExtendInfoPO> infoPOList = new ArrayList<>();
infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc("按钮名称").fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build()); infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc(SystemEnv.getHtmlLabelName(547386,user.getLanguage())).fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build());
infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("status").fieldNameDesc(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).fieldType("char(1)").controlType(7).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build()); infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("status").fieldNameDesc(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).fieldType("char(1)").controlType(7).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build());
infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("url").fieldNameDesc("跳转地址").fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build()); infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("url").fieldNameDesc(SystemEnv.getHtmlLabelName(547387,user.getLanguage())).fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build());
infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("roles").fieldNameDesc("角色").fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build()); infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("roles").fieldNameDesc(SystemEnv.getHtmlLabelName(547388,user.getLanguage())).fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build());
Map<String, Object> tabInfoMap = new HashMap<>(); Map<String, Object> tabInfoMap = new HashMap<>();
tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, 2, false, true)); tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, 2, false, true));

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

@ -205,12 +205,12 @@ public class JobServiceImpl extends Service implements JobService {
int userLanguage = user.getLanguage(); int userLanguage = user.getLanguage();
// 批量删除 // 批量删除
topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage)); topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build()); topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName(SystemEnv.getHtmlLabelName(547432,userLanguage)).type("BTN_REFRESH").build());
topMenuList.add(MenuBtn.topMenu_addNew(userLanguage)); topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
btnDatas.put("topMenu", topMenuList); btnDatas.put("topMenu", topMenuList);
// 日志 // 日志
rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage)); rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build()); rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName(SystemEnv.getHtmlLabelName(547432,userLanguage)).type("BTN_REFRESH").build());
rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage)); rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
btnDatas.put("rightMenu", rightMenuList); btnDatas.put("rightMenu", rightMenuList);
return btnDatas; return btnDatas;
@ -228,23 +228,16 @@ public class JobServiceImpl extends Service implements JobService {
// 所属分部 // 所属分部
SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "subcompanyid1", ""); SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "subcompanyid1", "");
// 所属部门 // 所属部门
SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "departmentid", ""); SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547431, "4", "departmentid", "");
// 是否关键岗 // 是否关键岗
List<SearchConditionOption> isKeyOptions = new ArrayList<>(); List<SearchConditionOption> isKeyOptions = new ArrayList<>();
SearchConditionOption yesOption = new SearchConditionOption("0", "否"); SearchConditionOption yesOption = new SearchConditionOption("0", SystemEnv.getHtmlLabelName(547419,user.getLanguage()));
SearchConditionOption noOption = new SearchConditionOption("1", "是"); SearchConditionOption noOption = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547420,user.getLanguage()));
isKeyOptions.add(yesOption); isKeyOptions.add(yesOption);
isKeyOptions.add(noOption); isKeyOptions.add(noOption);
SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "isKey"); SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, 547417, "isKey");
// 工作地点 // 工作地点
SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "工作地点", "workplace"); SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547418, "workplace");
// 禁用标记
//List<SearchConditionOption> selectOptions = new ArrayList<>();
//SearchConditionOption enableOption = new SearchConditionOption("true", "启用");
//SearchConditionOption disableOption = new SearchConditionOption("false", "封存");
//selectOptions.add(enableOption);
//selectOptions.add(disableOption);
//SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "封存", "forbiddenTag");
conditionItems.add(jobNoItem); conditionItems.add(jobNoItem);
conditionItems.add(jobTitleNameItem); conditionItems.add(jobTitleNameItem);
@ -252,7 +245,6 @@ public class JobServiceImpl extends Service implements JobService {
conditionItems.add(parentDeptBrowserItem); conditionItems.add(parentDeptBrowserItem);
conditionItems.add(isKeyItem); conditionItems.add(isKeyItem);
conditionItems.add(workplaceItem); conditionItems.add(workplaceItem);
//conditionItems.add(forbiddenTagItem);
addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems)); addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
apiDatas.put("conditions", addGroups); apiDatas.put("conditions", addGroups);
@ -361,10 +353,6 @@ public class JobServiceImpl extends Service implements JobService {
public Long saveBaseForm(Map<String, Object> params) { public Long saveBaseForm(Map<String, Object> params) {
HasRightUtil.hasRight(user, RIGHT_NAME, false); HasRightUtil.hasRight(user, RIGHT_NAME, false);
JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class); JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class);
//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()); params.put("is_key", null == searchParam.getIsKey() ? 0 : searchParam.getIsKey());
if (null != searchParam.getParentJob()) { if (null != searchParam.getParentJob()) {
JobPO parentJob = getJobMapper().getJobById(searchParam.getParentJob()); JobPO parentJob = getJobMapper().getJobById(searchParam.getParentJob());
@ -387,14 +375,12 @@ public class JobServiceImpl extends Service implements JobService {
// 判断岗位是否重复 // 判断岗位是否重复
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(); 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); int count = getJobMapper().selectByConditions(build);
OrganizationAssert.isTrue(count <= 0, "已存在相同维度岗位,请勿重复添加"); OrganizationAssert.isTrue(count <= 0, SystemEnv.getHtmlLabelName(547421,user.getLanguage()));
String jobNo = (String) params.get("job_no"); String jobNo = (String) params.get("job_no");
// 判断是否开启自动编号 // 判断是否开启自动编号
jobNo = repeatDetermine(jobNo); jobNo = repeatDetermine(jobNo);
params.put("job_no", 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); return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null);
} }
@ -407,7 +393,7 @@ public class JobServiceImpl extends Service implements JobService {
// 上级岗位不能选择本身 // 上级岗位不能选择本身
String parent_job = Util.null2String(params.get("parent_job")); String parent_job = Util.null2String(params.get("parent_job"));
if (StringUtils.isNotBlank(parent_job)) { if (StringUtils.isNotBlank(parent_job)) {
OrganizationAssert.isFalse(parent_job.equals(searchParam.getId().toString()), "上级岗位不能选择本身"); OrganizationAssert.isFalse(parent_job.equals(searchParam.getId().toString()), SystemEnv.getHtmlLabelName(547422,user.getLanguage()));
} }
if ("0".equals(groupId) || GROUP_ID.toString().equals(groupId)) { if ("0".equals(groupId) || GROUP_ID.toString().equals(groupId)) {
JobPO oldJobPO = getJobMapper().getJobById(searchParam.getId()); JobPO oldJobPO = getJobMapper().getJobById(searchParam.getId());
@ -443,7 +429,7 @@ public class JobServiceImpl extends Service implements JobService {
@Override @Override
public int copyJobItem(String ids, String department) { public int copyJobItem(String ids, String department) {
HasRightUtil.hasRight(user, RIGHT_NAME, false); HasRightUtil.hasRight(user, RIGHT_NAME, false);
OrganizationAssert.notBlank(department, "请指定需要复制的部门"); OrganizationAssert.notBlank(department, SystemEnv.getHtmlLabelName(547423,user.getLanguage()));
int insertCount = 0; int insertCount = 0;
List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
Integer orderNum = getJobMapper().getMaxShowOrder(); Integer orderNum = getJobMapper().getMaxShowOrder();
@ -464,8 +450,6 @@ public class JobServiceImpl extends Service implements JobService {
jobById.setParentJob(null); jobById.setParentJob(null);
jobById.setShowOrder(orderNum); jobById.setShowOrder(orderNum);
insertCount += getJobMapper().insertIgnoreNull(jobById); insertCount += getJobMapper().insertIgnoreNull(jobById);
// 更新组织架构图
// new JobTriggerRunnable(jobById.getId()).run();
} }
return insertCount; return insertCount;
@ -479,20 +463,16 @@ public class JobServiceImpl extends Service implements JobService {
if (params.getForbiddenTag()) { if (params.getForbiddenTag()) {
// 启用：判断上级部门是否启用，上级部门启用，岗位才可启用 // 启用：判断上级部门是否启用，上级部门启用，岗位才可启用
DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(jobById.getEcDepartment()); DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(jobById.getEcDepartment());
OrganizationAssert.isTrue(0 == parentDepartment.getCanceled(), "该岗位不能解封，请先解封上级部门"); OrganizationAssert.isTrue(0 == parentDepartment.getCanceled(), SystemEnv.getHtmlLabelName(547424,user.getLanguage()));
// 启用：判断上级岗位是否启用，上级岗位启用，岗位才可启用 // 启用：判断上级岗位是否启用，上级岗位启用，岗位才可启用
if (null != jobById.getParentJob()) { if (null != jobById.getParentJob()) {
JobPO parentJob = getJobMapper().getJobById(jobById.getParentJob()); JobPO parentJob = getJobMapper().getJobById(jobById.getParentJob());
OrganizationAssert.isTrue(0 == parentJob.getForbiddenTag(), "该岗位不能解封，请先解封上级岗位"); OrganizationAssert.isTrue(0 == parentJob.getForbiddenTag(), SystemEnv.getHtmlLabelName(547436,user.getLanguage()));
} }
} else { } else {
//禁用：判断当前岗位下是否有人员，如有人员则不能禁用 throw new OrganizationRunTimeException(SystemEnv.getHtmlLabelName(547425,user.getLanguage()));
// int hasResource = getJobMapper().isHasResource(params.getId());
// OrganizationAssert.isTrue(hasResource == 0, "该岗位存在人员，不能封存");
throw new OrganizationRunTimeException("该岗位不能封存");
} }
//new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobPO).sync();
return getJobMapper().updateForbiddenTagById(jobPO.getId(), jobPO.getForbiddenTag()); return getJobMapper().updateForbiddenTagById(jobPO.getId(), jobPO.getForbiddenTag());
} }
@ -504,10 +484,8 @@ public class JobServiceImpl extends Service implements JobService {
for (JobPO jobsById : jobsByIds) { for (JobPO jobsById : jobsByIds) {
// 判断是否可以删除 // 判断是否可以删除
List<String> allowDelete = getJobMapper().isAllowDelete(jobsById.getId()); List<String> allowDelete = getJobMapper().isAllowDelete(jobsById.getId());
OrganizationAssert.isTrue(CollectionUtils.isEmpty(allowDelete), "该岗位存在引用，不允许删除"); OrganizationAssert.isTrue(CollectionUtils.isEmpty(allowDelete), SystemEnv.getHtmlLabelName(547426,user.getLanguage()));
// jobsById.setForbiddenTag(1);
//new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobsById).sync();
// 删除拓展表、明细表 // 删除拓展表、明细表
MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_jobext", jobsById.getId()); MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_jobext", jobsById.getId());
MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_jobext_dt1", jobsById.getId(), null); MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_jobext_dt1", jobsById.getId(), null);
@ -538,7 +516,7 @@ public class JobServiceImpl extends Service implements JobService {
public List<SearchConditionGroup> getMergeForm(Long id) { public List<SearchConditionGroup> getMergeForm(Long id) {
List<SearchConditionGroup> addGroups = new ArrayList<>(); List<SearchConditionGroup> addGroups = new ArrayList<>();
List<SearchConditionItem> condition = new ArrayList<>(); List<SearchConditionItem> condition = new ArrayList<>();
SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到岗位", "666", "targetJob", ""); SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547427, "666", "targetJob", "");
deptBrowserItem.setRules("required"); deptBrowserItem.setRules("required");
BrowserBean browserBean = deptBrowserItem.getBrowserConditionParam(); BrowserBean browserBean = deptBrowserItem.getBrowserConditionParam();
String s = JSONObject.toJSONString(browserBean); String s = JSONObject.toJSONString(browserBean);
@ -558,8 +536,8 @@ public class JobServiceImpl extends Service implements JobService {
public int mergeJob(JobMergeParam mergeParam) { public int mergeJob(JobMergeParam mergeParam) {
HasRightUtil.hasRight(user, RIGHT_NAME, false); HasRightUtil.hasRight(user, RIGHT_NAME, false);
int updateCount = 0; int updateCount = 0;
OrganizationAssert.notNull(mergeParam.getTargetJob(), "请选择需要合并的岗位"); OrganizationAssert.notNull(mergeParam.getTargetJob(), SystemEnv.getHtmlLabelName(547428,user.getLanguage()));
OrganizationAssert.notBlank(mergeParam.getMergeName(), "请输入合并后的名称"); OrganizationAssert.notBlank(mergeParam.getMergeName(), SystemEnv.getHtmlLabelName(547270,user.getLanguage()));
// 不可选择岗位本身、以及子岗位 // 不可选择岗位本身、以及子岗位
Set<Long> disableIds = new HashSet<>(); Set<Long> disableIds = new HashSet<>();
@ -569,7 +547,7 @@ public class JobServiceImpl extends Service implements JobService {
if (CollectionUtils.isNotEmpty(jobs)) { if (CollectionUtils.isNotEmpty(jobs)) {
addDisableIds(disableIds, jobs); addDisableIds(disableIds, jobs);
} }
OrganizationAssert.isFalse(disableIds.contains(mergeParam.getTargetJob()), "请勿选择当前岗位本身及其子岗位"); OrganizationAssert.isFalse(disableIds.contains(mergeParam.getTargetJob()), SystemEnv.getHtmlLabelName(547429,user.getLanguage()));
// 合并到的岗位 // 合并到的岗位
JobPO targetJob = getJobMapper().getJobById(mergeParam.getTargetJob()); JobPO targetJob = getJobMapper().getJobById(mergeParam.getTargetJob());
@ -580,20 +558,8 @@ public class JobServiceImpl extends Service implements JobService {
// 递归处理子岗位所属分部、所部部门、上级岗位 // 递归处理子岗位所属分部、所部部门、上级岗位
recursionMergeJob(jobs, targetJob.getEcCompany(), targetJob.getEcDepartment(), targetJob.getId()); recursionMergeJob(jobs, targetJob.getEcCompany(), targetJob.getEcDepartment(), targetJob.getId());
// 人员信息变动，更新分部、部门、岗位
// updateResourceJob(jobById, targetJob);
// 更新合并后的岗位，更新组织架构图
// updateEcJob(targetJob, mergeParam.getMergeName());
// targetJob.setJobName(mergeParam.getMergeName());
getJobMapper().updateBaseJob(targetJob); getJobMapper().updateBaseJob(targetJob);
// new JobTriggerRunnable(jobById.getId(), targetJob.getId()).run();
// 原岗位删除
//new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobById).sync();
getJobMapper().deleteByIds(Collections.singletonList(jobById.getId())); getJobMapper().deleteByIds(Collections.singletonList(jobById.getId()));
// 更新组织架构图
// new JobTriggerRunnable(jobById).run();
return updateCount; return updateCount;
} }
@ -630,10 +596,6 @@ public class JobServiceImpl extends Service implements JobService {
job.setEcDepartment(ecDepartment); job.setEcDepartment(ecDepartment);
job.setParentJob(parentJob); job.setParentJob(parentJob);
getJobMapper().updateBaseJob(job); getJobMapper().updateBaseJob(job);
// 更新人员信息
// updateResourceJob(job);
// 更新组织架构图
// new JobTriggerRunnable(job.getId()).run();
// 递归处理子级元素 // 递归处理子级元素
List<JobPO> jobsByPid = getJobMapper().getJobsByPid(job.getId()); List<JobPO> jobsByPid = getJobMapper().getJobsByPid(job.getId());
@ -779,7 +741,7 @@ public class JobServiceImpl extends Service implements JobService {
OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage())); OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
} else { } else {
OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空"); OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), SystemEnv.getHtmlLabelName(547430,user.getLanguage()));
jobNo = autoCreateCompanyNo(); jobNo = autoCreateCompanyNo();
} }
return jobNo; return jobNo;
@ -813,19 +775,4 @@ public class JobServiceImpl extends Service implements JobService {
} }
} }
///**
// * 更新EC岗位
// *
// * @param jobPO
// */
//private void updateEcJob(JobPO jobPO, String newName) {
// Map<String, Object> params = new HashMap<>();
// params.put("job_name", newName);
// params.put("jobactivityid", JOB_ACTIVITY_ID);
// params.put("work_duty", jobPO.getWorkDuty());
// params.put("work_authority", jobPO.getWorkAuthority());
// params.put("description", jobPO.getDescription());
// params.put("job_no", jobPO.getJobNo());
// new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, params, jobPO).sync();
//}
} }

8
src/com/engine/organization/service/impl/LogViewServiceImpl.java
View File

@ -44,14 +44,14 @@ public class LogViewServiceImpl extends Service implements LogViewService {
List<SearchConditionItem> conditionItems = new ArrayList<>(); List<SearchConditionItem> conditionItems = new ArrayList<>();
// 操作者 // 操作者
SearchConditionItem operatorId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者", "1", "operatorId", ""); SearchConditionItem operatorId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547160, "1", "operatorId", "");
//操作时间 //操作时间
SearchConditionItem dateItem = OrganizationFormItemUtil.dateItem(user,2,16,true,2,"操作时间","operateDate"); SearchConditionItem dateItem = OrganizationFormItemUtil.dateItem(user,2,16,true,2,547159,"operateDate");
// 操作者部门 // 操作者部门
SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者部门", "4", "departmentId", ""); SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547167, "4", "departmentId", "");
// 操作者分部 // 操作者分部
SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者分部", "164", "companyId", ""); SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547168, "164", "companyId", "");
conditionItems.add(operatorId); conditionItems.add(operatorId);
conditionItems.add(dateItem); conditionItems.add(dateItem);

5
src/com/engine/organization/util/OrganizationFormItemUtil.java
View File

@ -295,6 +295,11 @@ public class OrganizationFormItemUtil {
return date; return date;
} }
public static SearchConditionItem dateItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
int viewAttr, int label, String name) {
return dateItem(user,colSpan,fieldcol,isQuickSearch,viewAttr,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name);
}
/** /**
* @param user * @param user
* @param colSpan * @param colSpan