已还与欠款情况

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -69,7 +69,7 @@ public enum ProcDefEnum {
     LOANOVERDUEFIN("逾期对账申请（财务）", "process_b0i03acl:1:7672504"),
     LOANOVERDUEBANK("逾期对账申请（资方）", "process_wwb7q95x:1:7672508"),
     LOANVEHCLEARANCEAPPLY("车辆远程解控申请", "process_zbzenr9b:2:7782504"),
-    LOANRESTOREREPORTAPPLY("车辆交回事前报备申请", ""),
+    LOANRESTOREREPORTAPPLY("车辆交回事前报备申请", "process_w796wtt7:1:7822504"),
 
     /******************************测试流程id*********************************************/
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/AlrepaidAndArrVo.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanrestorereportapply;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AlrepaidAndArrVo implements Vo {
+
+	@ApiModelProperty("已还金额")
+    private String alRepaidMoney; // 已还金额
+	@ApiModelProperty("当前逾期金额")
+    private String currentBeMoney; // 当前逾期金额
+	@ApiModelProperty("其中资金占用费")
+    private String wheFundOccMoney; // 其中资金占用费
+	@ApiModelProperty("未到期金额")
+    private String unexpiredMoney; // 未到期金额
+	@ApiModelProperty("总期数")
+    private String nper; // 总期数
+	@ApiModelProperty("当前期数")
+    private String currentPeriod; // 当前期数
+	@ApiModelProperty("已还金额换算期数")
+    private String alRepaidMoneyConPeriod; // 已还金额换算期数
+	@ApiModelProperty("逾期金额换算期数")
+    private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApply.java

@@ -95,7 +95,7 @@ public class LoanRestoreReportApply extends BaseEntity {
 	@ApiModelProperty("交回方式value")
     private String restoreTypeValue; // 交回方式value
 	@ApiModelProperty("预交回日期")
-    private Date restoreDate; // 预交回日期
+    private String restoreDate; // 预交回日期
 	@ApiModelProperty("经办人sid")
     private String operatorSid; // 经办人sid
 	@ApiModelProperty("经办人姓名")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeign.java

@@ -86,6 +86,11 @@ public interface LoanRestoreReportApplyFeign {
     @ResponseBody
     public ResultBean<LoanRestoreReportApplyDetailsVo> init(@RequestParam("saleVehSid") String saleVehSid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
 
+    @ApiOperation("获取已还欠款情况")
+    @GetMapping("/getAlrepaidAndArr")
+    @ResponseBody
+    public ResultBean<AlrepaidAndArrVo> getAlrepaidAndArr(@RequestParam("saleVehSid") String saleVehSid);
+
     @ApiOperation("提交审批流程")
     @PostMapping("/submit")
     public ResultBean submit(@RequestBody @Valid SubmitLoanRestoreReportDto dto);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrestorereportapply/LoanRestoreReportApplyFeignFallback.java

@@ -76,6 +76,11 @@ public class LoanRestoreReportApplyFeignFallback implements LoanRestoreReportApp
 		return null;
 	}
 
+	@Override
+	public ResultBean<AlrepaidAndArrVo> getAlrepaidAndArr(String saleVehSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submit(SubmitLoanRestoreReportDto dto) {
 		return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.java

@@ -67,4 +67,6 @@ public interface LoanRestoreReportApplyMapper extends BaseMapper<LoanRestoreRepo
     int updateFlowFiled(Map<String, Object> map);
 
 	String selectNum(String billNo);
+
+	String getYhje(String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml

@@ -12,7 +12,7 @@
 	</select>
 
 	<update id="updateFlowFiled">
-		UPDATE loan_be_collection_apply
+		UPDATE loan_restore_report_apply
 		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}, modifyTime = NOW()
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
@@ -33,4 +33,15 @@
 		order by billNo desc
 				limit 1
 	</select>
+
+	<select id="getYhje" resultType="java.lang.String">
+		SELECT
+				SUM(lrh.`actualMoney`)
+		FROM
+				loan_repayment_history lrh
+						LEFT JOIN loan_repayment_plan_details lrpd
+						ON lrh.`planDetailSid` = lrpd.`sid`
+		WHERE lrh.updateState = '1'
+		  AND lrpd.`busVinSid` = #{saleVehSid}
+	</select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyRest.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.biz.loanrestorereportapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.riskcenter.api.loanrestorereportapply.*;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.flowable.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -37,12 +38,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyQuery;
-import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyVo;
-import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyDto;
-import com.yxt.anrui.riskcenter.api.loanrestorereportapply.LoanRestoreReportApplyFeign;
-
 import java.util.List;
 
 /**
@@ -109,6 +104,13 @@ public class LoanRestoreReportApplyRest implements LoanRestoreReportApplyFeign {
         return rb.success().setData(loanRestoreReportApplyDetailsVo);
     }
 
+    @Override
+    public ResultBean<AlrepaidAndArrVo> getAlrepaidAndArr(String saleVehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        AlrepaidAndArrVo alrepaidAndArrVo = loanRestoreReportApplyService.getAlrepaidAndArr(saleVehSid);
+        return rb.success().setData(alrepaidAndArrVo);
+    }
+
     @Override
     public ResultBean submit(SubmitLoanRestoreReportDto dto) {
         return loanRestoreReportApplyService.submit(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java

@@ -642,4 +642,30 @@ public class LoanRestoreReportApplyService extends MybatisBaseService<LoanRestor
         flowFeign.delegate(delegateQuery);
         return rb.success();
     }
+
+    public AlrepaidAndArrVo getAlrepaidAndArr(String saleVehSid) {
+        AlrepaidAndArrVo alrepaidAndArrVo = new AlrepaidAndArrVo();
+        //已还金额
+        String yhje = getYhje(saleVehSid);
+        alrepaidAndArrVo.setAlRepaidMoney(yhje);
+        //当前逾期金额
+
+        //其中资金占用费
+
+        //未到期金额
+
+        //总期数
+
+        //当前期数
+
+        //已还金额换算期数
+
+        //逾期金额换算期数
+
+        return null;
+    }
+
+    private String getYhje(String saleVehSid) {
+        return baseMapper.getYhje(saleVehSid);
+    }
 }