Commit df3b5602 authored by fangxinjiang's avatar fangxinjiang

B端服务添加

parent 25be8d44
...@@ -386,21 +386,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -386,21 +386,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId()); TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
String code = ""; String code = "";
StringBuilder errorTemp = new StringBuilder(); StringBuilder errorTemp = new StringBuilder();
if (tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[1]) { if (tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[1]
||tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[2]
||tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[3]) {
errorTemp.append("社保未派减、"); errorTemp.append("社保未派减、");
} }
if (tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[2]) { if (tEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[1]
errorTemp.append("社保部分购买、"); ||tEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[2]) {
}
if (tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[3]) {
errorTemp.append("社保正常缴纳、");
}
if (tEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[1]) {
errorTemp.append("公积金未派减、"); errorTemp.append("公积金未派减、");
} }
if (tEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[2]) {
errorTemp.append("公积金正常缴纳、");
}
// 未作废,在用 或 审核中 // 未作废,在用 或 审核中
long contractCount = contractInfoMapper.selectCount(Wrappers.<TEmployeeContractInfo>query().lambda() long contractCount = contractInfoMapper.selectCount(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard,tEmployeeProject.getEmpIdcard()) .eq(TEmployeeContractInfo::getEmpIdcard,tEmployeeProject.getEmpIdcard())
...@@ -588,21 +582,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -588,21 +582,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
} }
if (Common.isNotNull(tEmployeeProject)) { if (Common.isNotNull(tEmployeeProject)) {
errorTemp = new StringBuilder(); errorTemp = new StringBuilder();
if (tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[1]) { if (tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[1]
||tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[2]
||tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[3]) {
errorTemp.append("社保未派减、"); errorTemp.append("社保未派减、");
} }
if (tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[2]) { if (tEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[1]
errorTemp.append("社保部分购买、"); ||tEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[2]) {
}
if (tEmployeeProject.getSocialStatus() == CommonConstants.dingleDigitIntArray[3]) {
errorTemp.append("社保正常缴纳、");
}
if (tEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[1]) {
errorTemp.append("公积金未派减、"); errorTemp.append("公积金未派减、");
} }
if (tEmployeeProject.getFundStatus() == CommonConstants.dingleDigitIntArray[3]) {
errorTemp.append("公积金正常缴纳、");
}
// 未作废,在用 或 审核中 // 未作废,在用 或 审核中
contractCount = contractInfoMapper.selectCount(Wrappers.<TEmployeeContractInfo>query().lambda() contractCount = contractInfoMapper.selectCount(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard,tEmployeeProject.getEmpIdcard()) .eq(TEmployeeContractInfo::getEmpIdcard,tEmployeeProject.getEmpIdcard())
......
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