Commit 6dd6dcff authored by fangxinjiang's avatar fangxinjiang

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

parents cf2bd3aa 3a0d2593
...@@ -107,4 +107,11 @@ public class ProjectSetInfoVo implements Serializable { ...@@ -107,4 +107,11 @@ public class ProjectSetInfoVo implements Serializable {
@Schema(description = "是否BPO", name = "bpoFlag") @Schema(description = "是否BPO", name = "bpoFlag")
@ExcelIgnore @ExcelIgnore
private String bpoFlag; private String bpoFlag;
/**
* MVP1.7.11 增加: 服务项目
*/
@Schema(description = "服务项目", name = "serverItem")
@ExcelIgnore
private String serverItem;
} }
...@@ -492,7 +492,8 @@ ...@@ -492,7 +492,8 @@
a.STOP_FLAG, a.STOP_FLAG,
a.INVOICE_TITLE_SALARY, a.INVOICE_TITLE_SALARY,
a.INVOICE_TITLE_INSURANCE, a.INVOICE_TITLE_INSURANCE,
a.BPO_FLAG a.BPO_FLAG,
a.SERVER_ITEM
FROM t_settle_domain a FROM t_settle_domain a
where a.DELETE_FLAG = '0' where a.DELETE_FLAG = '0'
<if test="codes != null and codes.size() > 0"> <if test="codes != null and codes.size() > 0">
......
...@@ -492,7 +492,6 @@ public class Common { ...@@ -492,7 +492,6 @@ public class Common {
* @Date 2019-09-26 * @Date 2019-09-26
**/ **/
public static BigDecimal formatMoneyForFund(BigDecimal money, int type) { public static BigDecimal formatMoneyForFund(BigDecimal money, int type) {
DecimalFormat formater = new DecimalFormat("#0.#");
if (type == 1) {//四舍五入取整 if (type == 1) {//四舍五入取整
return BigDecimal.valueOf(money.doubleValue()).setScale(0, RoundingMode.HALF_UP); return BigDecimal.valueOf(money.doubleValue()).setScale(0, RoundingMode.HALF_UP);
} }
...@@ -508,6 +507,11 @@ public class Common { ...@@ -508,6 +507,11 @@ public class Common {
if (type == 5) {//保留一位小数 if (type == 5) {//保留一位小数
return BigDecimal.valueOf(money.doubleValue()).setScale(1, RoundingMode.HALF_UP); return BigDecimal.valueOf(money.doubleValue()).setScale(1, RoundingMode.HALF_UP);
} }
if (type == 6) {//见分进元
return BigDecimal.valueOf(Math.ceil(BigDecimal.valueOf(money.doubleValue())
.setScale(2, RoundingMode.HALF_DOWN).doubleValue()))
.setScale(0, BigDecimal.ROUND_UP);
}
return money; return money;
} }
......
...@@ -52,6 +52,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo; ...@@ -52,6 +52,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -2837,6 +2838,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2837,6 +2838,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult.add(param); listResult.add(param);
continue; continue;
}else { }else {
// MVP1.7.11:校验户是否在服务项里
// 获取项目的服务项
if (Common.isEmpty(projectSetInfoVo.getServerItem())){
param.setErrorMessage("项目未维护服务项目,请联系管理员");
listResult.add(param);
continue;
}
String[] serverItemArr = projectSetInfoVo.getServerItem().split("、");
// 服务项校验
if (!ArrayUtils.contains(serverItemArr, "商险")) {
param.setErrorMessage("该项目未勾选 商险 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试");
listResult.add(param);
continue;
}
//对应的项目编码已停止合作 //对应的项目编码已停止合作
if (CommonConstants.ONE_STRING.equals(projectSetInfoVo.getStopFlag()) || if (CommonConstants.ONE_STRING.equals(projectSetInfoVo.getStopFlag()) ||
CommonConstants.TWO_STRING.equals(projectSetInfoVo.getStopFlag())){ CommonConstants.TWO_STRING.equals(projectSetInfoVo.getStopFlag())){
...@@ -3172,6 +3188,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3172,6 +3188,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult.add(param); listResult.add(param);
continue; continue;
}else { }else {
// MVP1.7.11:校验户是否在服务项里
// 获取项目的服务项
if (Common.isEmpty(projectSetInfoVo.getServerItem())){
param.setErrorMessage("项目未维护服务项目,请联系管理员");
listResult.add(param);
continue;
}
String[] serverItemArr = projectSetInfoVo.getServerItem().split("、");
// 服务项校验
if (!ArrayUtils.contains(serverItemArr, "商险")) {
param.setErrorMessage("该项目未勾选 商险 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试");
listResult.add(param);
continue;
}
//对应的项目编码已停止合作 //对应的项目编码已停止合作
if (CommonConstants.ONE_STRING.equals(projectSetInfoVo.getStopFlag()) || if (CommonConstants.ONE_STRING.equals(projectSetInfoVo.getStopFlag()) ||
CommonConstants.TWO_STRING.equals(projectSetInfoVo.getStopFlag())){ CommonConstants.TWO_STRING.equals(projectSetInfoVo.getStopFlag())){
...@@ -3606,6 +3636,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3606,6 +3636,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult.add(param); listResult.add(param);
continue; continue;
}else { }else {
// MVP1.7.11:校验户是否在服务项里
// 获取项目的服务项
if (Common.isEmpty(projectSetInfoVo.getServerItem())){
param.setErrorMessage("项目未维护服务项目,请联系管理员");
listResult.add(param);
continue;
}
String[] serverItemArr = projectSetInfoVo.getServerItem().split("、");
// 服务项校验
if (!ArrayUtils.contains(serverItemArr, "商险")) {
param.setErrorMessage("该项目未勾选 商险 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试");
listResult.add(param);
continue;
}
//对应的替换员工项目编码已停止合作 //对应的替换员工项目编码已停止合作
if (CommonConstants.ONE_STRING.equals(projectSetInfoVo.getStopFlag()) || if (CommonConstants.ONE_STRING.equals(projectSetInfoVo.getStopFlag()) ||
CommonConstants.TWO_STRING.equals(projectSetInfoVo.getStopFlag())){ CommonConstants.TWO_STRING.equals(projectSetInfoVo.getStopFlag())){
......
...@@ -72,6 +72,7 @@ import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil; ...@@ -72,6 +72,7 @@ import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
import com.yifu.cloud.plus.v1.yifu.social.vo.*; import com.yifu.cloud.plus.v1.yifu.social.vo.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang.ArrayUtils;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Sheet;
import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType; import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
...@@ -512,8 +513,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -512,8 +513,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(empVoMap)) { if (Common.isNotNull(empVoMap)) {
empVo = empVoMap.get(excel.getEmpIdcard()); empVo = empVoMap.get(excel.getEmpIdcard());
} }
if (Common.isNotNull(socialFund) if (Common.isNotNull(socialFund)
&& Common.isNotNull(socialFund.getSocialId()) && Common.isNotNull(socialFund.getSocialId())
&& (CommonConstants.FOUR_STRING.equals(socialFund.getSocialStatus()) && (CommonConstants.FOUR_STRING.equals(socialFund.getSocialStatus())
|| CommonConstants.TWELVE_STRING.equals(socialFund.getSocialStatus()))){ || CommonConstants.TWELVE_STRING.equals(socialFund.getSocialStatus()))){
// 部分失败 // 部分失败
...@@ -2337,6 +2338,40 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2337,6 +2338,40 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_PROJECT_NOT_FOUND))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_PROJECT_NOT_FOUND)));
return true; return true;
} }
// MVP1.7.11:校验户是否在服务项里
// 获取项目的服务项
if (Common.isEmpty(setInfoVo.getServerItem())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "项目未维护服务项目,请联系管理员"));
return true;
}
String[] serverItemArr = setInfoVo.getServerItem().split("、");
// 服务项校验
if(Common.isNotNull(excel.getSocialHousehold()) && Common.isNotNull(excel.getProvidentHousehold())){
if (!ArrayUtils.contains(serverItemArr, "社保") && !ArrayUtils.contains(serverItemArr, "公积金")) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "该项目未勾选 社保和公积金 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"));
return true;
}
if (!ArrayUtils.contains(serverItemArr, "社保")) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "该项目未勾选 社保 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"));
return true;
}
if (!ArrayUtils.contains(serverItemArr, "公积金")) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "该项目未勾选 公积金 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"));
return true;
}
} else if(Common.isNotNull(excel.getSocialHousehold())) {
if (!ArrayUtils.contains(serverItemArr, "社保")) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "该项目未勾选 社保 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"));
return true;
}
} else {
if (!ArrayUtils.contains(serverItemArr, "公积金")) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "该项目未勾选 公积金 服务项,请至EKP系统-项目查询与变更处勾选后,再次尝试"));
return true;
}
}
//对应的项目编码已停止合作 //对应的项目编码已停止合作
if (CommonConstants.ONE_STRING.equals(setInfoVo.getStopFlag()) || CommonConstants.TWO_STRING.equals(setInfoVo.getStopFlag())){ if (CommonConstants.ONE_STRING.equals(setInfoVo.getStopFlag()) || CommonConstants.TWO_STRING.equals(setInfoVo.getStopFlag())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SETTLEDOMAIN_STOP))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SETTLEDOMAIN_STOP)));
......
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