人员报送非正常自动添加离职日期
This commit is contained in:
parent
0ed411c532
commit
ec2d5f6a36
|
|
@ -37,6 +37,7 @@ import com.weaver.util.threadPool.entity.LocalRunnable;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||
import weaver.general.Util;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import java.util.*;
|
||||
|
|
@ -256,11 +257,13 @@ public class EmployeeDeclareWrapper extends Service {
|
|||
DataCollectionEmployee simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(employeeDeclare.getEmployeeId());
|
||||
employeeMap.put("id", simpleEmployee.getEmployeeId());
|
||||
employeeMap.put("name", simpleEmployee.getUsername());
|
||||
employeeMap.put("dismissDate", Util.null2String(simpleEmployee.getDismissdate()));
|
||||
employeeMap.put("_entityType", EmployeeTypeEnum.ORGANIZATION);
|
||||
} else {
|
||||
DataCollectionEmployee extEmployee = getExtEmpService(user).getEmployeeById(employeeDeclare.getEmployeeId());
|
||||
employeeMap.put("id", extEmployee.getEmployeeId());
|
||||
employeeMap.put("name", extEmployee.getUsername());
|
||||
employeeMap.put("dismissDate", "");
|
||||
employeeMap.put("_entityType", EmployeeTypeEnum.EXT_EMPLOYEE);
|
||||
}
|
||||
employeeDeclareFrom.setId(employeeDeclare.getId())
|
||||
|
|
|
|||
Loading…
Reference in New Issue