Commit 524d9295 authored by huyuchen's avatar huyuchen

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

parents cee73b57 f3fcad63
...@@ -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());
......
...@@ -1595,16 +1595,16 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1595,16 +1595,16 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
// 审核日志 // 审核日志
TPreEmpMainLog auditLog = new TPreEmpMainLog(); TPreEmpMainLog auditLog = new TPreEmpMainLog();
auditLog.setAuditId(user.getId()); auditLog.setAuditId(user.getId());
auditLog.setAuditName(user.getNickname()); auditLog.setAuditName("自动审核");
auditLog.setAuditTime(new Date()); auditLog.setAuditTime(new Date());
auditLog.setAuditRemark("简档自动审核通过"); auditLog.setAuditRemark("简档自动审核通过");
auditLog.setMainId(main.getId()); auditLog.setMainId(main.getId());
auditLog.setAuditResult(status); auditLog.setAuditResult(CommonConstants.FOUR_STRING);
tPreEmpMainLogService.save(auditLog); tPreEmpMainLogService.save(auditLog);
main.setAuditId(user.getId()); main.setAuditId(user.getId());
main.setAuditRemark("简档自动审核通过"); main.setAuditRemark("简档自动审核通过");
main.setAuditName(user.getNickname()); main.setAuditName("自动审核");
main.setAuditTime(new Date()); main.setAuditTime(new Date());
updateToEmployeeByPre(vo, isSimpleBoo); updateToEmployeeByPre(vo, isSimpleBoo);
} }
...@@ -1992,8 +1992,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1992,8 +1992,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject.setTryPeriod(""); tPreEmployeeProject.setTryPeriod("");
} }
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息 // 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate" // String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"}
, "enjoinDate", "tryPeriod"}; // 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"};
BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties); BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
if (CommonConstants.ONE_INT == project.getProjectStatus()) { if (CommonConstants.ONE_INT == project.getProjectStatus()) {
project.setCreateTime(LocalDateTime.now()); project.setCreateTime(LocalDateTime.now());
...@@ -2426,8 +2427,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -2426,8 +2427,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject.setTryPeriod(""); tPreEmployeeProject.setTryPeriod("");
} }
// 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息 // 2024-7-23 11:52:33 金龙弟预张倩倩认为不同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate" //String[] ignoreProperties = new String[]{"id", "contractType", "workingHours", "post", "enjoinDate", "tryPeriod"}
, "enjoinDate", "tryPeriod"}; // 2025-3-27 15:13:30 张倩倩认为要同步项目的合同信息
String[] ignoreProperties = new String[]{"id", "workingHours", "tryPeriod"};
BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties); BeanUtil.copyProperties(tPreEmployeeProject, project, ignoreProperties);
if (Common.isEmpty(project.getStatus())) { if (Common.isEmpty(project.getStatus())) {
project.setStatus(CommonConstants.ZERO_INT); project.setStatus(CommonConstants.ZERO_INT);
......
...@@ -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);
......
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