Commit ed920207 authored by huyuchen's avatar huyuchen

档案完整监控

parent 310c302f
...@@ -67,10 +67,7 @@ import java.lang.reflect.Field; ...@@ -67,10 +67,7 @@ import java.lang.reflect.Field;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 员工合同 * 员工合同
...@@ -96,6 +93,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -96,6 +93,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private final TEmployeeContractAuditService tEmployeeContractAuditService; private final TEmployeeContractAuditService tEmployeeContractAuditService;
private final TEmployeeLogService tEmployeeLogService; private final TEmployeeLogService tEmployeeLogService;
private final TWorkHandlerInfoService workHandlerInfoService; private final TWorkHandlerInfoService workHandlerInfoService;
private final TPreEmpMainService preEmpMainService;
private final TPreEmployeeProjectService preEmployeeProjectService;
@Autowired @Autowired
private DaprSocialProperties socialProperties; private DaprSocialProperties socialProperties;
// 缓存信息 // 缓存信息
...@@ -1616,6 +1615,27 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1616,6 +1615,27 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tEmployeeInfo.setContractStatus(CommonConstants.ONE_INT); tEmployeeInfo.setContractStatus(CommonConstants.ONE_INT);
tEmployeeInfoMapper.updateById(tEmployeeInfo); tEmployeeInfoMapper.updateById(tEmployeeInfo);
} }
//签订类型正常签订的时候更新预入职列表
if (EmployeeConstants.SITUATION_ONE.equals(contract.getSituation())) {
//根据项目编码和身份证号查询预入职列表
TPreEmpMain empMain = preEmpMainService.getOne(Wrappers.<TPreEmpMain>query()
.lambda().eq(TPreEmpMain::getEmpIdcard, contract.getEmpIdcard())
.eq(TPreEmpMain::getDeptNo, contract.getDeptNo()));
if (Optional.ofNullable(empMain).isPresent()) {
//查询预入职项目档案表
TPreEmployeeProject preEmployeeProject = preEmployeeProjectService.getOne(Wrappers.<TPreEmployeeProject>query()
.lambda().eq(TPreEmployeeProject::getPreMainId, empMain.getId()));
if (Optional.ofNullable(preEmployeeProject).isPresent()) {
preEmployeeProject.setContractType(contract.getContractType());
preEmployeeProject.setWorkingHours(contract.getWorkingHours());
preEmployeeProject.setPost(contract.getPost());
preEmployeeProject.setEnjoinDate(LocalDateTimeUtils.convertLDTToDate(contract.getEnjoinDate()));
preEmployeeProject.setTryPeriod(contract.getTryPeriod());
preEmployeeProjectService.save(preEmployeeProject);
}
}
}
} else { } else {
//是否同步终止合同、减项、减档为是的时候 单独写逻辑 //是否同步终止合同、减项、减档为是的时候 单独写逻辑
if (EmployeeConstants.SITUATION_SEVEN.equals(contract.getSituation()) if (EmployeeConstants.SITUATION_SEVEN.equals(contract.getSituation())
......
...@@ -160,6 +160,7 @@ ...@@ -160,6 +160,7 @@
a.UNIT_NO, a.UNIT_NO,
a.DEPT_NAME, a.DEPT_NAME,
a.DEPT_NO, a.DEPT_NO,
a.DEPT_ID,
a.BUSINESS_PRIMARY_TYPE, a.BUSINESS_PRIMARY_TYPE,
,a.BUSINESS_SECOND_TYPE, ,a.BUSINESS_SECOND_TYPE,
,a.BUSINESS_THIRD_TYPE, ,a.BUSINESS_THIRD_TYPE,
......
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