Skip to content

Y
yifu-mvp
Commit 70e94711 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

批量办理 100%

parent 99796814
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 70e94711
...@@ -720,10 +720,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -720,10 +720,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
} }
if (Common.isNotNull(excel.getProvidentHousehold())){ if (Common.isNotNull(excel.getProvidentHousehold())){
socialFund.setSettleDomain(setInfoVo.getId()); socialFund.setSettleDomainFund(setInfoVo.getId());
socialFund.setSettleDomainName(setInfoVo.getDepartName()); socialFund.setSettleDomainNameFund(setInfoVo.getDepartName());
socialFund.setSettleDomainCode(setInfoVo.getDepartNo()); socialFund.setSettleDomainCodeFund(setInfoVo.getDepartNo());
socialFund.setUnitName(setInfoVo.getCustomerName()); socialFund.setUnitNameFund(setInfoVo.getCustomerName());
socialFund.setUnitIdFund(setInfoVo.getCustomerId()); socialFund.setUnitIdFund(setInfoVo.getCustomerId());
socialFund.setFundStatus(CommonConstants.ZERO_STRING); socialFund.setFundStatus(CommonConstants.ZERO_STRING);
socialFund.setProvidentStart(excel.getProvidentStart()); socialFund.setProvidentStart(excel.getProvidentStart());
...@@ -1410,11 +1410,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1410,11 +1410,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
签订期限：无固定期限 合同到期时间、合同期限非必填，合同开始时间必填； 签订期限：无固定期限 合同到期时间、合同期限非必填，合同开始时间必填；
签订期限：固定期限、已完成一定工作任务为期限 合同期限非必填，合同开始时间、合同到期时间都必填*/ 签订期限：固定期限、已完成一定工作任务为期限 合同期限非必填，合同开始时间、合同到期时间都必填*/
if (Common.isNotNull(empVo)){ if (Common.isNotNull(empVo)){
if (CommonConstants.ONE_STRING.equals(empVo.getProjectStatus())){ if (Common.isNotNull(empVo.getProjectStatus()) && empVo.getProjectStatus().intValue() == CommonConstants.ONE_INT){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_PROJECT_NOT_USED))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_PROJECT_NOT_USED)));
return true; return true;
} }
if (CommonConstants.ONE_STRING.equals(empVo.getFileStatus())){ if (Common.isNotNull(empVo.getFileStatus()) && empVo.getFileStatus().intValue() == CommonConstants.ONE_INT){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_NOT_USED))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_NOT_USED)));
return true; return true;
} }
......
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