diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0a76720b64..41b1ef6e93 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/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(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> getNextNodesForSubmit(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query); + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getAppNextNodesForSubmit") + ResultBean> getAppNextNodesForSubmit(@Valid @SpringQueryMap LoanSecondarySalesApplyNodeQuery query); + @ApiOperation(value = "驳回任务") @PostMapping(value = "/reject") public ResultBean taskReject(@Valid @RequestBody LoanSecondarySalesApplyTaskQuery query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java index 3e9aea7fac..e4cc74efb5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyService.java +++ b/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> getAppNextNodesForSubmit(LoanSecondarySalesApplyNodeQuery query) { + return loanSecondarySalesApplyService.getAppNextNodesForSubmit(query); + } + @Override public ResultBean taskReject(LoanSecondarySalesApplyTaskQuery query) { return loanSecondarySalesApplyService.taskReject(query); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index eb4da94ce9..723b76e34b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/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> getAppNextNodesForSubmit(LoanSecondarySalesApplyNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + LoanSecondarySalesApply loanSecondarySalesApply = fetchBySid(query.getBusinessSid()); + bv.setModelId(loanSecondarySalesApply.getProcDefId()); + Map variables = new HashMap<>(); + Map 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>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给TemplateApplyNodeVo + List 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(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml index 20b4f8e93a..d9f527efa8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml +++ b/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 + + ${ew.sqlSegment} +