diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java index 31ace09a1c..5851acff7e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeign.java @@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress; import com.yxt.anrui.riskcenter.api.loancaseprogress.jiean.JieAnVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVo; +import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVoList; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -167,6 +168,13 @@ public interface LoanCaseProgressFeign { @PostMapping("/saveEndCaseInfo") public ResultBean saveEndCaseInfo(@RequestBody ExecuteVo dto); + @ApiOperation("查询执行历史记录列表") + @GetMapping("/getExecuteList") + public ResultBean> getExecuteList(@RequestParam("sid") String sid); + + @ApiOperation("查询执行历史记录列表") + @GetMapping("/getHistoryExecuteDetail") + public ResultBean getHistoryExecuteDetail(@RequestParam("recordSid") String recordSid); //-------------------结案----------------------------- @ApiOperation("结案详情") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java index 8d56d1f780..e19b808a85 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/LoanCaseProgressFeignFallback.java @@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.api.loancaseprogress; import com.yxt.anrui.riskcenter.api.loancaseprogress.jiean.JieAnVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVo; +import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVoList; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -173,6 +174,16 @@ public class LoanCaseProgressFeignFallback implements LoanCaseProgressFeign { return null; } + @Override + public ResultBean> getExecuteList(String sid) { + return null; + } + + @Override + public ResultBean getHistoryExecuteDetail(String recordSid) { + return null; + } + @Override public ResultBean getEndCaseDetails(String sid) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVo.java index 839a95d809..5c0c6e5c24 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVo.java @@ -11,7 +11,7 @@ import lombok.Data; public class ExecuteVo { private String sid; - private String recordSid; //执行记录sid + // private String recordSid; //执行记录sid private ReadyInfo readyInfo = new ReadyInfo(); //准备执行材料 private YiZhiXingInfo yiZhiXingInfo = new YiZhiXingInfo(); //已执行立案 private CloseInfo closeInfo = new CloseInfo(); //查封、冻结财产 diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVoList.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVoList.java new file mode 100644 index 0000000000..43196b799a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancaseprogress/zhixing/ExecuteVoList.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author Fan + * @description + * @date 2024/3/5 9:20 + */ +@Data +public class ExecuteVoList { + + private String recordSid; + @ApiModelProperty("准备执行材料-转执行日期") + private String prepareTime; + @ApiModelProperty("已执行立案-执行立案日期") + private String executeTime; + @ApiModelProperty("已执行立案-执行案件号") + private String executeCaseNo; + @ApiModelProperty("已执行立案-执行立案金额") + private String executeMoney; + @ApiModelProperty("已执行立案-执行回款总金额") + private String executeAmountAll; + @ApiModelProperty("终止本次执行-终止日期") + private String endTime; + @ApiModelProperty("终止本次执行-终止原因") + private String endReason; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java index 6f222f9feb..c51d8ce271 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.java @@ -10,6 +10,7 @@ import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgress; import com.yxt.anrui.riskcenter.api.loancaseprogress.LoanCaseProgressVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.DelegateInfo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ShangSuApplyVo; +import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVoList; import com.yxt.anrui.riskcenter.api.loancaseprogressexecute.LoanCaseProgressExecute; import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; import org.apache.ibatis.annotations.Mapper; @@ -52,4 +53,6 @@ public interface LoanCaseProgressMapper extends BaseMapper { LoanCaseProgressExecute getExecuteDetailsBySid(@Param("sid") String sid); LoanCaseCloseApply selCloseApplyBySid(@Param("sid") String sid); + + List getExecuteList(@Param("sid") String sid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml index 96358b13ac..a5e03e02b7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressMapper.xml @@ -110,5 +110,23 @@ resultType="com.yxt.anrui.riskcenter.api.loancasecloseapply.LoanCaseCloseApply"> SELECT * FROM loan_case_close_apply WHERE busSid = #{sid} and nodeState = '已办结' + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java index 9e64c1e628..6af573ece4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressRest.java @@ -5,6 +5,7 @@ import com.yxt.anrui.riskcenter.api.loancaseprogress.*; import com.yxt.anrui.riskcenter.api.loancaseprogress.jiean.JieAnVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.tingshen.ReviewVo; import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVo; +import com.yxt.anrui.riskcenter.api.loancaseprogress.zhixing.ExecuteVoList; import com.yxt.anrui.riskcenter.api.loanlawsuitapply.LoanLawsuitApplyVo; import com.yxt.anrui.riskcenter.api.loanparameter.*; import com.yxt.common.core.query.PagerQuery; @@ -192,6 +193,16 @@ public class LoanCaseProgressRest implements LoanCaseProgressFeign { return loanCaseProgressService.saveEndCaseInfo(dto); } + @Override + public ResultBean> getExecuteList(String sid) { + return loanCaseProgressService.getExecuteList(sid); + } + + @Override + public ResultBean getHistoryExecuteDetail(String recordSid) { + return loanCaseProgressService.getHistoryExecuteDetail(recordSid); + } + @Override public ResultBean getEndCaseDetails(String sid) { return loanCaseProgressService.getEndCaseDetails(sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java index e4597f3706..6926a5f2b1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseprogress/LoanCaseProgressService.java @@ -2298,7 +2298,7 @@ public class LoanCaseProgressService extends MybatisBaseService filss = readyInfo.getFile(); filss.removeAll(Collections.singleton(null)); @@ -2480,10 +2480,10 @@ public class LoanCaseProgressService extends MybatisBaseService executeMeasure = yiZhiXingInfo.getExecuteMeasure(); - if (StringUtils.isNotBlank(dto.getRecordSid())) { - LoanCaseProgressExecute execute = loanCaseProgressExecuteService.fetchBySid(dto.getRecordSid()); - BeanUtil.copyProperties(yiZhiXingInfo, execute); - if (StringUtils.isBlank(execute.getCaseTache())) { - execute.setCaseTacheNo("2"); - execute.setCaseTache("已执行立案"); + LoanCaseProgressExecute updateEntity = baseMapper.getExecuteDetailsBySid(sid); + if (updateEntity != null) { + BeanUtil.copyProperties(yiZhiXingInfo, updateEntity); + if (StringUtils.isBlank(updateEntity.getCaseTache())) { + updateEntity.setCaseTacheNo("2"); + updateEntity.setCaseTache("已执行立案"); } else { - String caseTacheNo = execute.getCaseTacheNo(); + String caseTacheNo = updateEntity.getCaseTacheNo(); int i = Integer.parseInt(caseTacheNo); if (i < 2) { - execute.setCaseTacheNo("2"); - execute.setCaseTache("已执行立案"); + updateEntity.setCaseTacheNo("2"); + updateEntity.setCaseTache("已执行立案"); } } - loanCaseProgressExecuteService.updateById(execute); - loanCaseProgressExecuteMeasureService.delByMainSid(dto.getRecordSid()); + loanCaseProgressExecuteService.updateById(updateEntity); + loanCaseProgressExecuteMeasureService.delByMainSid(updateEntity.getSid()); if (!executeMeasure.isEmpty()) { for (ExecuteMeasureVo measureVo : executeMeasure) { LoanCaseProgressExecuteMeasure measure = new LoanCaseProgressExecuteMeasure(); - measure.setMainSid(execute.getSid()); + measure.setMainSid(updateEntity.getSid()); BeanUtil.copyProperties(measureVo, measure); //保存附件 List filss = measureVo.getFile(); @@ -2691,9 +2691,9 @@ public class LoanCaseProgressService extends MybatisBaseService filss = promiseInfo.getFile(); filss.removeAll(Collections.singleton(null)); @@ -2702,10 +2702,10 @@ public class LoanCaseProgressService extends MybatisBaseService filss = closeInfo.getFile(); filss.removeAll(Collections.singleton(null)); @@ -2742,10 +2742,10 @@ public class LoanCaseProgressService extends MybatisBaseService filss = endCaseInfo.getFile(); filss.removeAll(Collections.singleton(null)); @@ -2785,17 +2783,17 @@ public class LoanCaseProgressService extends MybatisBaseService> getExecuteList(String sid) { + ResultBean rb = ResultBean.fireFail(); + List voLists = baseMapper.getExecuteList(sid); + return rb.success().setData(voLists); + } + + public ResultBean getHistoryExecuteDetail(String recordSid) { + ResultBean rb = ResultBean.fireFail(); + LoanCaseProgressExecute loanCaseProgressExecute = loanCaseProgressExecuteService.fetchBySid(recordSid); + if (null != loanCaseProgressExecute) { + ExecuteVo executeVo = returnExecuteVo(loanCaseProgressExecute); + return rb.success().setData(executeVo); + } else { + ExecuteVo vo = new ExecuteVo(); + return rb.success().setData(vo); + } + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index af2dd88032..d4d084f4bc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -141,23 +141,30 @@ '1' END AS overdueState FROM ( - SELECT a.* + SELECT a.*, + (SELECT (fjj.reveivableMoney - fjj.m) + FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) + FROM anrui_fin.fin_selected_receivables_detailed as s + WHERE s.auditState = '3' + and s.receivablesSid = fj.sid), 0) as m, + fj.* + FROM (SELECT j.busSid, j.sid, j.reveivableMoney + FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j + WHERE j.payCostTitleKey = '006') as fj) as fjj + WHERE fjj.busSid = a.sid) as fund FROM ( SELECT pd.dueDate, pd.useOrgSid, pd.sid, - IFNULL(pd.fund, 0) AS fund, pd.dueMoney, pd.overdue, t.repaidMoney, t.outstandingMoney, --- IFNULL(v.bankBeInter, 0) AS bankBeInter, IFNULL(pd.paymentInterest, 0) AS bankBeInter, pd.overdue AS dueOverdue, pd.updateTime AS updateDate FROM loan_repayment_plan_details AS pd LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid --- LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid LEFT JOIN ( SELECT p.sid, IFNULL(( @@ -262,7 +269,17 @@ b.busVinSid, b.salesOrderSid FROM ( - SELECT a.* + SELECT a.*, + (SELECT (fjj.reveivableMoney - fjj.m) + FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney) + FROM anrui_fin.fin_selected_receivables_detailed as s + WHERE s.auditState = '3' + and s.receivablesSid = fj.sid), 0) as m, + fj.* + FROM (SELECT j.busSid, j.sid, j.reveivableMoney + FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j + WHERE j.payCostTitleKey = '006') as fj) as fjj + WHERE fjj.busSid = a.sid) as fund FROM ( SELECT pd.loanContractNo, pd.oweState, @@ -271,19 +288,16 @@ pd.deptSid, pd.busVinSid, pd.sid, - IFNULL(pd.fund, 0) AS fund, pd.dueMoney, pd.overdue, pd.salesOrderSid, t.repaidMoney, t.outstandingMoney, --- IFNULL( v.bankBeInter, 0 ) AS bankBeInter, IFNULL(pd.paymentInterest, 0) AS bankBeInter, pd.overdue AS dueOverdue, pd.updateTime AS updateDate FROM loan_repayment_plan_details AS pd LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid --- LEFT JOIN loan_be_padsincere_veh AS v ON v.saleVehSid = pd.busVinSid LEFT JOIN ( SELECT p.sid, IFNULL(( @@ -319,78 +333,86 @@