Commit 7c57310a authored by fangxinjiang's avatar fangxinjiang

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

parents 2b13e0c8 1e99229a
...@@ -2449,7 +2449,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -2449,7 +2449,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} }
} }
// 同步处理终止合同 // 同步处理终止合同(2026-01-29 倩倩:作废、终止的合同审核通过后,将待审核的终止的合同处理为审核不通过,以使得 自动化离职的合同 变为无需处理。未处理作废的合同,后续有需要再追加)
private void doZhongZhiContract(TEmployeeContractInfo contractInfo, YifuUser user) { private void doZhongZhiContract(TEmployeeContractInfo contractInfo, YifuUser user) {
// 1将待审核的变为审核不通过且不在用 // 1将待审核的变为审核不通过且不在用
List<TEmployeeContractInfo> contractInfoList = baseMapper.selectList(Wrappers.<TEmployeeContractInfo>query() List<TEmployeeContractInfo> contractInfoList = baseMapper.selectList(Wrappers.<TEmployeeContractInfo>query()
......
...@@ -788,7 +788,7 @@ public class SocialFriendConfig { ...@@ -788,7 +788,7 @@ public class SocialFriendConfig {
// 人员身份 个人身份 社保必填 默认“职员” // 人员身份 个人身份 社保必填 默认“职员”
tszdxx.put("grsf", "职员"); tszdxx.put("grsf", "职员");
// 工作时间制度 社保必填 // 工作时间制度 社保必填
//tszdxx.put("gzsjzd", vo.getWorkingHours()); tszdxx.put("gzsjzd", vo.getWorkingHours());
// 医保用工形式 医保新参必填 默认“原固定职工” // 医保用工形式 医保新参必填 默认“原固定职工”
tszdxx.put("ybygxs", "原固定职工"); tszdxx.put("ybygxs", "原固定职工");
// 毕业院校 // 毕业院校
......
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