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/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());
+//            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(loanRepurchaseApply.getSalesOrderSid());
-            if (solutionsDetailsVoResultBean.getData() != null) {
+//            if (solutionsDetailsVoResultBean.getData() != null) {
-                LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
+//                LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
-                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
+//                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
-                vo.setSolutionsDetailsssVo(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());
+//            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsService.selectDetailss(data.getSalesOrderSid());
-            if (solutionsDetailsVoResultBean.getData() != null) {
+//            if (solutionsDetailsVoResultBean.getData() != null) {
-                LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
+//                LoanRepurchaseSolutionsDetailsssVo solutionsDetailsssVo = new LoanRepurchaseSolutionsDetailsssVo();
-                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
+//                BeanUtil.copyProperties(solutionsDetailsVoResultBean.getData(), solutionsDetailsssVo);
-                vo.setSolutionsDetailsssVo(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/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 != null) {
-            if(loanSettleCompanyCost.getSettleAll() != null){
+            if (loanSettleCompanyCost.getSettleAll() != null) {
                 loanSettleVehicleDto.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
             }
         }
         LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
-        if(loanSettleCompanyReduction != null){
+        if (loanSettleCompanyReduction != null) {
-            if(loanSettleCompanyReduction.getAmountTo() != 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);