PC金融款项确认接口

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java

@@ -98,4 +98,8 @@ public class FinCollectionConfirmationVo implements Vo {
     @ApiModelProperty("是否有撤回按钮")
     private boolean recallAtn;
     private String createBySid;
+
+    @ApiModelProperty("是否金融认款")
+    private boolean loan;
+    private String source;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/AppFinUncollectedReceivablesDetailedRskVo.java

@@ -43,4 +43,6 @@ public class AppFinUncollectedReceivablesDetailedRskVo implements Vo {
     private int subscribedOf;
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;
+    @ApiModelProperty("剩余未收")
+    private BigDecimal residueMoney;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/rsk/FinSelectedReceivablesDetailedRsk.java

@@ -34,4 +34,6 @@ public class FinSelectedReceivablesDetailedRsk {
     @ApiModelProperty("认款金额")
     @NotBlank(message = "认款金额不能为空")
     private String subscriptionMoney; // 认款金额
+    private String noReceivableMoney; //剩余未收
+    private String auditState;
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -107,6 +107,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -275,6 +276,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         IPage<FinCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw);
         List<FinCollectionConfirmationVo> records = pagging.getRecords();
         for (FinCollectionConfirmationVo record : records) {
+            if (StringUtils.isNotBlank(record.getSource())) {
+                if (record.getSource().equals("02")) {
+                    record.setLoan(true);
+                } else {
+                    record.setLoan(false);
+                }
+            } else {
+                record.setLoan(false);
+            }
             //是否有余额
             if (StringUtils.isNotBlank(record.getBalance())) {
                 //余额是0
@@ -3523,6 +3533,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
                             rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark());
                         }
+                        String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyRsk(receivablesSid);
+                        if (StringUtils.isNotBlank(noReturnMoney)) {
+                            rsk.setNoReceivableMoney(noReturnMoney);
+                        }
                     }
                 } else {
                     FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(receivablesSid);
@@ -3534,13 +3548,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             if (StringUtils.isNotBlank(data.getVinNo()) && StringUtils.isNotBlank(data.getVehMark())) {
                                 rsk.setVinNo(data.getVinNo() + "/" + data.getVehMark());
                             }
+                            String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid);
+                            if (StringUtils.isNotBlank(noReturnMoney)) {
+                                rsk.setNoReceivableMoney(noReturnMoney);
+                            }
                         }
                     }
                 }
+                rsk.setCurrentReceivableMoney(v.getCurrentReceivableMoney());
                 rsk.setReceivablesName(v.getReceivablesName());
                 rsk.setSid(v.getSid());
                 rsk.setSubscriptionMoney(v.getSubscriptionMoney());
                 rsk.setReceivablesSid(v.getReceivablesSid());
+                rsk.setAuditState(String.valueOf(v.getAuditState()));
                 rskList.add(rsk);
             });
         }
@@ -3655,13 +3675,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         baseMapper.updateById(confirmation);
 
         //===========================================
-        List<BaseVehicleStateDto> dtoList = new ArrayList<>();
         //查询该申请下的所有待审核的款项明细
-
         BigDecimal subscriptionMoneyAll = new BigDecimal("0");
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
         if (finSelectedReceivablesDetailedVos.size() > 0) {
-            if (confirmation.getPushMessgae() == 1) {//简易订单定金
             finSelectedReceivablesDetailedVos.stream().forEach(v -> {
                 //已选款项明细sid
                 String selectSid = v.getSid();
@@ -3672,67 +3689,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
                 finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
             });
-            } else {
-                finSelectedReceivablesDetailedVos.stream().forEach(v -> {
-                    //已选款项明细sid
-                    String selectSid = v.getSid();
-                    //应收未收款项明细sid
-                    String receivablesSid = v.getReceivablesSid();
-                    FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
-                    if (v.getSubscribedOf() == 0) {
-                        //更新认款状态
-                        finUncollectedReceivablesDetailed.setSubscriptionState(finUncollectedReceivablesDetailed.getCurrentReceivableMoney().compareTo(BigDecimal.ZERO) == 0 ? 3 : 2);
-                        finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
-                    }
-                    FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
-                    //更新已选款项明细的审核状态1待审核/2已驳回/3已审核
-                    finSelectedReceivablesDetailed.setAuditState(3);
-                    //更新审核时间
-                    finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
-                    finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
-                    //加装配置手续费推送开票管理
-                    finSelectedReceivablesDetailedService.tskpgl(v);
-                    //ToDo:查询是否符合待出库的条件
-                    //该合同编号下的该车架号的所有认款金额
-                    if ("2".equals(finUncollectedReceivablesDetailed.getPayTypeKey())) {
-                        List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin1(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
-                        BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        List<FinUncollectedReceivablesDetailed> unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid1(finUncollectedReceivablesDetailed.getBusVinSid());
-                        BigDecimal unDecimalVinAll = unList.stream().map(FinUncollectedReceivablesDetailed::getReveivableMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        //查询该合同编号下的销售订单的单车成交价
-                        BigDecimal leftAll = unDecimalVinAll;
-                        BigDecimal rightAll = bigDecimalVinAll;
-                        if (leftAll.compareTo(rightAll) <= 0) {
-                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
-                            baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                            dtoList.add(baseVehicleStateDto);
-                        }
-                    } else {
-                        List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
-                        BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        List<FinUncollectedReceivablesDetailed> unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                        BigDecimal unDecimalVinAll = unList.stream().map(FinUncollectedReceivablesDetailed::getReveivableMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
-                        //查询该合同编号下的销售订单的单车成交价
-                        BigDecimal leftAll = unDecimalVinAll;
-                        BigDecimal rightAll = bigDecimalVinAll;
-                        if (leftAll.compareTo(rightAll) <= 0) {
-                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
-                            baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                            dtoList.add(baseVehicleStateDto);
-                        }
-                    }
-
-                });
-            }
             //查询该申请已认款金额总数
             subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
         }
-
         confirmation = fetchBySid(sid);
-      /*  //与收款金额作比较：更新认款状态  1未认款/2部分认款/3已认款
-        confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) <= 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);*/
         //更新收款申请的余额以及审核状态
         BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll);
         confirmation.setBalance(balanceBigDecimal);
@@ -3744,21 +3704,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         confirmation.setConfirmDate(DateUtil.today());
         confirmation.setConfirmNameSid(userSid);
         baseMapper.updateById(confirmation);
-
-        try {
-            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                    .setNameFormat("demo-pool-%d").build();
-            ExecutorService pool = new ThreadPoolExecutor(2, 100,
-                    0L, TimeUnit.MILLISECONDS,
-                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-            FinCollectionConfirmation finalConfirmation = confirmation;
-            Future future1 = pool.submit(() -> {
-                pushLoanDiff(finalConfirmation);
-            });
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
         return rb.success().setMsg("款项确认成功");
     }
 
@@ -4112,12 +4057,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 for (AppFinUncollectedReceivablesDetailedRskVo r : ruleList) {
                     if (r.getProjectName().equals("月还") || r.getProjectName().equals("资方逾期利息")) {
                         if (Integer.valueOf(r.getPeriod()) < Integer.valueOf(v.getPeriod())) {
+                            List<AppFinSelectedReceivablesDetailedRskDto> collect = finSelectedReceivablesDetailedDtos.stream().filter(new Predicate<AppFinSelectedReceivablesDetailedRskDto>() {
+                                @Override
+                                public boolean test(AppFinSelectedReceivablesDetailedRskDto d) {
+                                    if (d.getPeriod().equals(r.getPeriod()) && d.getLoanContractNo().equals(r.getLoanContractNo()) && d.getVin().equals(r.getVin())) {
+                                        return true;
+                                    }
+                                    return false;
+                                }
+                            }).collect(Collectors.toList());
+                            if (collect.isEmpty()) {
                                 return rb.setMsg("您的认款顺序与公司认款规则不一致");
                             }
                         }
                     }
                 }
             }
+        }
         //汇款确认书保存
         List<String> payConfirmFiles = dto.getPayConfirmFiles();
         if (payConfirmFiles.size() > 0) {
@@ -4159,6 +4115,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             if (null != v.getConfirmMoney()) {
                 finSelectedReceivablesDetailed.setSubscriptionMoney(v.getConfirmMoney());
             }
+            if (null != v.getNoReceivable()) {
+                finSelectedReceivablesDetailed.setCurrentReceivableMoney(v.getNoReceivable());
+            }
             finSelectedReceivablesDetailed.setReceivablesSid(v.getReceivablesSid());
             finSelectedReceivablesDetailed.setCollSid(finalSid);
             finSelectedReceivablesDetailed.setUseOrgSid(finalUseOrgSid);
@@ -4240,7 +4199,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             }
                             String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyRsk(receivablesSid);
                             if (StringUtils.isNotBlank(noReturnMoney)) {
-                                rsk.setNoReceivable(new BigDecimal(noReturnMoney));
+                                rsk.setResidueMoney(new BigDecimal(noReturnMoney));
                             }
                         }
                     } else {
@@ -4255,7 +4214,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 }
                                 String noReturnMoney = finUncollectedReceivablesDetailedJRService.selNoReturnMoneyJR(busSid);
                                 if (StringUtils.isNotBlank(noReturnMoney)) {
-                                    rsk.setNoReceivable(new BigDecimal(noReturnMoney));
+                                    rsk.setResidueMoney(new BigDecimal(noReturnMoney));
                                 }
                             }
                         }
@@ -4268,6 +4227,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                     rsk.setProjectName(v.getReceivablesName());
 //                    rsk.setSid(v.getSid());
+                    rsk.setNoReceivable(new BigDecimal(v.getCurrentReceivableMoney()));
                     rsk.setConfirmMoney(v.getSubscriptionMoney());
                     rsk.setReceivablesSid(v.getReceivablesSid());
                     rskList.add(rsk);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistory.java

@@ -50,4 +50,6 @@ public class LoanRepaymentHistory extends BaseEntity {
     private String updateState;
     @ApiModelProperty("更新时间")
     private Date updateTime;
+    @ApiModelProperty("收款单据编号")
+    private String skdBillNo;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentDetailsListQuery.java

@@ -47,9 +47,9 @@ public class RepaymentDetailsListQuery implements Query {
     @ApiModelProperty("还款方式key")
     private String returnWayKey;
     @ApiModelProperty("更新开始日期")
-    private String updateStartTime;
+    private String updateStartDate;
     @ApiModelProperty("更新结束日期")
-    private String updateEndTime;
+    private String updateEndDate;
     @ApiModelProperty("更新状态")
     private String updateState;
     @ApiModelProperty("财务收款单据编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyDto.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.api.loantransferpaymentapply;
 
 import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -22,6 +23,12 @@ public class LoanTransferPaymentApplyDto implements Dto {
     private String applyDate;
     private String remarks;
     private String orgPath;
+    @ApiModelProperty("财务付款形式")
+    private String payForm;
+    @ApiModelProperty("01按资方合同编号单笔付款/02按收款账号合并付款")
+    private String payFormKey;
+    @ApiModelProperty("打款时需要备注内容")
+    private String payRemarks;
     private List<LoanTransferPaymentApplyFile> files = new ArrayList<>();
     private List<LoanTransferPaymentRecordVo> records = new ArrayList<>();
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyInit.java

@@ -28,6 +28,12 @@ public class LoanTransferPaymentApplyInit implements Vo {
     private String taskId;
     @ApiModelProperty("实例id")
     private String instanceId;
+    @ApiModelProperty("财务付款形式")
+    private String payForm;
+    @ApiModelProperty("01按资方合同编号单笔付款/02按收款账号合并付款")
+    private String payFormKey;
+    @ApiModelProperty("打款时需要备注内容")
+    private String payRemarks;
     private List<LoanTransferPaymentApplyFile> files = new ArrayList<>();
     private List<LoanTransferPaymentRecordVo> records = new ArrayList<>();
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentRecordVo.java

@@ -43,13 +43,5 @@ public class LoanTransferPaymentRecordVo {
     @ApiModelProperty("转付账户账号")
     private String accountNumber;
     private String vinNo;
-//    @ApiModelProperty("还款方式")
-//    private String returnWay;
-//    @ApiModelProperty("应还日期")
-//    private String dueDate;
-//    @ApiModelProperty("应还金额")
-//    private String dueMoney;
-    //    @ApiModelProperty("本期未还金额")
-//    private String outstandingMoney;
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -267,11 +267,12 @@
         h.actualDate,
         h.actualMoney,
         h.returnWay,
-        h.dataTime,
+        date_format(h.dataTime, '%Y-%m-%d') as dataTime,
-        h.updateTime,
+        date_format(h.updateTime, '%Y-%m-%d') as updateTime,
         h.updateState,
         h.buckle,
-        h.closingDate
+        date_format(h.closingDate, '%Y-%m-%d') as closingDate,
+        h.skdBillNo as billNo
         FROM loan_repayment_history as h
         LEFT JOIN loan_repayment_plan_details as p ON h.planDetailSid = p.sid
         <where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -833,7 +833,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getType())) {
             String type = pagerQuery.getType();
             if (type.equals("0")) {
-                qw.ne("h.paymentStateKey", "003");
+                qw.eq("h.paymentStateKey", "001").or().eq("h.paymentStateKey", "002");
             } else if (type.equals("1")) {
                 qw.eq("h.paymentStateKey", "003");
             }
@@ -914,12 +914,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             return p;
         }
         //=======================
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
+            qw.like("a.useOrgName", pagerQuery.getUseOrgName());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
             qw.like("a.vinNo", pagerQuery.getVinNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getDept())) {
             qw.like("a.dept", pagerQuery.getDept());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getReturnState())) {
+            qw.eq("a.returnState", pagerQuery.getReturnState());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
             qw.like("a.staffName", pagerQuery.getStaffName());
         }
@@ -977,7 +983,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                             cal_1.add(Calendar.DAY_OF_MONTH, -1);
                             record.setUpdateDate(sdf.format(cal_1.getTime()));
                         } else {
-                            record.setUpdateDate(updateTime);
+                            record.setUpdateDate(sdf.format(updateTimeParse));
                         }
                         for (String time : updateTimes) {
                             Date parseTime = sdf.parse(time);
@@ -1021,6 +1027,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             records = records.stream().filter(new Predicate<RepaymentStatisticsVo>() {
                 @Override
                 public boolean test(RepaymentStatisticsVo v) {
+                    if (StringUtils.isNotBlank(v.getUpdateDate())) {
                         if (StringUtils.isNotBlank(pagerQuery.getUpdateStartDate()) && StringUtils.isBlank(pagerQuery.getUpdateEndDate())) {
                             String updateStartDate = pagerQuery.getUpdateStartDate();
                             try {
@@ -1057,6 +1064,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                                 e.printStackTrace();
                             }
                         }
+                    }
                     return false;
                 }
             }).collect(Collectors.toList());
@@ -1113,9 +1121,15 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
             qw.like("p.vinNo", pagerQuery.getVinNo());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
+            qw.like("p.useOrgName", pagerQuery.getUseOrgName());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getDept())) {
             qw.like("p.dept", pagerQuery.getDept());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getReturnWayKey())) {
+            qw.like("h.returnWayKey", pagerQuery.getReturnWayKey());
+        }
         if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
             qw.like("p.staffName", pagerQuery.getStaffName());
         }
@@ -1137,6 +1151,12 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) {
             qw.like("p.borrowerName", pagerQuery.getBorrowerName());
         }
+        if (StringUtils.isNotBlank(pagerQuery.getBillNo())) {
+            qw.like("h.skdBillNo", pagerQuery.getBillNo());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getUpdateState())) {
+            qw.eq("h.updateState", pagerQuery.getUpdateState());
+        }
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
         qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
@@ -1157,8 +1177,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (h.closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(closingEndDate), "date_format (h.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
                 );
-        String updateStartTime = pagerQuery.getUpdateStartTime();
+        String updateStartTime = pagerQuery.getUpdateStartDate();
-        String updateEndTime = pagerQuery.getUpdateEndTime();
+        String updateEndTime = pagerQuery.getUpdateEndDate();
         qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (h.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(updateEndTime), "date_format (h.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')"
                 );
@@ -1184,37 +1204,37 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
         privilegeQuery.setUserSid(pagerQuery.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-//        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-//            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-//            String orgSidPath = pagerQuery.getOrgPath();
+            String orgSidPath = pagerQuery.getOrgPath();
-//            orgSidPath = orgSidPath + "/";
+            orgSidPath = orgSidPath + "/";
-//            int i1 = orgSidPath.indexOf("/");
+            int i1 = orgSidPath.indexOf("/");
-//            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
-//            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
-//            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
-//            String orgLevelKey = defaultIdReltBean.getData();
+            String orgLevelKey = defaultIdReltBean.getData();
-//            if ("1".equals(orgLevelKey)) {
+            if ("1".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, i1);
+                orgSidPath = orgSidPath.substring(0, i1);
-//                qw.like("a.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
-//            } else if ("2".equals(orgLevelKey)) {
+            } else if ("2".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, i2);
+                orgSidPath = orgSidPath.substring(0, i2);
-//                qw.like("a.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
-//            } else if ("3".equals(orgLevelKey)) {
+            } else if ("3".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, i3);
+                orgSidPath = orgSidPath.substring(0, i3);
-//                qw.like("a.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
-//            } else if ("4".equals(orgLevelKey)) {
+            } else if ("4".equals(orgLevelKey)) {
-//                orgSidPath = orgSidPath.substring(0, i4);
+                orgSidPath = orgSidPath.substring(0, i4);
-//                qw.like("a.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
-//            } else if ("5".equals(orgLevelKey)) {
+            } else if ("5".equals(orgLevelKey)) {
-//                qw.eq("a.createBySid", pagerQuery.getUserSid());
+                qw.eq("a.createBySid", pagerQuery.getUserSid());
-//            } else {
+            } else {
-//                List<RepaymentStatisticsExportVo> p = new ArrayList<>();
+                List<RepaymentStatisticsExportVo> p = new ArrayList<>();
-//                return p;
+                return p;
-//            }
+            }
-//        } else {
+        } else {
-//            List<RepaymentStatisticsExportVo> p = new ArrayList<>();
+            List<RepaymentStatisticsExportVo> p = new ArrayList<>();
-//            return p;
+            return p;
-//        }
+        }
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
             qw.like("a.vinNo", pagerQuery.getVinNo());
         }

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

@@ -29,7 +29,7 @@ public class UncollectedReceivablesDetailedRskVo implements Vo {
     private String confirmDate;
     @ApiModelProperty("认款状态")
     private String state;
-    @ApiModelProperty("未收金额")
+    @ApiModelProperty("当前未收金额")
     private BigDecimal noReceivable;
     @ApiModelProperty("贷款人")
     private String borrowerName;
@@ -43,4 +43,6 @@ public class UncollectedReceivablesDetailedRskVo implements Vo {
     private int subscribedOf;
     @ApiModelProperty("采购系统sid")
     private String purchaseSystemSid;
+    @ApiModelProperty("剩余未收")
+    private BigDecimal residueMoney;
 }