Commit 25a06649 authored by fangxinjiang's avatar fangxinjiang

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

parents 708a6837 9f0b9672
......@@ -116,7 +116,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
EkpSocialInfo socialCount;
//获取社保订单明细合计
EkpSocialSumInfoVo socialSumInfo = baseMapper.getCostSumInfo(idCard, month);
EkpSocialSumInfoVo socialSumInfo = baseMapper.getCostSumInfo(idCard, dateStringInsert(month));
//预估单位合计
BigDecimal ygDwSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYgDwSum());
//实缴单位合计
......@@ -266,23 +266,23 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
socialInfoList.add(socialInfo);
//金额累加
//预估单位合计
ygDwSum = ygDwSum.add(BigDecimal.valueOf(socialInfo.getFd_3adfeb4e8064a8()));
ygDwSum = ygDwSum.add(Common.isEmpty(socialInfo.getFd_3adfeb4e8064a8()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3adfeb4e8064a8()));
//实缴单位合计
sjDwSum = sjDwSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f2e9208e4e()));
sjDwSum = sjDwSum.add(Common.isEmpty(socialInfo.getFd_3af9f2e9208e4e()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f2e9208e4e()));
//实缴个人合计
sjPersonSum = sjPersonSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f303037214()));
sjPersonSum = sjPersonSum.add(Common.isEmpty(socialInfo.getFd_3af9f303037214()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f303037214()));
//预估合计
ygSum = ygSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f2883941b4()));
ygSum = ygSum.add(Common.isEmpty(socialInfo.getFd_3af9f2883941b4()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f2883941b4()));
//预估个人合计
ygPersonSum = ygPersonSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f285ee1e38()));
ygPersonSum = ygPersonSum.add(Common.isEmpty(socialInfo.getFd_3af9f285ee1e38()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f285ee1e38()));
//实缴合计
sjSum = sjSum.add(BigDecimal.valueOf(socialInfo.getFd_3af9f3059e5b9c()));
sjSum = sjSum.add(Common.isEmpty(socialInfo.getFd_3af9f3059e5b9c()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3af9f3059e5b9c()));
//应收
ys = ys.add(BigDecimal.valueOf(socialInfo.getFd_3adfeb7b624f06()));
ys = ys.add(Common.isEmpty(socialInfo.getFd_3adfeb7b624f06()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3adfeb7b624f06()));
//个人应收
personYs = personYs.add(BigDecimal.valueOf(socialInfo.getFd_3b35a57aee1428()));
personYs = personYs.add(Common.isEmpty(socialInfo.getFd_3b35a57aee1428()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3b35a57aee1428()));
//单位应收
dwYs = dwYs.add(BigDecimal.valueOf(socialInfo.getFd_3b35a57b6e9d0a()));
dwYs = dwYs.add(Common.isEmpty(socialInfo.getFd_3b35a57b6e9d0a()) ? BigDecimal.ZERO : BigDecimal.valueOf(socialInfo.getFd_3b35a57b6e9d0a()));
if (CommonConstants.ZERO_STRING.equals(socialParam.getYgFlag())) {
stringBuilder.append(socialParam.getSocialIds()).append(",");
......
......@@ -691,7 +691,8 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
socialInfo.setDispatchId(disExist.getId());
}
// 加流程进展明细
tAuditInfoService.doSaveAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user, CommonConstants.TWO_STRING);
tAuditInfoService.doSaveAuditInfo(socialInfo, handleRemark, handleRemark, handleRemark, user
, CommonConstants.ONE_STRING);
return R.ok("成功");
} else {
return R.failed("状态未变更,请刷新后查看列表状态!");
......
......@@ -528,8 +528,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
List<String> list2 = list.stream().map(PersonVo::getUid).collect(Collectors.toList());
List<String> collect = list1.stream().filter(s -> !list2.contains(s)
).collect(Collectors.toList());
log.error("要重置为不可用的用户列表:" + collect);
if (!collect.isEmpty()) {
log.error("要重置为不可用的用户列表:" + collect);
LambdaUpdateWrapper<SysUser> settleUpdate = new LambdaUpdateWrapper<>();
settleUpdate.in(SysUser::getUsername, collect)
.set(SysUser::getDelFlag, CommonConstants.ONE_STRING);
......
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