Merge remote-tracking branch 'origin/master'

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

@@ -30,7 +30,7 @@ public class LoanRepurchaseApplyDetailsVo implements Vo {
     private String taskId;
     @ApiModelProperty("实例id")
     private String instanceId;
-    private LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
+   // private LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
     //主体
     @ApiModelProperty("申请日期")
     private String applyDate;

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

@@ -47,5 +47,7 @@ public class LoanRepurchaseApplyVo implements Vo {
     private String procDefId; // 流程定义的id
     @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程实例的sid
 
 }

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

@@ -21,4 +21,5 @@ public class SettleApplyListQuery implements Query {
     private String vehMark;
     @ApiModelProperty("机构全路径")
     private String orgPath;
+    private String type;//1代表查询回购
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -81,25 +81,19 @@
                      WHERE lbpv.saleVehSid = a1.busVinSid),
                     0
                 ) + IFNULL(
-                        (SELECT (fjj.reveivableMoney - fjj.m)
+                        (select ifnull(SUM(a.reveivableMoney), 0) - IFNULL(sum(a.m), 0)
                          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 in (SELECT lrpd.sid
-                                              FROM loan_repayment_plan_details lrpd
-                                              WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE()
-                                                and lrpd.busVinSid = a1.busVinSid)),
+                                  select fjj.reveivableMoney,
+                                         (select IFNULL(SUM(s.subscriptionMoney), 0)
+                                          FROM anrui_fin.fin_selected_receivables_detailed AS s
+                                          WHERE s.auditState = '3'
+                                            AND s.receivablesSid = fjj.sid) as m
+                                  from anrui_fin.fin_uncollected_receivables_detailed_jr fjj
+                                  where fjj.busSid in (SELECT lrpd.sid
+                                                       FROM loan_repayment_plan_details lrpd
+                                                       WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{stopDate}
+                                                         and lrpd.busVinSid = a1.busVinSid)
+                                    and fjj.payCostTitleKey = '006') a),
                         0
                     )
             ) AS    overdueMoney,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -71,25 +71,19 @@
                      WHERE lbpv.saleVehSid = a1.busVinSid),
                     0
                 ) + IFNULL(
-                        (SELECT (fjj.reveivableMoney - fjj.m)
+                        (select ifnull(SUM(a.reveivableMoney), 0) - IFNULL(sum(a.m), 0)
                          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 in (SELECT lrpd.sid
-                                              FROM loan_repayment_plan_details lrpd
-                                              WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE()
-                                                and lrpd.busVinSid = a1.busVinSid)),
+                                  select fjj.reveivableMoney,
+                                         (select IFNULL(SUM(s.subscriptionMoney), 0)
+                                          FROM anrui_fin.fin_selected_receivables_detailed AS s
+                                          WHERE s.auditState = '3'
+                                            AND s.receivablesSid = fjj.sid) as m
+                                  from anrui_fin.fin_uncollected_receivables_detailed_jr fjj
+                                  where fjj.busSid in (SELECT lrpd.sid
+                                                       FROM loan_repayment_plan_details lrpd
+                                                       WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{stopDate}
+                                                         and lrpd.busVinSid = a1.busVinSid)
+                                    and fjj.payCostTitleKey = '006') a),
                         0
                     )
             )          AS overdueMoney,

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

@@ -180,7 +180,7 @@
     </select>
     <select id="selFundAllByBusVinSid" resultType="java.lang.String">
         SELECT
-        SUM(IFNULL((b.reveivableMoney - b.m),0)) as fund
+        IFNULL(SUM(IFNULL((b.reveivableMoney - b.m),0)),0) as fund
         FROM
         (SELECT
         a.*,

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

@@ -229,13 +229,14 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             if (null != loanRepurchaseApply.getPrepareDate()) {
                 vo.setPrepareDate(sdf.format(loanRepurchaseApply.getPrepareDate()));
             }
+            vo.setSalesOrderSid(loanRepurchaseApply.getSalesOrderSid());
             //------金融方案-----------
-            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(loanRepurchaseApply.getSalesOrderSid());
-            if (solutionsDetailsVoResultBean.getData() != null) {
-                LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
-                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
-                vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
-            }
+//            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(loanRepurchaseApply.getSalesOrderSid());
+//            if (solutionsDetailsVoResultBean.getData() != null) {
+//                LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
+//                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
+//                vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
+//            }
             //资方结清费用
             LoanRepurchaseBankCostVo bankCostVo = loanRepurchaseCostService.getByMainSid(sid);
             if (null != bankCostVo) {
@@ -351,12 +352,12 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
         //金融方案
         BusSalesOrderVehicle data = busSalesOrderVehicleFeign.details(busVinSid).getData();
         if (null != data) {
-            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(data.getSalesOrderSid());
-            if (solutionsDetailsVoResultBean.getData() != null) {
-                LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
-                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
-                vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
-            }
+//            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(data.getSalesOrderSid());
+//            if (solutionsDetailsVoResultBean.getData() != null) {
+//                LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
+//                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
+//                vo.setSolutionsDetailsssVo(solutionsDetailsssVo);
+//            }
             vo.setSalesOrderSid(data.getSalesOrderSid());
         }
         return rb.success().setData(vo);

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

@@ -103,25 +103,19 @@
                   #{settingDate}
               AND lrpd.busVinSid =
                   #{busVinSid})-->
-        SELECT ifnull((fjj.reveivableMoney - fjj.m), 0)
+        select ifnull(SUM(a.reveivableMoney), 0) - IFNULL(sum(a.m), 0)
         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 in (SELECT lrpd.sid
-                             FROM loan_repayment_plan_details lrpd
-                             WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{settingDate}
-                               and lrpd.busVinSid = #{busVinSid})
+                 select fjj.reveivableMoney,
+                        (select IFNULL(SUM(s.subscriptionMoney), 0)
+                         FROM anrui_fin.fin_selected_receivables_detailed AS s
+                         WHERE s.auditState = '3'
+                           AND s.receivablesSid = fjj.sid) as m
+                 from anrui_fin.fin_uncollected_receivables_detailed_jr fjj
+                 where fjj.busSid in (SELECT lrpd.sid
+                                      FROM loan_repayment_plan_details lrpd
+                                      WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{settingDate}
+                                        and lrpd.busVinSid = #{busVinSid})
+                   and fjj.payCostTitleKey = '006') a
     </select>
 
     <select id="selectGsYqYh" resultType="java.lang.String">

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

@@ -386,7 +386,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 }
                 loanSettleApplyDetailsVo.setLoanSettleCompanyReductionVo(loanSettleCompanyReductionVo);
             }
-            if(StringUtils.isNotBlank(loanSettleApply.getBusSid())){
+            if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
                 loanSettleApplyDetailsVo.setShowHg(true);
             }
         }
@@ -675,17 +675,17 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             }
         }
         LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(businessSid);
-        if(loanSettleCompanyCost != null){
-            if(loanSettleCompanyCost.getSettleAll() != null){
+        if (loanSettleCompanyCost != null) {
+            if (loanSettleCompanyCost.getSettleAll() != null) {
                 loanSettleVehicleDto.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
             }
         }
         LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
-        if(loanSettleCompanyReduction != null){
-            if(loanSettleCompanyReduction.getAmountTo() != null){
+        if (loanSettleCompanyReduction != null) {
+            if (loanSettleCompanyReduction.getAmountTo() != null) {
                 loanSettleVehicleDto.setAmountTo(loanSettleCompanyReduction.getAmountTo().toString());
             }
-            if(loanSettleCompanyReduction.getProfit() != null){
+            if (loanSettleCompanyReduction.getProfit() != null) {
                 loanSettleVehicleDto.setProfit(loanSettleCompanyReduction.getProfit().toString());
             }
         }
@@ -947,7 +947,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 qw.eq("ld.useOrgSid", useOrgSid);
             }
             qw.eq("bv.settleState", 0);
-
+            //回购状态，回购申请
+            if (StringUtils.isNotBlank(query.getType())) {
+                if (query.getType().equals("1")) {
+                    qw.eq("bv.repoState", 0);
+                }
+            }
         }
         IPage<LoanSettleApply> page = PagerUtil.queryToPage(pagerQuery);
         IPage<SettleApplyListVo> pagging = baseMapper.getListPage(page, qw);

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

@@ -1,5 +1,7 @@
 package com.yxt.anrui.terminal.api.risk.settleapply;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -50,11 +52,10 @@ public class SettleApplyAppVos {
     private String notDuePrice;
 
     @ApiModelProperty("实例id")
+    @JsonProperty("procInsId")
     private String procInstId;
     @ApiModelProperty("任务id")
     private String taskId;
-    @ApiModelProperty("环节id")
-    private String taskDefKey;
     @ApiModelProperty("是否勾选减免，true勾选，false不勾选")
     private boolean trueReduction;
 

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

@@ -122,6 +122,11 @@ public class SettleApplyService {
         ResultBean<CarModelVo> getLoanSolution = commonService.getLoanSolution(settleApplyAppVos.getSaleOrderSid());
         CarModelVo carModelVo = getLoanSolution.getData();
         settleApplyAppVos.setJrfa(carModelVo);
+        if(settleApplyAppVos.isTrueHg()){
+            if(StringUtils.isBlank(settleApplyAppVos.getSettingDateBe())){
+                settleApplyAppVos.setSettingDateBe("-");
+            }
+        }
         return rb.success().setData(settleApplyAppVos);
     }