Commit 13292350 authored by fangxinjiang's avatar fangxinjiang

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

parents 15d17512 64e3aa78
...@@ -7236,9 +7236,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -7236,9 +7236,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//根据结算单号获取明细id和结算状态 //根据结算单号获取明细id和结算状态
viewVoList = ekpSettleService.selectViewBySettleNo(vo.getSettleNo(),vo.getPayFlag()); viewVoList = ekpSettleService.selectViewBySettleNo(vo.getSettleNo(),vo.getPayFlag());
if (!viewVoList.isEmpty()) { if (!viewVoList.isEmpty()) {
String insuranceId;
for (EkpInsuranceViewVo viewVo : viewVoList) { for (EkpInsuranceViewVo viewVo : viewVoList) {
//获取所有的明细id //获取所有的明细id
detail = baseMapper.selectById(viewVo.getId()); insuranceId = viewVo.getId().substring(0,19);
detail = baseMapper.selectById(insuranceId);
if (Common.isNotNull(detail)) { if (Common.isNotNull(detail)) {
//判断是收入还是支出结算单号 //判断是收入还是支出结算单号
if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) { if (CommonConstants.ZERO_STRING.equals(vo.getPayFlag())) {
......
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