Commit 43e88fd2 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/master'

parents 22fb384a e875c75d
......@@ -1793,8 +1793,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//存在社保缴费数据
if (null != payExists && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
BigDecimalUtils.isNullToZero(infoVo.getUnitMedicalMoney()),
BigDecimalUtils.isNullToZero(infoVo.getPersonalMedicalMoney())),
BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()),
BigDecimalUtils.isNullToZero(infoVo.getUnitMoney())),
BigDecimalUtils.isNullToZero(payExists.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0) {
errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+ "的单位工伤缴费数据,请勿重复导入!"));
......
......@@ -56,6 +56,11 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
*/
@Override
public List<TSocialfundHouseRes> getexportList(TSocialfundHouseRes searchVo) {
if (!Common.isNotNull(searchVo.getHouseNameType())) {
searchVo.setAuthType(CommonConstants.ZERO_STRING);
} else if (CommonConstants.ZERO_STRING.equals(searchVo.getHouseNameType())){
searchVo.setAuthType(CommonConstants.ONE_STRING);
}
return baseMapper.getexportList(searchVo);
}
......
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