|
|
@ -26,6 +26,7 @@ |
|
|
|
package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
@ -51,10 +52,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Comparator; |
|
|
|
import java.util.List; |
|
|
|
import java.util.TreeSet; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
@ -383,6 +381,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi |
|
|
|
if (collList.isEmpty()) { |
|
|
|
collList = baseMapper.selectPageList(qw, ""); |
|
|
|
for (FinSelectReceivablesDetailedVo record : collList) { |
|
|
|
record.setConfirmDate(DateUtil.today()); |
|
|
|
BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney()); |
|
|
|
BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney()); |
|
|
|
if (currentMoney.compareTo(BigDecimal.ZERO) <= 0) { |
|
|
@ -422,6 +421,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi |
|
|
|
} |
|
|
|
} else { |
|
|
|
for (FinSelectReceivablesDetailedVo record : collList) { |
|
|
|
record.setConfirmDate(DateUtil.today()); |
|
|
|
BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney()); |
|
|
|
BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney()); |
|
|
|
if (currentMoney.compareTo(BigDecimal.ZERO) <= 0) { |
|
|
|