Commit 7638cff7 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8

parents 8063bdf0 524d9295
...@@ -181,6 +181,7 @@ public class SysAutoDictItemController { ...@@ -181,6 +181,7 @@ public class SysAutoDictItemController {
SysAutoDictItemVo settleDomainSelectVo = new SysAutoDictItemVo(); SysAutoDictItemVo settleDomainSelectVo = new SysAutoDictItemVo();
LambdaQueryWrapper<SysAutoDictItem> dictQuery = Wrappers.<SysAutoDictItem>lambdaQuery() LambdaQueryWrapper<SysAutoDictItem> dictQuery = Wrappers.<SysAutoDictItem>lambdaQuery()
.eq(SysAutoDictItem::getDeptNo, dictItemVo.getDeptNo()) .eq(SysAutoDictItem::getDeptNo, dictItemVo.getDeptNo())
.eq(SysAutoDictItem::getDisable, CommonConstants.ZERO_STRING)
.eq(SysAutoDictItem::getDelFlag, CommonConstants.NOT_DELETE_FLAG); .eq(SysAutoDictItem::getDelFlag, CommonConstants.NOT_DELETE_FLAG);
List<SysAutoDictItem> list = sysAutoDictItemService.list(dictQuery); List<SysAutoDictItem> list = sysAutoDictItemService.list(dictQuery);
......
...@@ -260,6 +260,7 @@ public class SysAutoDictItemServiceImpl extends ServiceImpl<SysAutoDictItemMappe ...@@ -260,6 +260,7 @@ public class SysAutoDictItemServiceImpl extends ServiceImpl<SysAutoDictItemMappe
@Override @Override
public List<SysAutoDictItem> selectByDeptNo(SysAutoDictItemSearchVo searchVo) { public List<SysAutoDictItem> selectByDeptNo(SysAutoDictItemSearchVo searchVo) {
LambdaQueryWrapper<SysAutoDictItem> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<SysAutoDictItem> wrapper = Wrappers.lambdaQuery();
wrapper.eq(SysAutoDictItem::getDisable,CommonConstants.ZERO_STRING);
wrapper.eq(SysAutoDictItem::getDelFlag,CommonConstants.NOT_DELETE_FLAG); wrapper.eq(SysAutoDictItem::getDelFlag,CommonConstants.NOT_DELETE_FLAG);
if (Common.isNotNull(searchVo.getDeptNo())){ if (Common.isNotNull(searchVo.getDeptNo())){
wrapper.eq(SysAutoDictItem::getDeptNo,searchVo.getDeptNo()); wrapper.eq(SysAutoDictItem::getDeptNo,searchVo.getDeptNo());
......
...@@ -2844,6 +2844,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2844,6 +2844,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
project.setProjectSource(CommonConstants.ONE_STRING); project.setProjectSource(CommonConstants.ONE_STRING);
project.setEmpNo(tEmployeeProjectService.getEmpNo(project.getDeptNo())); project.setEmpNo(tEmployeeProjectService.getEmpNo(project.getDeptNo()));
tEmployeeProjectService.save(project); tEmployeeProjectService.save(project);
// 增加,同步CSP
tEmployeeProjectService.doSaveBelongDept(project, CommonConstants.ONE_STRING);
// 更新入职待建档状态为已完成
registrationPreService.updatePreStatusToEnd(project.getDeptNo(),project.getEmpIdcard());
projectAdd.setId(project.getId()); projectAdd.setId(project.getId());
projectAdd.setEmpNo(project.getEmpNo()); projectAdd.setEmpNo(project.getEmpNo());
projectsMap.put(project.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + project.getDeptNo(), projectAdd); projectsMap.put(project.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + project.getDeptNo(), projectAdd);
......
...@@ -659,7 +659,7 @@ public class ExcelUtil <T> implements Serializable { ...@@ -659,7 +659,7 @@ public class ExcelUtil <T> implements Serializable {
private String validateUtil(String c, ExcelAttribute attr, int i) { private String validateUtil(String c, ExcelAttribute attr, int i) {
//非空校验 //非空校验
if (attr.isNotEmpty() && !Common.isNotNull(c)) { if (attr.isNotEmpty() && !Common.isNotNull(c)) {
return errorInfo(attr, "_字段不可为空", i); return errorInfo(attr, "_不可为空", i);
} }
if (Common.isNotNull(c)) { if (Common.isNotNull(c)) {
//日期格式校验 //日期格式校验
...@@ -780,7 +780,7 @@ public class ExcelUtil <T> implements Serializable { ...@@ -780,7 +780,7 @@ public class ExcelUtil <T> implements Serializable {
if (null != errorMessageHashMap && null != errorMessage) { if (null != errorMessageHashMap && null != errorMessage) {
temp = errorMessageHashMap.get(errorMessage.getLineNum()); temp = errorMessageHashMap.get(errorMessage.getLineNum());
if (null != temp) { if (null != temp) {
temp.setMessage(temp.getMessage() + CommonConstants.DOWN_LINE_STRING + errorMessage.getMessage()); temp.setMessage(temp.getMessage() + ";" + errorMessage.getMessage());
errorMessageHashMap.put(temp.getLineNum(), temp); errorMessageHashMap.put(temp.getLineNum(), temp);
} else { } else {
errorMessageHashMap.put(errorMessage.getLineNum(), errorMessage); errorMessageHashMap.put(errorMessage.getLineNum(), errorMessage);
......
...@@ -933,17 +933,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -933,17 +933,30 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
**/ **/
@Override @Override
public TEmployeeProjectBelongDept getZeroRegistrationAndUpdateTwo(TEmployeeProjectBelongDeptSearchCspVo searchCspVo) { public TEmployeeProjectBelongDept getZeroRegistrationAndUpdateTwo(TEmployeeProjectBelongDeptSearchCspVo searchCspVo) {
List<TEmployeeProjectBelongDept> belongDeptList = baseMapper.getZeroRegistrationByIdCard(searchCspVo); EmployeeRegistration registration = baseMapper.selectOne(Wrappers.<EmployeeRegistration>query().lambda()
if (belongDeptList != null && !belongDeptList.isEmpty()) { .eq(EmployeeRegistration::getDeptId, searchCspVo.getDeptId())
// 1:加日志 .eq(EmployeeRegistration::getEmpIdcard, searchCspVo.getEmpIdCard())
if (doSaveLogBatch(searchCspVo, belongDeptList)) return null; .eq(EmployeeRegistration::getProcessStatus, CommonConstants.ZERO_STRING)
// 更新为已处理 .eq(EmployeeRegistration::getDataSource,CommonConstants.TWO_STRING)
baseMapper.updateTwoRegistrationByIdCard(searchCspVo); .last(CommonConstants.LAST_ONE_SQL));
return belongDeptList.get(0); if (Common.isNotNull(registration)) {
} else { registration.setProcessStatus(CommonConstants.TWO_STRING);
baseMapper.updateById(registration);
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING, RegistConstants.MESSAGE_FINISH, searchCspVo.getEmpCreateAndLeaveTime(),
searchCspVo.getEmpCreateAndLeaveUser(),RegistConstants.BEFORE_IN_PROJECT );
return null; return null;
} else {
List<TEmployeeProjectBelongDept> belongDeptList = baseMapper.getZeroRegistrationByIdCard(searchCspVo);
if (belongDeptList != null && !belongDeptList.isEmpty()) {
// 1:加日志
if (doSaveLogBatch(searchCspVo, belongDeptList)) return null;
// 更新为已处理
baseMapper.updateTwoRegistrationByIdCard(searchCspVo);
return belongDeptList.get(0);
} else {
return null;
}
} }
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment