Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 1 year ago
parent
commit
6a70313ba2
  1. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java
  2. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/app/AppRepurchaseDetailsVo.java
  3. 8
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java
  4. 11
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java
  5. 62
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDto.java
  6. 30
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyQuery.java
  7. 64
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyVo.java
  8. 120
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java
  9. 5
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java
  10. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java
  11. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java
  12. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java
  13. 118
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml
  14. 81
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
  15. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java
  16. 52
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml
  17. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java
  18. 246
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
  19. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.java
  20. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.xml
  21. 36
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostService.java
  22. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.java
  23. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.xml
  24. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostService.java
  25. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.java
  26. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.xml
  27. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionService.java
  28. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repurchase/RepurchaseDetailsVo.java
  29. 120
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java
  30. 7
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repurchase/RepurchaseService.java
  31. 8
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyService.java
  32. 5
      doc/databases/risk_center.sql

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyDetailsVo.java

@ -122,8 +122,10 @@ public class LoanRepurchaseApplyDetailsVo implements Vo {
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款后需备注内容")
private String payRemarks;
private List<LoanRepurchaseApplyFile> buyfiles = new ArrayList<>(); // 回购情况附件
private String salesOrderSid;
}

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/app/AppRepurchaseDetailsVo.java

@ -17,7 +17,6 @@ public class AppRepurchaseDetailsVo {
private String sid;
private String publishInfo; // 发起部门-发起人
private String time; //申请日期
private List<String> files = new ArrayList<>();
private String taskId;
private String procInsId;
@ApiModelProperty("催收记录")
@ -103,6 +102,8 @@ public class AppRepurchaseDetailsVo {
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款后需备注内容")
private String payRemarks;
private List<String> buyfiles = new ArrayList<>(); // 回购情况附件
@ApiModelProperty("销售订单sid")
private String salesOrderSid;

8
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApply.java

@ -70,5 +70,13 @@ public class LoanSettleApply extends BaseEntity {
private String nodeState;
@ApiModelProperty("是否勾选减免,1勾选,0不勾选")
private int trueReduction;
@ApiModelProperty("01正常结清,02提前结清")
private String typeState;
@ApiModelProperty("结清类型")
private String typeStateValue;
@ApiModelProperty("预计结清日期")
private String settingDateBe;
@ApiModelProperty("业务sid")
private String busSid;
}

11
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDetailsVo.java

@ -72,6 +72,15 @@ public class LoanSettleApplyDetailsVo {
private String saleOrderSid;
@ApiModelProperty("是否勾选减免,1勾选,0不勾选")
private int trueReduction;
private boolean trueReduction;
@ApiModelProperty("预计结清日期")
private String settingDateBe;
@ApiModelProperty(value = "任务id")
private String taskId;
@ApiModelProperty(value = "流程实例id")
private String procInstId;
private String busSid;
}

62
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyDto.java

@ -1,5 +1,9 @@
package com.yxt.anrui.riskcenter.api.loansettleapply;
import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo;
import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo;
import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReductionVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -14,4 +18,62 @@ public class LoanSettleApplyDto {
private String sid;
private String userSid;
private String orgPath;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请部门sid")
private String createDeptSid;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("申请日期")
private String createTime;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("贷款人")
private String loanName;
@ApiModelProperty("贷款人sid")
private String loanSid;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("结清日期")
private String settingDate;
@ApiModelProperty("公司当前逾期月还")
private String overdueMonthPrice;
@ApiModelProperty("公司当期未到期月还")
private String currentNotDuePrice;
@ApiModelProperty("公司未到期月还")
private String notDuePrice;
@ApiModelProperty("资方结清费用")
private LoanSettleBankCostVo loanSettleBankCostVo = new LoanSettleBankCostVo();
@ApiModelProperty("公司结清费用")
private LoanSettleCompanyCostVo loanSettleCompanyCostVo = new LoanSettleCompanyCostVo();
@ApiModelProperty("公司结清费用减免情况")
private LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = new LoanSettleCompanyReductionVo();
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("销售订单车辆表sid")
private String busVinSid;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("是否勾选减免,1勾选,0不勾选")
private boolean trueReduction;
@ApiModelProperty("预计结清日期")
private String settingDateBe;
private String busSid;
}

30
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyQuery.java

@ -1,6 +1,7 @@
package com.yxt.anrui.riskcenter.api.loansettleapply;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -17,4 +18,33 @@ public class LoanSettleApplyQuery implements Query {
private String orgPath;
private String userSid;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("申请日期")
private String createTimeStart;
private String createTimeEnd;
@ApiModelProperty("办结日期")
private String closeDateStart;
private String closeDateEnd;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("贷款人")
private String loanName;
@ApiModelProperty("结清日期")
private String settingDateStart;
private String settingDateEnd;
}

64
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.riskcenter.api.loansettleapply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -13,4 +14,67 @@ public class LoanSettleApplyVo {
private String createBySid;
private boolean allowModify;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("申请日期")
private String createTime;
@ApiModelProperty("办结日期")
private String closeDate;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("贷款人")
private String loanName;
@ApiModelProperty("结清类型")
private String typeStateValue;
@ApiModelProperty("结清日期")
private String settingDate;
@ApiModelProperty("资方结清金额")
private String bankSettlePrice;
@ApiModelProperty("公司正常结清合计")
private String settleAll;
@ApiModelProperty("减免后结清合计")
private String amountTo;
@ApiModelProperty("结清利润")
private String profit;
@ApiModelProperty("流程定义id")
private String procDefId;
@ApiModelProperty("流程实例id")
private String procInstId;
private String sid;
}

120
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java

@ -1,7 +1,12 @@
package com.yxt.anrui.riskcenter.api.loansettleapply;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -9,4 +14,119 @@ import lombok.Data;
**/
@Data
public class SettleApplyAppVo {
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createTime;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("贷款人")
private String loanName;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("结清日期")
private String settingDate;
@ApiModelProperty("公司当前逾期月还")
private String overdueMonthPrice;
@ApiModelProperty("公司当期未到期月还")
private String currentNotDuePrice;
@ApiModelProperty("公司未到期月还")
private String notDuePrice;
@ApiModelProperty("实例id")
private String procInstId;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("环节id")
private String taskDefKey;
@ApiModelProperty("是否勾选减免,true勾选,false不勾选")
private boolean trueReduction;
//资方结清费用
@ApiModelProperty("资方逾期月还")
private String price;
@ApiModelProperty("资方当期未到期月还")
private String currentNotDuePriceBank;
@ApiModelProperty("资方未到期金额")
private String notDuePriceBank;
@ApiModelProperty("资方逾期利息")
private String bankInterest;
@ApiModelProperty("资方名义价")
private String bankNominalPrice;
@ApiModelProperty("资方合同违约金")
private String bankContractLiquidated;
@ApiModelProperty("资方其他应收")
private String bankOtherReceivable;
@ApiModelProperty("其他应收说明")
private String otherReceivableRemarks;
@ApiModelProperty("资方结清金额")
private String bankSettlePrice;
@ApiModelProperty("附件")
private List<String> bankFiles = new ArrayList<>();
//公司结清费用
@ApiModelProperty("贷款保证金")
private String loanDeposit;
@ApiModelProperty("公司逾期月还")
private String overduePrice;
@ApiModelProperty("垫资方逾期利息")
private String putBankInterest;
@ApiModelProperty("资金占用费")
private String funfCost;
@ApiModelProperty("资方逾期利息")
private String bankOverInterest;
@ApiModelProperty("公司当期未到期月还")
private String companyCurrentNotPrice;
@ApiModelProperty("资方未到期金额")
private String bankNotPrice;
@ApiModelProperty("贷款保证金扣罚金额")
private String deductionAmount;
@ApiModelProperty("名义价")
private String companyNominalPrice;
@ApiModelProperty("合同违约金")
private String contractLiquidated;
@ApiModelProperty("公司其他费用")
private String companyOtherPrice;
@ApiModelProperty("其他费用说明")
private String otherCostRemarks;
@ApiModelProperty("公司正常结清合计")
private String settleAll;
//减免后
@ApiModelProperty("资金占用费减免")
private String fundPenalty;
@ApiModelProperty("贷款保证金扣罚减免")
private String depositPenalty;
@ApiModelProperty("其他费用减免")
private String otherCost;
@ApiModelProperty("公司减免后结清合计")
private String amountTo;
@ApiModelProperty("结清利润")
private String profit;
@ApiModelProperty("催收记录")
private String csjlSid;
@ApiModelProperty("是否是回购过来的")
private boolean trueHg;
@ApiModelProperty("预计结清日期")
private String settingDateBe;
@ApiModelProperty("截止当前资金占用费")
private String fundAll;
}

5
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlebankcost/LoanSettleBankCostVo.java

@ -1,9 +1,12 @@
package com.yxt.anrui.riskcenter.api.loansettlebankcost;
import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
@ -31,4 +34,6 @@ public class LoanSettleBankCostVo {
private String otherReceivableRemarks;
@ApiModelProperty("资方结清金额")
private String bankSettlePrice;
private List<UrlQuery> filesList = new ArrayList<>();
}

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCost.java

@ -42,6 +42,8 @@ public class LoanSettleCompanyCost extends BaseEntity {
private String otherCostRemarks;
@ApiModelProperty("公司正常结清合计")
private BigDecimal settleAll;
@ApiModelProperty("截止当前资金占用费")
private BigDecimal fundAll;
}

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanycost/LoanSettleCompanyCostVo.java

@ -39,4 +39,7 @@ public class LoanSettleCompanyCostVo {
private String otherCostRemarks;
@ApiModelProperty("公司正常结清合计")
private String settleAll;
@ApiModelProperty("截止当前资金占用费")
private String fundAll;
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java

@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -23,4 +25,8 @@ public interface LoanRepurchaseApplyMapper extends BaseMapper<LoanRepurchaseAppl
IPage<LoanRepurchaseApplyVo> listPage(IPage<LoanRepurchaseApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanRepurchaseApply> qw);
AppRepurchaseDetailsVo appDetail(@Param("sid") String sid);
LoanRepurchaseApplyDetailsVo fetchDetailsBySid(@Param("sid") String sid);
}

118
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml

@ -28,4 +28,122 @@
${ew.sqlSegment}
</where>
</select>
<select id="appDetail"
resultType="com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo">
SELECT
a.sid,
date_format( a.applyDate, '%Y-%m-%d' ) AS `time`,
CONCAT( a.createDept, '-', a.createByName ) AS publishInfo,
a.taskId,
a.procInstId,
a.busVinSid AS csjlSid,
a.customerName AS custName,
a.bankContractNo,
a.loanName AS borrName,
a.vinNo,
a.vehMark,
a.loanContractNo,
a.bankName,
date_format( a.prepareDate, '%Y-%m-%d' ) AS prepareDate,
a.overdueMonthPrice,
a.currentNotDuePrice,
a.notDuePrice,
b.price,
b.currentNotDuePrice as currentNotDuePriceBank,
b.notDuePrice as notDuePriceBank,
b.bankInterest,
b.bankNominalPrice,
b.bankContractLiquidated,
b.bankOtherReceivable,
b.otherReceivableRemarks,
b.bankSettlePrice,
c.loanDeposit,
c.overduePrice,
c.putBankInterest,
c.funfCost,
c.bankOverInterest,
c.companyCurrentNotPrice,
c.bankNotPrice,
c.deductionAmount,
c.companyNominalPrice,
c.contractLiquidated,
c.companyOtherPrice,
c.otherCostRemarks,
c.settleAll,
c.profit,
a.amount,
a.buybacksReason,
a.bankReceivingAccount,
a.bankAccountNo,
a.payRemarks,
a.salesOrderSid
FROM
loan_repurchase_apply AS a
LEFT JOIN loan_repurchase_company_cost AS c ON a.sid = c.mainSid
LEFT JOIN loan_repurchase_cost AS b ON a.sid = b.mainSid
WHERE
a.sid = #{sid}
</select>
<select id="fetchDetailsBySid"
resultType="com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo">
SELECT
a.sid,
date_format( a.applyDate, '%Y-%m-%d' ) AS applyDate,
a.createBySid as userSid,
a.orgSidPath as orgPath,
a.createDept,
a.createDeptSid,
a.createByName,
a.taskId,
a.procInstId as instanceId,
a.busVinSid,
a.customerName,
a.bankContractNo,
a.loanName,
a.customerSid,
a.loanSid,
a.vinNo,
a.vehMark,
a.loanContractNo,
a.bankName,
date_format( a.prepareDate, '%Y-%m-%d' ) AS prepareDate,
a.overdueMonthPrice,
a.currentNotDuePrice,
a.notDuePrice,
b.price,
b.currentNotDuePrice as currentNotDuePriceBank,
b.notDuePrice as notDuePriceBank,
b.bankInterest,
b.bankNominalPrice,
b.bankContractLiquidated,
b.bankOtherReceivable,
b.otherReceivableRemarks,
b.bankSettlePrice,
c.loanDeposit,
c.overduePrice,
c.putBankInterest,
c.funfCost,
c.bankOverInterest,
c.companyCurrentNotPrice,
c.bankNotPrice,
c.deductionAmount,
c.companyNominalPrice,
c.contractLiquidated,
c.companyOtherPrice,
c.otherCostRemarks,
c.settleAll,
c.profit,
a.amount,
a.buybacksReason,
a.bankReceivingAccount,
a.bankAccountNo,
a.payRemarks,
a.salesOrderSid
FROM
loan_repurchase_apply AS a
LEFT JOIN loan_repurchase_company_cost AS c ON a.sid = c.mainSid
LEFT JOIN loan_repurchase_cost AS b ON a.sid = b.mainSid
WHERE
a.sid = #{sid}
</select>
</mapper>

81
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@ -8,15 +8,21 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanparameter.*;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyDetailsVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyQuery;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanSolutionsDetailsssVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.*;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApply;
import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyFile;
import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyQuery;
import com.yxt.anrui.riskcenter.api.loansubletapply.LoanSubletApplyVo;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -26,6 +32,11 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
/**
* @description:
@ -41,7 +52,12 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private LoanFileService loanFileService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private LoanSolutionsService loanSolutionsService;
public PagerVo<LoanRepurchaseApplyVo> listPage(PagerQuery<LoanRepurchaseApplyQuery> pq) {
IPage<LoanRepurchaseApply> page = PagerUtil.queryToPage(pq);
@ -151,15 +167,62 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
public ResultBean<LoanRepurchaseApplyDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
LoanRepurchaseApplyDetailsVo vo = new LoanRepurchaseApplyDetailsVo();
LoanRepurchaseApplyDetailsVo vo = baseMapper.fetchDetailsBySid(sid);
if (vo != null) {
//------金融方案-----------
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(vo.getSalesOrderSid());
if (solutionsDetailsVoResultBean.getData() != null) {
LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
}
List<LoanFile> fileList1 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BANKFILE.getAttachType());
fileList1.removeAll(Collections.singleton(null));
if (!fileList1.isEmpty()) {
List<String> files = fileList1.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
List<LoanRepurchaseApplyFile> applyFiles = new ArrayList<>();
for (String file : files) {
LoanRepurchaseApplyFile applyFile = new LoanRepurchaseApplyFile();
applyFile.setUrl(file);
applyFiles.add(applyFile);
}
vo.setBankfiles(applyFiles);
}
List<LoanFile> fileList2 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BACKBUYFILE.getAttachType());
fileList2.removeAll(Collections.singleton(null));
if (!fileList2.isEmpty()) {
List<String> files = fileList2.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
List<LoanRepurchaseApplyFile> applyFiles = new ArrayList<>();
for (String file : files) {
LoanRepurchaseApplyFile applyFile = new LoanRepurchaseApplyFile();
applyFile.setUrl(file);
applyFiles.add(applyFile);
}
vo.setBuyfiles(applyFiles);
}
}
return rb.success().setData(vo);
}
public ResultBean<AppRepurchaseDetailsVo> appDetail(String sid) {
ResultBean rb = ResultBean.fireFail();
AppRepurchaseDetailsVo vo = new AppRepurchaseDetailsVo();
AppRepurchaseDetailsVo vo = baseMapper.appDetail(sid);
List<LoanFile> fileList1 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BANKFILE.getAttachType());
fileList1.removeAll(Collections.singleton(null));
if (!fileList1.isEmpty()) {
List<String> files = fileList1.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setBankfiles(files);
}
List<LoanFile> fileList2 = loanFileService.selectByLinkSid(sid, LoanFileEnum.REPURCHASE_BACKBUYFILE.getAttachType());
fileList2.removeAll(Collections.singleton(null));
if (!fileList2.isEmpty()) {
List<String> files = fileList2.stream().map(c -> fileUploadComponent.getUrlPrefix() + c.getFilePath()).
collect(Collectors.toList());
vo.setBuyfiles(files);
}
return rb.success().setData(vo);
}
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.java

@ -41,4 +41,8 @@ public interface LoanSettleApplyMapper extends BaseMapper<LoanSettleApply> {
String selectGsWdq(@Param("busVinSid") String busVinSid, @Param("settingDate") String settingDate);
int selvehOverdueCount(@Param("busVinSid") String busVinSid);
String selectDk(@Param("busVinSid") String busVinSid, @Param("settingDate") String settingDate);
int updateBus(String busVinSid);
}

52
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml

@ -20,6 +20,37 @@
</update>
<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loansettleapply.LoanSettleApplyVo">
select la.sid,
la.createBySid,
if(length(la.nodeState) > 0, la.nodeState, '待提交') as nodeState,
la.useOrgName,
la.createDept,
la.createByName,
DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,
la.closeDate,
la.loanContractNo,
la.vinNo,
la.vehMark,
la.bankName,
la.bankContractNo,
la.customerName,
la.loanName,
la.typeStateValue,
la.settingDate,
la.procDefId,
la.procInstId,
lc.bankSettlePrice,
lcc.settleAll,
lr.amountTo,
lr.profit
from loan_settle_apply la
left join loan_settle_bank_cost lc on lc.mainSid = la.sid
left join loan_settle_company_cost lcc on lcc.mainSid = la.sid
left join loan_settle_company_reduction lr on lr.mainSid = la.sid
<where>
${ew.sqlSegment}
</where>
order by la.useOrgName desc, la.createTime desc, la.loanContractNo desc, la.vinNo
</select>
<select id="selectBySid" resultType="int">
@ -44,6 +75,7 @@
${ew.sqlSegment}
</where>
group by ld.busVinSid
order by ld.loanContractNo desc, ld.vinNo desc
</select>
<select id="selectByBusVinSid"
@ -99,9 +131,25 @@
AND lrpd.`busVinSid` = #{busVinSid}
</select>
<select id="selvehOverdueCount" resultType="java.lang.Integer">
SELECT COUNT(*) FROM loan_be_padsincere_veh as v
LEFT JOIN loan_be_padsincere_apply as a ON v.mainSid = a.sid
SELECT COUNT(*)
FROM loan_be_padsincere_veh as v
LEFT JOIN loan_be_padsincere_apply as a ON v.mainSid = a.sid
WHERE v.saleVehSid = #{busVinSid}
AND a.nodeState = '已办结'
</select>
<select id="selectDk" resultType="java.lang.String">
SELECT IFNULL(SUM(paymentMoney), 0)
FROM loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt;
#{settingDate}
AND lrpd.busVinSid =
#{busVinSid}
</select>
<update id="updateBus">
update anrui_buscenter.bus_sales_order_vehicle
set settleState = 1
where sid = #{busVinSid}
</update>
</mapper>

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyRest.java

@ -2,7 +2,6 @@ package com.yxt.anrui.riskcenter.biz.loansettleapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyVo;
import com.yxt.anrui.riskcenter.api.loansettleapply.*;
import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
import com.yxt.common.core.query.PagerQuery;

246
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@ -22,12 +22,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyQuery;
import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyVo;
import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
import com.yxt.anrui.riskcenter.api.loansettleapply.*;
import com.yxt.anrui.riskcenter.api.loansettleapply.flowable.*;
import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
@ -38,11 +34,15 @@ import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompany
import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReductionVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostMapper;
import com.yxt.anrui.riskcenter.biz.loansettlebankcost.LoanSettleBankCostService;
import com.yxt.anrui.riskcenter.biz.loansettlecompanycost.LoanSettleCompanyCostMapper;
import com.yxt.anrui.riskcenter.biz.loansettlecompanycost.LoanSettleCompanyCostService;
import com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction.LoanSettleCompanyReductionMapper;
import com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction.LoanSettleCompanyReductionService;
import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsMapper;
import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -57,6 +57,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
@ -93,13 +96,76 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
private LoanSolutionsMapper loanSolutionsMapper;
@Autowired
private LoanSolutionsDetailService loanSolutionsDetailService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private SysParameterFeign sysParameterFeign;
@Autowired
private LoanSettleBankCostMapper loanSettleBankCostMapper;
@Autowired
private LoanSettleCompanyCostMapper loanSettleCompanyCostMapper;
@Autowired
private LoanSettleCompanyReductionMapper loanSettleCompanyReductionMapper;
public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
LoanSettleApplyQuery query = pq.getParams();
QueryWrapper<LoanSettleApply> qw = new QueryWrapper<>();
if (query != null) {
//分公司
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("la.useOrgName", query.getUseOrgName());
}
//申请部门
if (StringUtils.isNotBlank(query.getCreateDept())) {
qw.like("la.createDept", query.getCreateDept());
}
//申请人
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("la.createByName", query.getCreateByName());
}
//办结日期
qw.apply(StringUtils.isNotBlank(query.getCloseDateStart()), "date_format (la.closeDate,'%Y-%m-%d') >= date_format('" + query.getCloseDateStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCloseDateEnd()), "date_format (la.closeDate,'%Y-%m-%d') <= date_format('" + query.getCloseDateEnd() + "','%Y-%m-%d')"
);
//申请日期
qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (la.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (la.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
);
//贷款合同编号
if (StringUtils.isNotBlank(query.getLoanContractNo())) {
qw.like("la.loanContractNo", query.getLoanContractNo());
}
//贷款人
if (StringUtils.isNotBlank(query.getLoanName())) {
qw.like("la.loanName", query.getLoanName());
}
//资方
if (StringUtils.isNotBlank(query.getBankName())) {
qw.like("la.bankName", query.getBankName());
}
//资方合同编号
if (StringUtils.isNotBlank(query.getBankContractNo())) {
qw.like("la.bankContractNo", query.getBankContractNo());
}
//客户名称
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("la.customerName", query.getCustomerName());
}
//车架号
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("la.vinNo", query.getVinNo());
}
//车牌号
if (StringUtils.isNotBlank(query.getVehMark())) {
qw.like("la.vehMark", query.getVehMark());
}
//结清日期
qw.apply(StringUtils.isNotBlank(query.getSettingDateStart()), "date_format (la.settingDate,'%Y-%m-%d') >= date_format('" + query.getSettingDateStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getSettingDateEnd()), "date_format (la.settingDate,'%Y-%m-%d') <= date_format('" + query.getSettingDateEnd() + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getMenuUrl())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
@ -161,9 +227,51 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {//新增
LoanSettleApply loanSettleApply = new LoanSettleApply();
BeanUtil.copyProperties(dto, loanSettleApply, "sid");
sid = loanSettleApply.getSid();
loanSettleApply.setCreateBySid(dto.getSid());
loanSettleApply.setOrgSidPath(dto.getOrgPath());
LoanSettleBankCostVo loanSettleBankCostVo = dto.getLoanSettleBankCostVo();
if (loanSettleBankCostVo != null) {
loanSettleBankCostService.saveCost(sid, loanSettleBankCostVo);
}
LoanSettleCompanyCostVo loanSettleCompanyCostVo = dto.getLoanSettleCompanyCostVo();
if (loanSettleCompanyCostVo != null) {
loanSettleCompanyCostService.saveCost(sid, loanSettleCompanyCostVo);
}
LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = dto.getLoanSettleCompanyReductionVo();
if (loanSettleCompanyReductionVo != null) {
loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo);
}
if (StringUtils.isNotBlank(dto.getBusSid())) {
loanSettleApply.setTypeState("02");
loanSettleApply.setTypeStateValue("提前结清");
} else {
loanSettleApply.setTypeState("01");
loanSettleApply.setTypeStateValue("正常结清");
}
baseMapper.insert(loanSettleApply);
} else {//修改
LoanSettleApply loanSettleApply = fetchBySid(sid);
if (loanSettleApply == null) {
return rb.setMsg("该申请不存在");
}
BeanUtil.copyProperties(dto, loanSettleApply, "sid");
LoanSettleBankCostVo loanSettleBankCostVo = dto.getLoanSettleBankCostVo();
if (loanSettleBankCostVo != null) {
loanSettleBankCostService.saveCost(sid, loanSettleBankCostVo);
}
LoanSettleCompanyCostVo loanSettleCompanyCostVo = dto.getLoanSettleCompanyCostVo();
if (loanSettleCompanyCostVo != null) {
loanSettleCompanyCostService.saveCost(sid, loanSettleCompanyCostVo);
}
LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = dto.getLoanSettleCompanyReductionVo();
if (loanSettleCompanyReductionVo != null) {
loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo);
}
loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0);
baseMapper.updateById(loanSettleApply);
}
return rb.success().setData(sid);
}
@ -197,6 +305,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
}
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
//创建组织使用组织
ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
if (organizationResultBean.getData() != null) {
loanSettleApplyDetailsVo.setUseOrgName(organizationResultBean.getData().getName());
}
//根据用户sid查询人员姓名
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
if (!userVoResultBean.getSuccess()) {
@ -229,7 +342,19 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
LoanSettleBankCost loanSettleBankCost = loanSettleBankCostService.selectByMainSid(sid);
if (loanSettleBankCost != null) {
BeanUtil.copyProperties(loanSettleBankCost, loanSettleBankCostVo);
String filesss = loanSettleBankCost.getFiles();
List<UrlQuery> lists = new ArrayList<>();
if (StringUtils.isNotBlank(filesss)) {
List<String> fileList = Arrays.asList(filesss.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
for (int i = 0; i < fileList.size(); i++) {
UrlQuery urlQuery = new UrlQuery();
urlQuery.setUrl(fileList.get(i));
lists.add(urlQuery);
}
loanSettleBankCostVo.setFilesList(lists);
}
loanSettleApplyDetailsVo.setLoanSettleBankCostVo(loanSettleBankCostVo);
}
LoanSettleCompanyCostVo loanSettleCompanyCostVo = new LoanSettleCompanyCostVo();
LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(sid);
@ -237,7 +362,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
BeanUtil.copyProperties(loanSettleCompanyCost, loanSettleCompanyCostService);
loanSettleApplyDetailsVo.setLoanSettleCompanyCostVo(loanSettleCompanyCostVo);
}
loanSettleApplyDetailsVo.setTrueReduction(loanSettleApply.getTrueReduction());
loanSettleApplyDetailsVo.setTrueReduction(loanSettleApply.getTrueReduction() == 1);
LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = new LoanSettleCompanyReductionVo();
LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid);
if (loanSettleCompanyReduction != null) {
@ -272,6 +397,20 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
settleApplyCommonVo.setPutBankInterest(putBankInterest);
//资金占用费
String funfCost = baseMapper.selectZjzyf(busVinSid, settingDate);
String dk = baseMapper.selectDk(busVinSid, settingDate);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try {
Date d1 = format.parse(settingDate);//毫秒ms
Date d2 = format.parse(DateUtil.today());//毫秒ms
long diff = d2.getTime() - d1.getTime();
long diffDays = diff / (24 * 60 * 60 * 1000);
int i = new Long(diffDays).intValue() + 1;
String dks = new BigDecimal(dk).multiply(new BigDecimal("0.0007")).multiply(new BigDecimal(i)).setScale(2, RoundingMode.HALF_UP).toString();
funfCost = new BigDecimal(funfCost).add(new BigDecimal(dks)).toString();
} catch (ParseException e) {
e.printStackTrace();
}
settleApplyCommonVo.setFunfCost(funfCost);
//公司当前逾期月还
String overdueMonthPrice = baseMapper.selectGsYqYh(busVinSid, settingDate);
@ -335,7 +474,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
}
List<String> sidss = Arrays.asList(sids);
for (int i = 0; i < sidss.size(); i++) {//删除相关表
loanSettleBankCostMapper.deleteByMainSid(sidss.get(i));
loanSettleCompanyCostMapper.deleteByMainSid(sidss.get(i));
loanSettleCompanyReductionMapper.deleteByMainSid(sidss.get(i));
}
delBySids(sids);
return rb.success().setMsg("删除成功");
@ -368,7 +509,21 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
bv.setOrgSidPath(loanSettleApply.getOrgSidPath());
bv.setBusinessSid(businessSid);
bv.setUserSid(dto.getUserSid());
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
variables.put("orderNames", "提前结清申请");
}
bv.setFormVariables(variables);
List<String> orgPathList = Arrays.asList(dto.getOrgPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
if (sysOrganization == null) {
return rb.setMsg("当前所在的组织机构不存在");
}
if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
// return rb.setMsg("当前所在的组织机构未设置主管人员");
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
if (r == 1) {
//ToDo:流程定义id
bv.setModelId(ProcDefEnum.LOANSETTLEAPPLY.getProDefId());
@ -449,6 +604,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
variables.put("orderNames", "提前结清申请");
}
bv.setFormVariables(variables);
bv.setOrgSidPath(loanSettleApply.getOrgSidPath());
bv.setModelId(loanSettleApply.getProcDefId());
@ -462,7 +620,10 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
loanSettleApply = fetchBySid(businessSid);
loanSettleApply.setCloseDate(DateUtil.today());
loanSettleApply.setSettingDate(DateUtil.today());
baseMapper.updateById(loanSettleApply);
//更新车辆表结清状态
baseMapper.updateBus(loanSettleApply.getBusVinSid());
} else {
//极光推送
loanSettleApply = fetchBySid(businessSid);
@ -534,6 +695,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
variables.put("orderNames", "提前结清申请");
}
variables.put("app", appMap);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
@ -645,11 +809,72 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
public ResultBean<SettleApplyAppVo> getAppDetails(String sid) {
ResultBean<SettleApplyAppVo> rb = ResultBean.fireFail();
SettleApplyAppVo settleApplyAppVo = new SettleApplyAppVo();
LoanSettleApply loanSettleApply = fetchBySid(sid);
if (loanSettleApply == null) {
return rb.setMsg("该申请不存在");
}
return null;
BeanUtil.copyProperties(loanSettleApply, settleApplyAppVo);
settleApplyAppVo.setCreateTime(DateUtil.format(loanSettleApply.getCreateTime(), "yyyy-MM-dd"));
LoanSettleBankCost loanSettleBankCost = loanSettleBankCostService.selectByMainSid(sid);
if (loanSettleBankCost != null) {
settleApplyAppVo.setPrice(loanSettleBankCost.getPrice().toString());
settleApplyAppVo.setCurrentNotDuePriceBank(loanSettleBankCost.getCurrentNotDuePrice().toString());
settleApplyAppVo.setNotDuePriceBank(loanSettleBankCost.getNotDuePrice().toString());
settleApplyAppVo.setBankInterest(loanSettleBankCost.getBankInterest().toString());
settleApplyAppVo.setBankNominalPrice(loanSettleBankCost.getBankNominalPrice().toString());
settleApplyAppVo.setBankContractLiquidated(loanSettleBankCost.getBankContractLiquidated().toString());
settleApplyAppVo.setBankOtherReceivable(loanSettleBankCost.getBankOtherReceivable().toString());
settleApplyAppVo.setOtherReceivableRemarks(loanSettleBankCost.getOtherReceivableRemarks());
settleApplyAppVo.setBankSettlePrice(loanSettleBankCost.getBankSettlePrice().toString());
if (StringUtils.isNotBlank(loanSettleBankCost.getFiles())) {
List<String> fileList = Arrays.asList(loanSettleBankCost.getFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
fileList.removeAll(Collections.singleton(null));
if (!fileList.isEmpty()) {
settleApplyAppVo.setBankFiles(fileList);
}
}
}
LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(sid);
if (loanSettleCompanyCost != null) {
settleApplyAppVo.setLoanDeposit(loanSettleCompanyCost.getLoanDeposit().toString());
settleApplyAppVo.setOverduePrice(loanSettleCompanyCost.getOverduePrice().toString());
settleApplyAppVo.setPutBankInterest(loanSettleCompanyCost.getPutBankInterest().toString());
settleApplyAppVo.setFunfCost(loanSettleCompanyCost.getFunfCost().toString());
settleApplyAppVo.setBankOverInterest(loanSettleCompanyCost.getBankOverInterest().toString());
settleApplyAppVo.setCompanyCurrentNotPrice(loanSettleCompanyCost.getCompanyCurrentNotPrice().toString());
settleApplyAppVo.setBankNotPrice(loanSettleCompanyCost.getBankNotPrice().toString());
settleApplyAppVo.setDeductionAmount(loanSettleCompanyCost.getDeductionAmount().toString());
settleApplyAppVo.setCompanyNominalPrice(loanSettleCompanyCost.getCompanyNominalPrice().toString());
settleApplyAppVo.setContractLiquidated(loanSettleCompanyCost.getContractLiquidated().toString());
settleApplyAppVo.setCompanyOtherPrice(loanSettleCompanyCost.getCompanyOtherPrice().toString());
settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
settleApplyAppVo.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
}
LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid);
if (loanSettleCompanyReduction != null) {
if (loanSettleApply.getTrueReduction() == 0) {//未勾选
settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
settleApplyAppVo.setTrueReduction(false);
} else {
settleApplyAppVo.setFundPenalty(loanSettleCompanyReduction.getFundPenalty().toString());
settleApplyAppVo.setDepositPenalty(loanSettleCompanyReduction.getDepositPenalty().toString());
settleApplyAppVo.setOtherCost(loanSettleCompanyReduction.getOtherCost().toString());
settleApplyAppVo.setAmountTo(loanSettleCompanyReduction.getAmountTo().toString());
settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
settleApplyAppVo.setTrueReduction(true);
}
}
settleApplyAppVo.setSaleOrderSid(loanSettleApply.getSaleOrderSid());
settleApplyAppVo.setCsjlSid(loanSettleApply.getBusVinSid());
if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
settleApplyAppVo.setTrueHg(true);
} else {
settleApplyAppVo.setTrueHg(false);
}
return rb.success().setData(settleApplyAppVo);
}
@ -682,4 +907,5 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
PagerVo<SettleApplyListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.java

@ -12,4 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LoanSettleBankCostMapper extends BaseMapper<LoanSettleBankCost> {
LoanSettleBankCost selectByMainSid(String sid);
int deleteByMainSid(String sid);
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostMapper.xml

@ -6,4 +6,10 @@
from loan_settle_bank_cost
where mainSid = #{sid}
</select>
<delete id="deleteByMainSid">
delete
from loan_settle_bank_cost
where mainSid = #{sid}
</delete>
</mapper>

36
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlebankcost/LoanSettleBankCostService.java

@ -1,9 +1,19 @@
package com.yxt.anrui.riskcenter.biz.loansettlebankcost;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.portal.api.sysappendix.SysAppendixQuery;
import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCostVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
/**
* @description:
* @author: dimengzhe
@ -11,7 +21,33 @@ import org.springframework.stereotype.Service;
**/
@Service
public class LoanSettleBankCostService extends MybatisBaseService<LoanSettleBankCostMapper, LoanSettleBankCost> {
@Autowired
private FileUploadComponent fileUploadComponent;
public LoanSettleBankCost selectByMainSid(String sid) {
return baseMapper.selectByMainSid(sid);
}
public void saveCost(String sid, LoanSettleBankCostVo loanSettleBankCostVo) {
LoanSettleBankCost loanSettleBankCost = baseMapper.selectByMainSid(sid);
if (loanSettleBankCost != null) {
baseMapper.deleteByMainSid(sid);
}
loanSettleBankCost = new LoanSettleBankCost();
BeanUtil.copyProperties(loanSettleBankCostVo, loanSettleBankCost);
loanSettleBankCost.setMainSid(sid);
List<UrlQuery> filss = loanSettleBankCostVo.getFilesList();
filss.removeAll(Collections.singleton(null));
if (!filss.isEmpty()) {
List<String> filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList());
filesList.removeAll(Collections.singleton(null));
if (!filesList.isEmpty()) {
String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
loanSettleBankCost.setFiles(files);
}
}
baseMapper.insert(loanSettleBankCost);
}
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.java

@ -12,4 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LoanSettleCompanyCostMapper extends BaseMapper<LoanSettleCompanyCost> {
LoanSettleCompanyCost selectByMainSid(String sid);
int deleteByMainSid(String sid);
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostMapper.xml

@ -6,4 +6,10 @@
from loan_settle_company_cost
where mainSid = #{sid}
</select>
<delete id="deleteByMainSid">
delete
from loan_settle_company_cost
where mainSid = #{sid}
</delete>
</mapper>

14
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanycost/LoanSettleCompanyCostService.java

@ -1,6 +1,9 @@
package com.yxt.anrui.riskcenter.biz.loansettlecompanycost;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.riskcenter.api.loansettlebankcost.LoanSettleBankCost;
import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCost;
import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostVo;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
@ -14,4 +17,15 @@ public class LoanSettleCompanyCostService extends MybatisBaseService<LoanSettleC
public LoanSettleCompanyCost selectByMainSid(String sid) {
return baseMapper.selectByMainSid(sid);
}
public void saveCost(String sid, LoanSettleCompanyCostVo loanSettleCompanyCostVo) {
LoanSettleCompanyCost loanSettleCompanyCost = baseMapper.selectByMainSid(sid);
if (loanSettleCompanyCost != null) {
baseMapper.deleteByMainSid(sid);
}
loanSettleCompanyCost = new LoanSettleCompanyCost();
BeanUtil.copyProperties(loanSettleCompanyCostVo, loanSettleCompanyCost);
loanSettleCompanyCost.setMainSid(sid);
baseMapper.insert(loanSettleCompanyCost);
}
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.java

@ -12,4 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface LoanSettleCompanyReductionMapper extends BaseMapper<LoanSettleCompanyReduction> {
LoanSettleCompanyReduction selectByMainSid(String sid);
int deleteByMainSid(String sid);
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionMapper.xml

@ -7,4 +7,10 @@
from loan_settle_company_reduction
where mainSid = #{sid}
</select>
<delete id="deleteByMainSid">
delete
from loan_settle_company_reduction
where mainSid = #{sid}
</delete>
</mapper>

14
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettlecompanyreduction/LoanSettleCompanyReductionService.java

@ -1,6 +1,9 @@
package com.yxt.anrui.riskcenter.biz.loansettlecompanyreduction;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCost;
import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReduction;
import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReductionVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.domain.BaseEntity;
import org.springframework.stereotype.Service;
@ -15,4 +18,15 @@ public class LoanSettleCompanyReductionService extends MybatisBaseService<LoanSe
public LoanSettleCompanyReduction selectByMainSid(String sid) {
return baseMapper.selectByMainSid(sid);
}
public void saveReduction(String sid, LoanSettleCompanyReductionVo loanSettleCompanyReductionVo) {
LoanSettleCompanyReduction loanSettleCompanyReduction = baseMapper.selectByMainSid(sid);
if (loanSettleCompanyReduction != null) {
baseMapper.deleteByMainSid(sid);
}
loanSettleCompanyReduction = new LoanSettleCompanyReduction();
BeanUtil.copyProperties(loanSettleCompanyReductionVo, loanSettleCompanyReduction);
loanSettleCompanyReduction.setMainSid(sid);
baseMapper.insert(loanSettleCompanyReduction);
}
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repurchase/RepurchaseDetailsVo.java

@ -19,7 +19,6 @@ public class RepurchaseDetailsVo implements Vo {
private String sid;
private String publishInfo; // 发起部门-发起人
private String time; //申请日期
private List<String> files = new ArrayList<>();
private String taskId;
private String procInsId;
@ApiModelProperty("催收记录")
@ -105,6 +104,8 @@ public class RepurchaseDetailsVo implements Vo {
private String bankReceivingAccount;
@ApiModelProperty("资方收款账号")
private String bankAccountNo;
@ApiModelProperty("付款后需备注内容")
private String payRemarks;
private List<String> buyfiles = new ArrayList<>(); // 回购情况附件
@ApiModelProperty("销售订单sid")
private String salesOrderSid;

120
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java

@ -1,7 +1,12 @@
package com.yxt.anrui.terminal.api.risk.settleapply;
import com.yxt.anrui.terminal.api.base.common.CarModelVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -9,4 +14,119 @@ import lombok.Data;
**/
@Data
public class SettleApplyAppVos {
private String publishInfo; // 发起部门-发起人
private CarModelVo jrfa;//金融方案
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createTime;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("车牌号")
private String vehMark;
@ApiModelProperty("销售订单sid")
private String saleOrderSid;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("贷款人")
private String loanName;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("资方")
private String bankName;
@ApiModelProperty("资方合同编号")
private String bankContractNo;
@ApiModelProperty("结清日期")
private String settingDate;
@ApiModelProperty("公司当前逾期月还")
private String overdueMonthPrice;
@ApiModelProperty("公司当期未到期月还")
private String currentNotDuePrice;
@ApiModelProperty("公司未到期月还")
private String notDuePrice;
@ApiModelProperty("实例id")
private String procInstId;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("环节id")
private String taskDefKey;
@ApiModelProperty("是否勾选减免,true勾选,false不勾选")
private boolean trueReduction;
//资方结清费用
@ApiModelProperty("资方逾期月还")
private String price;
@ApiModelProperty("资方当期未到期月还")
private String currentNotDuePriceBank;
@ApiModelProperty("资方未到期金额")
private String notDuePriceBank;
@ApiModelProperty("资方逾期利息")
private String bankInterest;
@ApiModelProperty("资方名义价")
private String bankNominalPrice;
@ApiModelProperty("资方合同违约金")
private String bankContractLiquidated;
@ApiModelProperty("资方其他应收")
private String bankOtherReceivable;
@ApiModelProperty("其他应收说明")
private String otherReceivableRemarks;
@ApiModelProperty("资方结清金额")
private String bankSettlePrice;
@ApiModelProperty("附件")
private List<String> bankFiles = new ArrayList<>();
//公司结清费用
@ApiModelProperty("贷款保证金")
private String loanDeposit;
@ApiModelProperty("公司逾期月还")
private String overduePrice;
@ApiModelProperty("垫资方逾期利息")
private String putBankInterest;
@ApiModelProperty("资金占用费")
private String funfCost;
@ApiModelProperty("资方逾期利息")
private String bankOverInterest;
@ApiModelProperty("公司当期未到期月还")
private String companyCurrentNotPrice;
@ApiModelProperty("资方未到期金额")
private String bankNotPrice;
@ApiModelProperty("贷款保证金扣罚金额")
private String deductionAmount;
@ApiModelProperty("名义价")
private String companyNominalPrice;
@ApiModelProperty("合同违约金")
private String contractLiquidated;
@ApiModelProperty("公司其他费用")
private String companyOtherPrice;
@ApiModelProperty("其他费用说明")
private String otherCostRemarks;
@ApiModelProperty("公司正常结清合计")
private String settleAll;
//减免后
@ApiModelProperty("资金占用费减免")
private String fundPenalty;
@ApiModelProperty("贷款保证金扣罚减免")
private String depositPenalty;
@ApiModelProperty("其他费用减免")
private String otherCost;
@ApiModelProperty("公司减免后结清合计")
private String amountTo;
@ApiModelProperty("结清利润")
private String profit;
@ApiModelProperty("催收记录")
private String csjlSid;
@ApiModelProperty("是否是回购过来的")
private boolean trueHg;
@ApiModelProperty("预计结清日期")
private String settingDateBe;
@ApiModelProperty("截止当前资金占用费")
private String fundAll;
}

7
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/repurchase/RepurchaseService.java

@ -12,6 +12,7 @@ import com.yxt.anrui.riskcenter.api.loanredemptionapply.flow.*;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyFeign;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.app.AppRepurchaseDetailsVo;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.flow.*;
import com.yxt.anrui.terminal.api.base.common.CarModelVo;
import com.yxt.anrui.terminal.api.risk.redemption.RedemptionDetailsVo;
import com.yxt.anrui.terminal.api.risk.redemption.flow.AppRedemptionDelegateQuery;
import com.yxt.anrui.terminal.api.risk.redemption.flow.AppRedemptionTaskQuery;
@ -22,6 +23,7 @@ import com.yxt.anrui.terminal.api.risk.repurchase.flow.AppRepurchaseDelegateQuer
import com.yxt.anrui.terminal.api.risk.repurchase.flow.AppRepurchaseTaskQuery;
import com.yxt.anrui.terminal.api.risk.repurchase.flow.CompleteRepurchaseDto;
import com.yxt.anrui.terminal.api.risk.repurchase.flow.RepurchaseFlowableQuery;
import com.yxt.anrui.terminal.biz.base.common.CommonService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -43,6 +45,8 @@ public class RepurchaseService {
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private LoanRepurchaseApplyFeign loanRepurchaseApplyFeign;
@Autowired
private CommonService commonService;
public ResultBean<RepurchaseDetailsVo> detail(String sid) {
ResultBean<RepurchaseDetailsVo> rb = ResultBean.fireFail();
@ -50,6 +54,9 @@ public class RepurchaseService {
AppRepurchaseDetailsVo data = loanRepurchaseApplyFeign.appDetail(sid).getData();
if (null != data) {
BeanUtil.copyProperties(data, vo);
ResultBean<CarModelVo> getLoanSolution = commonService.getLoanSolution(data.getSalesOrderSid());
CarModelVo carModelVo = getLoanSolution.getData();
vo.setJrfa(carModelVo);
}
return rb.success().setData(vo);
}

8
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/settleapply/SettleApplyService.java

@ -15,6 +15,7 @@ import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDelegateQ
import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyDto;
import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyQuery;
import com.yxt.anrui.terminal.api.risk.settleapply.flowable.SettleApplyTaskQuery;
import com.yxt.anrui.terminal.biz.base.common.CommonService;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,6 +34,8 @@ public class SettleApplyService {
@Autowired
private LoanSettleApplyFeign loanSettleApplyFeign;
@Autowired
private CommonService commonService;
public ResultBean agreeSettleApply(SettleApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
@ -115,7 +118,10 @@ public class SettleApplyService {
}
SettleApplyAppVos settleApplyAppVos = new SettleApplyAppVos();
BeanUtil.copyProperties(resultBean.getData(), settleApplyAppVos);
settleApplyAppVos.setPublishInfo(settleApplyAppVos.getCreateDept() + "-" + settleApplyAppVos.getCreateByName());
ResultBean<CarModelVo> getLoanSolution = commonService.getLoanSolution(settleApplyAppVos.getSaleOrderSid());
CarModelVo carModelVo = getLoanSolution.getData();
settleApplyAppVos.setJrfa(carModelVo);
return rb.success().setData(settleApplyAppVos);
}

5
doc/databases/risk_center.sql

@ -1766,6 +1766,10 @@ CREATE TABLE `loan_settle_apply`
`taskDefKey` varchar(64) DEFAULT NULL COMMENT '环节id',
`nodeState` varchar(64) DEFAULT NULL COMMENT '流程状态',
`trueReduction` int(32) DEFAULT NULL COMMENT '0不勾选,1勾选减免',
`typeState` varchar(64) DEFAULT NULL COMMENT '01正常结清,02提前结清',
`typeStateValue` varchar(64) DEFAULT NULL COMMENT '01正常结清,02提前结清',
`busSid` varchar(64) DEFAULT NULL COMMENT '回购sid',
`settingDateBe` varchar(64) DEFAULT NULL COMMENT '预计结清日期',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
@ -1829,6 +1833,7 @@ CREATE TABLE `loan_settle_company_cost`
`companyOtherPrice` decimal(10, 2) DEFAULT NULL COMMENT '公司其他费用',
`otherCostRemarks` text DEFAULT NULL COMMENT '其他费用说明',
`settleAll` decimal(10, 2) DEFAULT NULL COMMENT '公司正常结清合计',
`fundAll` decimal(10, 2) DEFAULT NULL COMMENT '截止当前资金占用费',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB

Loading…
Cancel
Save