Merge remote-tracking branch 'origin/master'

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

@@ -50,4 +50,6 @@ public class LoanRepurchaseApplyVo implements Vo {
     @ApiModelProperty("流程状态")
     private String nodeState; // 流程实例的sid
 
+    @ApiModelProperty("风控状态：0正常")
+    private Integer riskState;
 }

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

@@ -24,26 +24,28 @@
 
     <select id="listPage" resultType="com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApplyVo">
         SELECT
-        sid,
+        la.sid,
-        nodeState,
+        la.nodeState,
-        useOrgName,
+        la.useOrgName,
-        createDept,
+        la.createDept,
-        createByName,
+        la.createByName,
-        date_format(applyDate, '%Y-%m-%d' ) AS applyDate,
+        date_format(la.applyDate, '%Y-%m-%d' ) AS applyDate,
-        procDefId,
+        la.procDefId,
-        procInstId,
+        la.procInstId,
-        date_format(closeDate, '%Y-%m-%d' ) AS closeDate,
+        date_format(la.closeDate, '%Y-%m-%d' ) AS closeDate,
-        loanContractNo,
+        la.loanContractNo,
-        vinNo,
+        la.vinNo,
-        vehMark,
+        la.vehMark,
-        bankName,
+        la.bankName,
-        bankContractNo,
+        la.bankContractNo,
-        loanName,
+        la.loanName,
-        customerName,
+        la.customerName,
-        amount,
+        la.amount,
-        date_format(prepareDate, '%Y-%m-%d' ) AS prepareDate
+        date_format(la.prepareDate, '%Y-%m-%d' ) AS prepareDate,
+        bv.riskState
         FROM
-        loan_repurchase_apply
+        loan_repurchase_apply la
+        left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = la.busVinSid
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -140,18 +140,18 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             String orgLevelKey = defaultIdReltBean.getData();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("orgSidPath", orgSidPath);
+                qw.like("la.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("orgSidPath", orgSidPath);
+                qw.like("la.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("orgSidPath", orgSidPath);
+                qw.like("la.orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("orgSidPath", orgSidPath);
+                qw.like("la.orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("createBySid", pagerQuery.getUserSid());
+                qw.eq("la.createBySid", pagerQuery.getUserSid());
             } else {
                 PagerVo<LoanRepurchaseApplyVo> p = new PagerVo<>();
                 return p;
@@ -163,62 +163,62 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
         //=======================
         //分公司
         if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
-            qw.like("useOrgName", pagerQuery.getUseOrgName());
+            qw.like("la.useOrgName", pagerQuery.getUseOrgName());
         }
         //申请人
         if (StringUtils.isNotBlank(pagerQuery.getCreateByName())) {
-            qw.like("createByName", pagerQuery.getCreateByName());
+            qw.like("la.createByName", pagerQuery.getCreateByName());
         }
         //申请部门
         if (StringUtils.isNotBlank(pagerQuery.getCreateDept())) {
-            qw.like("createDept", pagerQuery.getCreateDept());
+            qw.like("la.createDept", pagerQuery.getCreateDept());
         }
         //消贷合同号
         if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
-            qw.like("loanContractNo", pagerQuery.getLoanContractNo());
+            qw.like("la.loanContractNo", pagerQuery.getLoanContractNo());
         }
         //资方
         if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
-            qw.like("bankName", pagerQuery.getBankName());
+            qw.like("la.bankName", pagerQuery.getBankName());
         }
         //资方合同号
         if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) {
-            qw.like("bankContractNo", pagerQuery.getBankContractNo());
+            qw.like("la.bankContractNo", pagerQuery.getBankContractNo());
         }
         //客户名称
         if (StringUtils.isNotBlank(pagerQuery.getCustomerName())) {
-            qw.like("customerName", pagerQuery.getCustomerName());
+            qw.like("la.customerName", pagerQuery.getCustomerName());
         }
         //贷款人
         if (StringUtils.isNotBlank(pagerQuery.getLoanName())) {
-            qw.like("loanName", pagerQuery.getLoanName());
+            qw.like("la.loanName", pagerQuery.getLoanName());
         }
         //车架号
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
-            qw.like("vinNo", pagerQuery.getVinNo());
+            qw.like("la.vinNo", pagerQuery.getVinNo());
         }
         //车牌号
         if (StringUtils.isNotBlank(pagerQuery.getVehMark())) {
-            qw.like("vehMark", pagerQuery.getVehMark());
+            qw.like("la.vehMark", pagerQuery.getVehMark());
         }
 
         String applyStartTime = pagerQuery.getApplyStartDate();
         String applyEndTime = pagerQuery.getApplyEndDate();
-        qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')").
+        qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (la.applyDate,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(applyEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')"
+                apply(StringUtils.isNotEmpty(applyEndTime), "date_format (la.applyDate,'%Y-%m-%d') <= date_format('" + applyEndTime + "','%Y-%m-%d')"
                 );
         String closingStartDate = pagerQuery.getCloseStartDate();
         String closingEndDate = pagerQuery.getCloseEndDate();
-        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (closeDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
+        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (la.closeDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (closeDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
+                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (la.closeDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
                 );
         String prepareStartDate = pagerQuery.getPrepareStartDate();
         String prepareEndDate = pagerQuery.getPrepareEndDate();
-        qw.apply(StringUtils.isNotEmpty(prepareStartDate), "date_format (prepareDate,'%Y-%m-%d') >= date_format('" + prepareStartDate + "','%Y-%m-%d')").
+        qw.apply(StringUtils.isNotEmpty(prepareStartDate), "date_format (la.prepareDate,'%Y-%m-%d') >= date_format('" + prepareStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(prepareEndDate), "date_format (prepareDate,'%Y-%m-%d') <= date_format('" + prepareEndDate + "','%Y-%m-%d')"
+                apply(StringUtils.isNotEmpty(prepareEndDate), "date_format (la.prepareDate,'%Y-%m-%d') <= date_format('" + prepareEndDate + "','%Y-%m-%d')"
                 );
-        qw.eq("isDelete", 0);
+        qw.eq("la.isDelete", 0);
-        qw.orderByDesc("applyDate");
+        qw.orderByDesc("la.applyDate");
         IPage<LoanRepurchaseApplyVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<LoanRepurchaseApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -611,9 +611,6 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
                 busVinStateSetQuery.setBusVinSidList(busVinSidList);
                 busVinStateSetQuery.setState(1);
                 ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
-                //将资金占用费状态修改为0
-                busVinStateSetQuery.setState(0);
-                ResultBean resultBean2 = busSalesOrderVehicleFeign.setFundState(busVinStateSetQuery);
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();