Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -4688,7 +4688,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         confirmation.setConfirmDate(DateUtil.today());
         confirmation.setConfirmNameSid(userSid);
         baseMapper.updateById(confirmation);
-        pushToRiskToFin(confirmation, finSelectedReceivablesDetailedVos, collectionDate, voucher);
+        try {
+            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("demo-pool-%d").build();
+            ExecutorService pool = new java.util.concurrent.ThreadPoolExecutor(2, 100,
+                    0L, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new java.util.concurrent.ThreadPoolExecutor.AbortPolicy());
+            FinCollectionConfirmation finalConfirmation1 = confirmation;
+            Future future1 = pool.submit(() -> {
+                pushToRiskToFin(finalConfirmation1, finSelectedReceivablesDetailedVos, collectionDate, voucher);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
         //推送凭证业务
         if (!generalVoucherDetails.isEmpty()) {
             generalVoucher.setVoucherDetails(generalVoucherDetails);
@@ -4729,8 +4742,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         String customerNumber = "";
         for (int i = 0; i < finSelectedReceivablesDetailedVoList.size(); i++) {
             FinSelectedReceivablesDetailedVo v = finSelectedReceivablesDetailedVoList.get(i);
-            FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
-            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(finUncollectedReceivablesDetailed.getBusVinSid()).getData();
+            String planSid = "";
+            if (v.getReceivablesName().equals("月还")) {
+                planSid = v.getReceivablesSid();
+            } else {
+                FinUncollectedReceivablesDetailedJR jr = finUncollectedReceivablesDetailedJRService.fetchBySid(v.getReceivablesSid());
+                if (jr != null) {
+                    planSid = jr.getBusSid();
+                }
+            }
+            LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(planSid).getData();
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
             BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
             if (salesOrder != null && busSalesOrderVehicle != null) {
                 //判断财务系统是否有客户

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyFeign.java

@@ -56,6 +56,10 @@ public interface LoanSecondarySalesApplyFeign {
     @GetMapping(value = "/getNextNodesForSubmit")
     ResultBean<List<LoanSecondarySalesApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query);
 
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getAppNextNodesForSubmit")
+    ResultBean<List<LoanSecondarySalesApplyNodeVo>> getAppNextNodesForSubmit(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query);
+
     @ApiOperation(value = "驳回任务")
     @PostMapping(value = "/reject")
     public ResultBean taskReject(@Valid @RequestBody LoanSecondarySalesApplyTaskQuery query);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java

@@ -899,8 +899,8 @@ public class LoanRedemptionApplyService extends MybatisBaseService<LoanRedemptio
                 }
                 vinList.add(outboundVinListDto);
             });
+            dto.setVinList(vinList);
         }
-        dto.setVinList(vinList);
         loanOutboundApplyService.saveOutbound(dto);
     }
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyRest.java

@@ -72,6 +72,11 @@ public class LoanSecondarySalesApplyRest implements LoanSecondarySalesApplyFeign
         return loanSecondarySalesApplyService.getNextNodesForSubmit(query);
     }
 
+    @Override
+    public ResultBean<List<LoanSecondarySalesApplyNodeVo>> getAppNextNodesForSubmit(LoanSecondarySalesApplyNodeQuery query) {
+        return loanSecondarySalesApplyService.getAppNextNodesForSubmit(query);
+    }
+
     @Override
     public ResultBean taskReject(LoanSecondarySalesApplyTaskQuery query) {
         return loanSecondarySalesApplyService.taskReject(query);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -307,6 +307,36 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
         return rb.success().setData(voList);
     }
 
+    public ResultBean<List<LoanSecondarySalesApplyNodeVo>> getAppNextNodesForSubmit(LoanSecondarySalesApplyNodeQuery query) {
+        ResultBean<List<LoanSecondarySalesApplyNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        LoanSecondarySalesApply loanSecondarySalesApply = fetchBySid(query.getBusinessSid());
+        bv.setModelId(loanSecondarySalesApply.getProcDefId());
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        if ("Activity_0rm74ey".equals(bv.getTaskDefKey())) {//风控处置岗审批
+           /* if (StringUtils.isBlank(query.getVehicleEvaluation())) {
+                return rb.setMsg("请填写评估价格");
+            }*/
+            LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostMapper.selectMainSid(query.getBusinessSid());
+            if (loanSecondarySalesCost != null) {
+                if (new BigDecimal(query.getVehicleEvaluation()).compareTo(loanSecondarySalesCost.getVehPrice()) > 0) {
+                    variables.put("isTrue", true);
+                } else {
+                    variables.put("isTrue", false);
+                }
+            }
+        }
+        appMap.put("sid", query.getBusinessSid());
+        variables.put("app", appMap);
+        bv.setFormVariables(variables);
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo
+        List<LoanSecondarySalesApplyNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanSecondarySalesApplyNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
     public ResultBean taskReject(LoanSecondarySalesApplyTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
         String businessSid = query.getBusinessSid();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -25,7 +25,8 @@
             r.vehModelName,
             r.vehSid,
             r.vinNo,
-            v.salesDate AS saleDate,
+            DATE_FORMAT(v.salesDate, '%Y-%m-%d') AS saleDate,
+            DATE_FORMAT(v.salesDate, '%Y-%m-%d') AS acSaleDate,
             SUM(r.estimateRebate) AS estimateRebate,
             SUM(r.uploadMoney) AS uploadMoney,
             SUM(r.secondaryUploadMoney) AS secondaryUploadMoney,
@@ -47,7 +48,9 @@
                                                          ON o1.sid = o2.psid
             ) AS o
                           ON o.sid = r.useOrgSid
-        GROUP BY r.vehSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectPageVoUpload" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
@@ -263,7 +266,7 @@
             r.secondaryUploadDate,
             r.state,
             r.onceCheckState,
-            r.secondCheckState,
+            IF(r.secondaryUploadMoney > 0 AND r.isAdjustment = '是','是','否') AS secondCheckState,
             r.brandName,
             r.useOrgName,
             o.name AS division,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -424,6 +424,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         qw.apply(StringUtils.isNotBlank(acSaleDateStart), "date_format (createTime,'%Y-%m-%d') >= date_format('" + acSaleDateStart + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(acSaleDateEnd), "date_format (createTime,'%Y-%m-%d') <= date_format('" + acSaleDateEnd + "','%Y-%m-%d')"
                 );*/
+        qw.groupBy("r.vehSid");
         qw.orderByDesc("r.createTime");
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateStatVo> pagging = baseMapper.statistics(page, qw);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -279,24 +279,12 @@ public class AppBusArrearsCarryVehicleApplyService {
         GetNodeQuery getNodeQuery = new GetNodeQuery();
         BeanUtil.copyProperties(query, getNodeQuery);
         String data = "";
-        if (next == 0) {
-            ResultBean<List<GetNodeVo>> getPreviousNodesForReject = busArrearsCarryVehicleApplyFeign.getPreviousNodesForReject(getNodeQuery);
-            if (getPreviousNodesForReject.getSuccess()) {
-                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
-                data = getPreviousNodesForReject.getData().get(0).getName();
-            } else {
-                return rb.setMsg(getPreviousNodesForReject.getMsg());
-            }
-        } else if (next == 1) {
-            ResultBean<List<GetNodeVo>> getNextNodesForSubmit = busArrearsCarryVehicleApplyFeign.getNextNodesForSubmit(getNodeQuery);
-            if (getNextNodesForSubmit.getSuccess()) {
-                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
-                data = getNextNodesForSubmit.getData().get(0).getName();
-            } else {
-                return rb.setMsg(getNextNodesForSubmit.getMsg());
-            }
+        ResultBean<List<GetNodeVo>> getNextNodesForSubmit = busArrearsCarryVehicleApplyFeign.getNextNodesForSubmit(getNodeQuery);
+        if (getNextNodesForSubmit.getSuccess()) {
+            getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+            data = getNextNodesForSubmit.getData().get(0).getName();
         } else {
-            return rb.setMsg("参数错误：next");
+            return rb.setMsg(getNextNodesForSubmit.getMsg());
         }
         arrearsVo.setTitle(data);
         ResultBean<AdvanceArrearsInfoVo> details = details(query.getBusinessSid());

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java

@@ -212,28 +212,15 @@ public class SecondarySalesService {
     public ResultBean<SecondSalesInitVo> getFlowOperateTitleBy(SecondarySalesQuery query) {
         ResultBean<SecondSalesInitVo> rb = ResultBean.fireFail();
         SecondSalesInitVo secondSalesInitVo = new SecondSalesInitVo();
-        int next = query.getNext();
         LoanSecondarySalesApplyNodeQuery getNodeQuery = new LoanSecondarySalesApplyNodeQuery();
         BeanUtil.copyProperties(query, getNodeQuery);
         String data = "";
-        if (next == 0) {
-            ResultBean<List<LoanSecondarySalesApplyNodeVo>> getPreviousNodesForReject = loanSecondarySalesApplyFeign.getPreviousNodesForReject(getNodeQuery);
-            if (getPreviousNodesForReject.getSuccess()) {
-                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
-                data = getPreviousNodesForReject.getData().get(0).getName();
-            } else {
-                return rb.setMsg(getPreviousNodesForReject.getMsg());
-            }
-        } else if (next == 1) {
-            ResultBean<List<LoanSecondarySalesApplyNodeVo>> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getNextNodesForSubmit(getNodeQuery);
-            if (getNextNodesForSubmit.getSuccess()) {
-                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
-                data = getNextNodesForSubmit.getData().get(0).getName();
-            } else {
-                return rb.setMsg(getNextNodesForSubmit.getMsg());
-            }
+        ResultBean<List<LoanSecondarySalesApplyNodeVo>> getNextNodesForSubmit = loanSecondarySalesApplyFeign.getAppNextNodesForSubmit(getNodeQuery);
+        if (getNextNodesForSubmit.getSuccess()) {
+            getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+            data = getNextNodesForSubmit.getData().get(0).getName();
         } else {
-            return rb.setMsg("参数错误：next");
+            return rb.setMsg(getNextNodesForSubmit.getMsg());
         }
         secondSalesInitVo.setTitle(data);
         List<ItemEditTextInfoCommon> itemEditTextInfos = new ArrayList<>();