Commit 596dbc81 authored by fangxinjiang's avatar fangxinjiang

项目强制校验&项目档案批量新增和更新的银行卡校验

parent 4c5485ff
......@@ -33,4 +33,96 @@ public class ArchivesConstants {
* 员工合同签订类型
*/
public static final String[] contractSituation = {"作废","离职再入职","合同未到期重新签订","正常签订","商务合同更改","正常续签","终止"};
/**
* 项目 ID 不可为空
*/
public static final String SETTLE_DOMAIN_ID_NOT_EMPTY = "id 不可为空";
/**
* 项目 项目编码及名称不可为空
*/
public static final String SETTLE_DOMAIN_NAME_AND_NO_NOT_EMPTY = "项目编码及名称不可为空";
/**
* 项目 客户名称、客户编码、客户ID不可为空
*/
public static final String SETTLE_DOMAIN_CUSTOMER_INFO_NOT_EMPTY = "客户名称、客户编码、客户ID不可为空";
/**
* 项目 是否BPO业务不可为空
*/
public static final String SETTLE_DOMAIN_BPO_FLAG_NOT_EMPTY = "是否BPO业务不可为空";
/**
* 项目 服务项目不可为空
*/
public static final String SETTLE_DOMAIN_SERVER_ITEM_NOT_EMPTY = "服务项目不可为空";
/**
* 项目 省市不可为空
*/
public static final String SETTLE_DOMAIN_PROVINCE_NOT_EMPTY = "省市不可为空";
/**
* 项目 业务类型、业务类型二级分类、业务类型三级分类不可为空
*/
public static final String SETTLE_DOMAIN_BUSINESS_TYPE_NOT_EMPTY = "业务类型、业务类型二级分类、业务类型三级分类不可为空";
/**
* 项目 服务状态不可为空
*/
public static final String SETTLE_DOMAIN_STOP_FLAG_NOT_EMPTY = "服务状态不可为空";
/**
* 项目 社保结算类型不可为空
*/
public static final String SETTLE_DOMAIN_SOCIAL_TYPE_NOT_EMPTY = "社保结算类型不可为空";
/**
* 项目 我司到款单位不可为空
*/
public static final String SETTLE_DOMAIN_UNIT_OUT_COMPANY_NOT_EMPTY = "我司到款单位不可为空";
/**
* 项目 社保
*/
public static final String SETTLE_DOMAIN_SOCIAL = "社保";
/**
* 项目 公积金
*/
public static final String SETTLE_DOMAIN_FUND = "公积金";
/**
* 项目 薪资
*/
public static final String SETTLE_DOMAIN_SALARY = "薪资";
/**
* 项目 商险
*/
public static final String SETTLE_DOMAIN_INSURANCES = "商险";
/**
* 项目 公积金结算类型不可为空
*/
public static final String SETTLE_DOMAIN_FUND_TYPE_NOT_EMPTY = "公积金结算类型不可为空";
/**
* 项目 封面台头-薪资不可为空
*/
public static final String SETTLE_DOMAIN_INVOICE_TITLE_NOT_EMPTY = "封面台头-薪资不可为空";
/**
* 项目 商险结算类型不可为空
*/
public static final String SETTLE_DOMAIN_INSURANCE_SETTLE_TYPE_NOT_EMPTY = "商险结算类型不可为空";
/**
* 项目 封面台头-商险不可为空
*/
public static final String SETTLE_DOMAIN_INSURANCE_TITLE_NOT_EMPTY = "封面台头-商险不可为空";
/**
* 项目 '管理费是否收费'及'风险金是否收取'不可为空
*/
public static final String SETTLE_DOMAIN_MANAGEMENT_AND_RISK_TAG_NOT_EMPTY = "'管理费是否收费'及'风险金是否收取'不可为空";
/**
* 项目 管理费是否收费为是,‘管理费服务项目’、‘管理费收费方式’、‘管理费费率/管理费金额’不可为空
*/
public static final String SETTLE_DOMAIN_MANAGEMENT_INFO_NOT_EMPTY = "管理费是否收费为是,‘管理费服务项目’、‘管理费收费方式’、‘管理费费率/管理费金额’不可为空";
/**
* 项目 风险金是否收取为是,'风险金服务项目'、'风险金收费方式'、'风险金收取费用/税率'不可为空
*/
public static final String SETTLE_DOMAIN_RISK_INFO_NOT_EMPTY = "风险金是否收取为是,'风险金服务项目'、'风险金收费方式'、'风险金收取费用/税率'不可为空";
/**
* 项目 结算方式(管理费、风险金)不可为空
*/
public static final String SETTLE_DOMAIN_SETTLE_TYPE_NOT_EMPTY = "结算方式(管理费、风险金)不可为空";
/**
* 项目 获取区域数据失败:
*/
public static final String SETTLE_DOMAIN_CHECK_AREA_NOT_EXISTS = "获取区域数据失败:";
}
......@@ -962,7 +962,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (tEmployeeProject.getProjectStatus() != CommonConstants.dingleDigitIntArray[0]) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.CHECKS_EMP_DELETE_ERROR)));
} else {
if (Common.isNotNull(excel.getBankNo())) {
/*if (Common.isNotNull(excel.getBankNo())) {
TCheckBankNo check = new TCheckBankNo();
check.setBankNo(excel.getBankNo());
check.setIdNum(excel.getEmpIdcard());
......@@ -982,7 +982,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
} else {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), EmployeeConstants.CHECK_NO_RESPONSE));
}
}
}*/
updateExcelProj(excel, updateList, tEmployeeProject);
TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
newOldProject = new EmployeeProjectNewOldVO();
......
......@@ -21,12 +21,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AllUserNaVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysUserListVo;
import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TCutsomerDataPermisson;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TCutsomerDataPermissonMapper;
......@@ -48,7 +46,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -198,25 +195,25 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
private String checkInfo(TSettleDomain domain) {
if (Common.isEmpty(domain.getId())){
return "id 不可为空";
return ArchivesConstants.SETTLE_DOMAIN_ID_NOT_EMPTY;
}
if (Common.isEmpty(domain.getDepartName())|| Common.isEmpty(domain.getDepartNo())){
return "项目编码及名称不可为空";
return ArchivesConstants.SETTLE_DOMAIN_NAME_AND_NO_NOT_EMPTY;
}
if (Common.isEmpty(domain.getCustomerName())
|| Common.isEmpty(domain.getCustomerId())
|| Common.isEmpty(domain.getCustomerNo())){
return "客户名称、客户编码、客户ID不可为空";
return ArchivesConstants.SETTLE_DOMAIN_CUSTOMER_INFO_NOT_EMPTY;
}
if (Common.isEmpty(domain.getBpoFlag())){
return "是否BPO业务不可为空";
return ArchivesConstants.SETTLE_DOMAIN_BPO_FLAG_NOT_EMPTY;
}
if (Common.isEmpty(domain.getServerItem())){
return "服务项目不可为空";
return ArchivesConstants.SETTLE_DOMAIN_SERVER_ITEM_NOT_EMPTY;
}
if (Common.isEmpty(domain.getECity())
|| Common.isEmpty(domain.getEProvince())){
return "省市不可为空";
return ArchivesConstants.SETTLE_DOMAIN_PROVINCE_NOT_EMPTY;
}
/*if ( Common.isEmpty(domain.getCreateType())){
return "创建类型不可为空";
......@@ -224,59 +221,63 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
if (Common.isEmpty(domain.getBusinessPrimaryType())
|| Common.isEmpty(domain.getBusinessSecondType())
|| Common.isEmpty(domain.getBusinessThirdType())){
return "业务类型、业务类型二级分类、业务类型三级分类不可为空";
return ArchivesConstants.SETTLE_DOMAIN_BUSINESS_TYPE_NOT_EMPTY;
}
if (Common.isEmpty(domain.getStopFlag())){
return "服务状态不可为空";
return ArchivesConstants.SETTLE_DOMAIN_STOP_FLAG_NOT_EMPTY;
}
/*
我司到款单位名称 条件:当服务项目中有社保或公积金时必填
封面抬头-薪资 条件:当服务项目中有薪资时必填
封面抬头-商险 条件:当服务项目中有商险时必填 */
if (Common.isNotNull(domain.getServerItem())){
if (domain.getServerItem().indexOf("社保") != CommonConstants.ONE_INT_NEGATE){
if (domain.getServerItem().indexOf(ArchivesConstants.SETTLE_DOMAIN_SOCIAL) != CommonConstants.ONE_INT_NEGATE){
if (Common.isEmpty(domain.getSocialType())){
return "社保结算类型不可为空";
return ArchivesConstants.SETTLE_DOMAIN_SOCIAL_TYPE_NOT_EMPTY;
}
if (Common.isEmpty(domain.getUnitOfOurCompany())){
return "我司到款单位不可为空";
return ArchivesConstants.SETTLE_DOMAIN_UNIT_OUT_COMPANY_NOT_EMPTY;
}
}
if (domain.getServerItem().indexOf("公积金") != CommonConstants.ONE_INT_NEGATE){
if (domain.getServerItem().indexOf(ArchivesConstants.SETTLE_DOMAIN_FUND) != CommonConstants.ONE_INT_NEGATE){
if (Common.isEmpty(domain.getFundType())){
return "公积金结算类型不可为空";
return ArchivesConstants.SETTLE_DOMAIN_FUND_TYPE_NOT_EMPTY;
}
if (Common.isEmpty(domain.getUnitOfOurCompany())){
return "我司到款单位不可为空";
return ArchivesConstants.SETTLE_DOMAIN_UNIT_OUT_COMPANY_NOT_EMPTY;
}
}
if (domain.getServerItem().indexOf("薪资") != CommonConstants.ONE_INT_NEGATE){
if (domain.getServerItem().indexOf(ArchivesConstants.SETTLE_DOMAIN_SALARY) != CommonConstants.ONE_INT_NEGATE){
if (Common.isEmpty(domain.getInvoiceTitleSalary())){
return "封面台头-薪资不可为空";
return ArchivesConstants.SETTLE_DOMAIN_INVOICE_TITLE_NOT_EMPTY;
}
}
if (domain.getServerItem().indexOf("商险") != CommonConstants.ONE_INT_NEGATE){
if (domain.getServerItem().indexOf(ArchivesConstants.SETTLE_DOMAIN_INSURANCES) != CommonConstants.ONE_INT_NEGATE){
if (Common.isEmpty(domain.getInsuranceSettleType())){
return "商险结算类型不可为空";
return ArchivesConstants.SETTLE_DOMAIN_INSURANCE_SETTLE_TYPE_NOT_EMPTY;
}
if (Common.isEmpty(domain.getInvoiceTitleInsurance())){
return "封面台头-商险不可为空";
return ArchivesConstants.SETTLE_DOMAIN_INSURANCE_TITLE_NOT_EMPTY;
}
}
}
if (Common.isEmpty(domain.getManagementTag()) || Common.isEmpty(domain.getRiskFundTag())){
return "'管理费是否收费'及'风险金是否收取'不可为空";
return ArchivesConstants.SETTLE_DOMAIN_MANAGEMENT_AND_RISK_TAG_NOT_EMPTY;
}
if (CommonConstants.ZERO_STRING.equals(domain.getManagementTag())
&& Common.isEmpty(domain.getManageServerItem())){
return "管理费是否收费为是,管理费服务项目不可为空";
&& (Common.isEmpty(domain.getManageServerItem())
|| Common.isEmpty(domain.getManagementFee())
|| Common.isEmpty(domain.getManagementType()))){
return ArchivesConstants.SETTLE_DOMAIN_MANAGEMENT_INFO_NOT_EMPTY;
}
if (CommonConstants.ZERO_STRING.equals(domain.getRiskFundTag())
&& Common.isEmpty(domain.getRiskServerItem())){
return "风险金是否收取为是,风险金服务项目不可为空";
&& (Common.isEmpty(domain.getRiskServerItem())
|| Common.isEmpty(domain.getRiskFundType())
|| Common.isEmpty(domain.getRiskFundFee()))){
return ArchivesConstants.SETTLE_DOMAIN_RISK_INFO_NOT_EMPTY;
}
if (Common.isEmpty(domain.getMrSettleType())){
return "结算方式(管理费、风险金)不可为空";
return ArchivesConstants.SETTLE_DOMAIN_SETTLE_TYPE_NOT_EMPTY;
}
return null;
}
......@@ -289,7 +290,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
if (Common.isNotNull(areaId)){
tSettleDomain.setProvince(Integer.parseInt(areaId));
}else {
return R.failed("获取区域数据失败:" + tSettleDomain.getEProvince());
return R.failed(ArchivesConstants.SETTLE_DOMAIN_CHECK_AREA_NOT_EXISTS + tSettleDomain.getEProvince());
}
}
if (Common.isNotNull(tSettleDomain.getECity())){
......@@ -297,7 +298,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
if (Common.isNotNull(areaId)){
tSettleDomain.setCity(Integer.parseInt(areaId));
}else {
return R.failed("获取区域数据失败:" + tSettleDomain.getECity());
return R.failed(ArchivesConstants.SETTLE_DOMAIN_CHECK_AREA_NOT_EXISTS + tSettleDomain.getECity());
}
}
if (Common.isNotNull(tSettleDomain.getETown())){
......@@ -305,7 +306,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
if (Common.isNotNull(areaId)){
tSettleDomain.setTown(Integer.parseInt(areaId));
}else {
return R.failed("获取区域数据失败:" + tSettleDomain.getETown());
return R.failed(ArchivesConstants.SETTLE_DOMAIN_CHECK_AREA_NOT_EXISTS + tSettleDomain.getETown());
}
}
}
......
......@@ -155,7 +155,7 @@ socialinfo.list.num.large=\u5F53\u524D\u793E\u4FDD\u5BFC\u5165\u961F\u5217\u4E0D
emp.dispatch.social.diy.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\uFF0C\u5404\u9669\u79CD\u57FA\u6570\u76F8\u540C\uFF0C\u8BF7\u586B\u5199\u201C\u517B\u8001\u57FA\u6570\u201D\uFF0C\u5982\u57FA\u6570\u4E0D\u540C\uFF0C\u5219\u6240\u6709\u9669\u79CD\u57FA\u6570\u90FD\u9700\u586B\u5199
emp.dispatch.social.diy.medical_not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u81EA\u5B9A\u4E49\u7F34\u7EB3\u517B\u8001\u57FA\u6570\u6216\u517B\u8001\u8D77\u7F34\u65E5\u671F\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.social.diy.medical_not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u81EA\u5B9A\u4E49\u7F34\u7EB3\u517B\u8001\u57FA\u6570\u548C\u517B\u8001\u8D77\u7F34\u65E5\u671F\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.emp.project.not.used=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5BF9\u5E94\u9879\u76EE\u7F16\u7801\u7684\u9879\u76EE\u6863\u6848\u5DF2\u51CF\u9879\uFF0C\u8BF7\u53BB\u9879\u76EE\u6863\u6848\u5904\u590D\u9879
......@@ -163,19 +163,19 @@ emp.dispatch.emp.not.used=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5BF9\u5E94\u8EAB\u4EF
emp.dispatch.social.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u793E\u4FDD\u6237\u7684\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u6700\u9AD8\u57FA\u6570
emp.dispatch.fund.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u516C\u79EF\u91D1\u6237\u7684\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u6700\u9AD8\u57FA\u6570
emp.dispatch.fund.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u516C\u79EF\u91D1\u6237\u7684\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u6700\u9AD8\u57FA\u6570
emp.dispatch.social.base.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5907\u6848\u57FA\u6570\u4E0E\u793E\u4FDD\u4EFB\u610F\u57FA\u6570\u4E0D\u4E00\u81F4\uFF0C\u59D4\u6258\u5907\u6CE8\u5FC5\u586B
emp.dispatch.social.date.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u9669\u79CD\u8D77\u7F34\u65E5\u671F\u4E0D\u4E00\u81F4\u65F6\uFF0C\u201C\u59D4\u6258\u5907\u6CE8\u201D\u5217\u5FC5\u586B\uFF0C\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.social.date.limit.error2=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5408\u540C\u8D77\u7F34\u65E5\u671F\u4E0E\u793E\u4FDD\u8D77\u7F34\u65E5\u671F\u4E0D\u4E00\u81F4\u65F6\uFF0C\u201C\u59D4\u6258\u5907\u6CE8\u201D\u5217\u5FC5\u586B\uFF0C\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.social.date.limit.error2=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5408\u540C\u8D77\u59CB\u65E5\u671F\u4E0E\u793E\u4FDD\u8D77\u7F34\u65E5\u671F\u4E0D\u4E00\u81F4\u65F6\uFF0C\u201C\u59D4\u6258\u5907\u6CE8\u201D\u5217\u5FC5\u586B\uFF0C\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.social.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u201C\u8D77\u7F34\u65E5\u671F\u201D\u8D85\u51FA\u793E\u4FDD\u6237\u53EF\u8865\u7F34\u7684\u6708\u4EFD\uFF0C\u8BF7\u4FEE\u6539
emp.dispatch.fund.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u201C\u8D77\u7F34\u65E5\u671F\u201D\u8D85\u51FA\u516C\u79EF\u91D1\u6237\u53EF\u8865\u7F34\u7684\u6708\u4EFD\uFF0C\u8BF7\u4FEE\u6539
emp.dispatch.emp.contract.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5408\u540C\u8D77\u59CB\u65F6\u95F4\u3001\u5408\u540C\u7C7B\u578B\u3001\u7B7E\u8BA2\u671F\u9650\u5FC5\u586B\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.emp.contract.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u672A\u627E\u5230\u6709\u6548\u7684\u5408\u540C\u4FE1\u606F\uFF0C\u6B64\u5904\u5408\u540C\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A\uFF0C\u5177\u4F53\u8BF7\u53C2\u8003\u201C\u64CD\u4F5C\u8BF4\u660E\u201D\u586B\u5199\u5B8C\u6574
emp.dispatch.emp.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u672A\u627E\u5230\u4EBA\u5458\u7684\u9879\u76EE\u6863\u6848\u4FE1\u606F\uFF0C\u8BF7\u6309\u7167\u201C\u64CD\u4F5C\u8BF4\u660E\u201D\u5C06\u201C\u6863\u6848\u201D\u53CA\u201C\u5408\u540C\u4FE1\u606F\u201D\u8865\u5145\u5B8C\u6574
......
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