Browse Source

优化

master
dimengzhe 2 years ago
parent
commit
8cb13ae02b
  1. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java
  2. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  3. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java
  4. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java
  5. 1
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedVo.java

@ -60,4 +60,7 @@ public class FinSelectReceivablesDetailedVo implements Vo {
private String balance;
@ApiModelProperty("款项状态")
private String kxState;
@ApiModelProperty("认款申请日期")
private String confirmDate;
}

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@ -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) {

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java

@ -162,5 +162,7 @@ public class AdvanceArrearsInfoVo implements Vo {
@ApiModelProperty("是否是自营非担保")
private boolean finType;
private String modelOrgPath;
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java

@ -56,4 +56,7 @@ public class CollectedReceivablesDetailedVo implements Vo {
private String subscriptionMoney;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("认款时间")
private String confirmDate;
}

1
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@ -257,6 +257,7 @@ public class AppBusArrearsCarryVehicleApplyService {
return rb.setMsg(resultBean.getMsg());
}
BeanUtil.copyProperties(resultBean.getData(), advanceArrearsInfoVo);
advanceArrearsInfoVo.setModelOrgPath(advanceArrearsInfoVo.getOrgPath());
return rb.success().setData(advanceArrearsInfoVo);
}

Loading…
Cancel
Save