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

岗位编号增加部门id拼接

This commit is contained in:
Chengliang 2024-08-26 09:29:55 +08:00
parent 19f8cefe8a
commit a939a6f222
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,9 @@ public class FunctionOutStaffServiceImpl {
private Integer frozenStaffNums(StaffOutParam param) {
StaffPO staffPO = select(param);
OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
if (param.getNum() < 0) {
OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
}
List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
//1.增加冻结数 （num为负数时为减少冻结数）

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

@ -55,6 +55,7 @@ import org.apache.commons.lang.StringUtils;
import weaver.general.StringUtil;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.job.JobTitlesComInfo;
import weaver.systeminfo.SystemEnv;
import java.util.*;
@ -565,6 +566,7 @@ public class JobServiceImpl extends Service implements JobService {
@Override
public void refresh() {
JobTitlesComInfo jb = new JobTitlesComInfo();
// 解决并发情况下，岗位数据重复问题
synchronized (JobServiceImpl.class) {
//1.人员表查询
@ -582,6 +584,10 @@ public class JobServiceImpl extends Service implements JobService {
.createTime(new Date())
.updateTime(new Date())
.build();
String jobTitlescode = jb.getJobTitlescode(String.valueOf(resourcePO.getJobtitle()));
if (!"".equals(jobTitlescode)) {
jobPO.setJobNo(jobTitlescode+"-"+resourcePO.getDepartmentid());
}
getJobMapper().insertIgnoreNull(jobPO);
}
});