Commit 35f3cbf9 authored by fangxinjiang's avatar fangxinjiang

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

parents 7c099d37 efc5b181
...@@ -883,6 +883,8 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -883,6 +883,8 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
isNew = true; isNew = true;
project = new TEmployeeProject(); project = new TEmployeeProject();
} }
// 瓜子默认外包 2025-6-24 10:26:24 倩倩确认的
project.setEmpNatrue(CommonConstants.ZERO_STRING);
project.setProjectStatus(CommonConstants.ZERO_INT); project.setProjectStatus(CommonConstants.ZERO_INT);
if (Common.isEmpty(project.getStatus())) { if (Common.isEmpty(project.getStatus())) {
project.setStatus(CommonConstants.ZERO_INT); project.setStatus(CommonConstants.ZERO_INT);
...@@ -913,6 +915,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -913,6 +915,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if (Common.isNotNull(tSettleDomain)) { if (Common.isNotNull(tSettleDomain)) {
insTEmployeePro.setDeptId(tSettleDomain.getId()); insTEmployeePro.setDeptId(tSettleDomain.getId());
insTEmployeePro.setDeptName(tSettleDomain.getDepartName()); insTEmployeePro.setDeptName(tSettleDomain.getDepartName());
insTEmployeePro.setDeptNo(tSettleDomain.getDepartNo());
insTEmployeePro.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType()); insTEmployeePro.setBusinessPrimaryType(tSettleDomain.getBusinessPrimaryType());
insTEmployeePro.setBusinessSecondType(tSettleDomain.getBusinessSecondType()); insTEmployeePro.setBusinessSecondType(tSettleDomain.getBusinessSecondType());
insTEmployeePro.setBusinessThirdType(tSettleDomain.getBusinessThirdType()); insTEmployeePro.setBusinessThirdType(tSettleDomain.getBusinessThirdType());
...@@ -925,6 +928,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -925,6 +928,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
//员工编码生成规则 //员工编码生成规则
if (tEmployeeInfo != null) { if (tEmployeeInfo != null) {
insTEmployeePro.setEmpId(tEmployeeInfo.getId()); insTEmployeePro.setEmpId(tEmployeeInfo.getId());
insTEmployeePro.setEmpIdcard(tEmployeeInfo.getEmpIdcard());
insTEmployeePro.setEmpName(tEmployeeInfo.getEmpName()); insTEmployeePro.setEmpName(tEmployeeInfo.getEmpName());
insTEmployeePro.setEmpCode(tEmployeeInfo.getEmpCode()); insTEmployeePro.setEmpCode(tEmployeeInfo.getEmpCode());
} }
...@@ -932,6 +936,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -932,6 +936,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
insTEmployeePro.setCreateTime(LocalDateTime.now()); insTEmployeePro.setCreateTime(LocalDateTime.now());
insTEmployeePro.setCreateName(user.getNickname()); insTEmployeePro.setCreateName(user.getNickname());
insTEmployeePro.setProjectSource(CommonConstants.NINE_STRING); insTEmployeePro.setProjectSource(CommonConstants.NINE_STRING);
insTEmployeePro.setContractType("");
} }
/** /**
......
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