From 06de702a7016603d2911ff01fa5d6f3b446d2224 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 10 Jan 2025 09:08:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentPlanDetailsMapper.xml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml index 58c97cd02c..3c00e3c4b3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml @@ -4,7 +4,7 @@ insert into loan_repayment_plan_details(createBySid,sid,createTime,isEnable,salesOrderSid,loanContractSid,loanContractNo, - policyName,bankContractNo,customer,customerSid,borrowerSid,borrowerName,`period`,scheduleSid,bankName,deptSid,dept,useOrgSid,useOrgName, + policyName,bankContractNo,customer,customerSid,borrowerSid,borrowerName,period,scheduleSid,bankName,deptSid,dept,useOrgSid,useOrgName, orgSidPath,busVinSid,vinNo,vehMark,policyOrOther,dueMoney,dueDate,updateTime) values @@ -57,7 +57,7 @@ select * from loan_repayment_plan_details where bankContractNo = #{bankContractNo} - and `period` = #{period} + and period = #{period} -- and policyOrOther = '0' @@ -65,17 +65,17 @@ SELECT ( a.yq_total - IFNULL(a.actualMoney, 0) ) AS yq_total - FROM (SELECT lrpd.`dueMoney` AS yq_total, + FROM (SELECT lrpd.dueMoney AS yq_total, (SELECT SUM(IFNULL(lrh.actualMoney, 0)) FROM loan_repayment_history lrh - WHERE lrh.planDetailSid = lrpd.`sid` - AND lrh.`updateState` = '1') AS actualMoney - FROM `loan_repayment_plan_details` lrpd + WHERE lrh.planDetailSid = lrpd.sid + AND lrh.updateState = '1') AS actualMoney + FROM loan_repayment_plan_details lrpd WHERE lrpd.vinNo = #{no} AND lrpd.period = #{period} AND lrpd.bankContractNo = #{bankContractNo} AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() - GROUP BY lrpd.`sid` + GROUP BY lrpd.sid HAVING (yq_total > 0)) a @@ -83,20 +83,20 @@ SELECT lrpd.useOrgName, lrpd.dept, lrpd.staffName, - RIGHT (lrpd.`vinNo`, 8) AS vinNo, - lrpd.`loanContractNo`, - lrpd.`bankName`, + RIGHT (lrpd.vinNo, 8) AS vinNo, + lrpd.loanContractNo, + lrpd.bankName, lrpd.bankContractNo, lrpd.customer, lrpd.borrowerName, ( - lrpd.`dueMoney` - SUM (IFNULL(lrh.actualMoney, 0)) + lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0)) ) AS notRepaidMoney FROM - `loan_repayment_plan_details` lrpd - LEFT JOIN `loan_repayment_history` lrh - ON lrh.planDetailSid = lrpd.`sid` - LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv + loan_repayment_plan_details lrpd + LEFT JOIN loan_repayment_history lrh + ON lrh.planDetailSid = lrpd.sid + LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON lrpd.busVinSid = bv.sid LEFT JOIN (SELECT @@ -107,13 +107,13 @@ ORDER BY createTime DESC LIMIT 1) lr ON lrpd.busVinSid = lr.saleVehSid - LEFT JOIN anrui_crm.`crm_customer_temp` ct + LEFT JOIN anrui_crm.crm_customer_temp ct ON lrpd.customerSid = ct.sid WHERE DATE_FORMAT(lrpd.dueDate , '%Y-%m-%d') < CURDATE() AND lrpd.busVinSid = #{saleVehSid} - GROUP BY lrpd.`sid` + GROUP BY lrpd.sid HAVING (notRepaidMoney > 0) ORDER BY lrpd.period LIMIT 1 @@ -124,12 +124,12 @@ lrpd.dueMoney, SUM(IFNULL(lrh.actualMoney, 0)) AS receiptMoney, ( - lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0)) + lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0)) ) AS notRepaidMoney - FROM `loan_repayment_plan_details` lrpd - LEFT JOIN `loan_repayment_history` lrh - ON lrh.planDetailSid = lrpd.`sid` - LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv + FROM loan_repayment_plan_details lrpd + LEFT JOIN loan_repayment_history lrh + ON lrh.planDetailSid = lrpd.sid + LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON lrpd.busVinSid = bv.sid LEFT JOIN (SELECT saleVehSid, @@ -137,11 +137,11 @@ FROM loan_be_collection_record ORDER BY createTime DESC LIMIT 1) lr ON lrpd.busVinSid = lr.saleVehSid - LEFT JOIN anrui_crm.`crm_customer_temp` ct + LEFT JOIN anrui_crm.crm_customer_temp ct ON lrpd.customerSid = ct.sid WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() AND lrpd.busVinSid = #{saleVehSid} - GROUP BY lrpd.`sid` + GROUP BY lrpd.sid HAVING (notRepaidMoney > 0) ORDER BY lrpd.period From 8abb88f2600b1b81de72979dab124e6657aae7c1 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 10 Jan 2025 11:27:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyService.java | 17 ++++- .../ScmSpecialrebateCheckapplyRest.java | 2 +- .../ScmSpecialrebateCheckapplyService.java | 52 +++++++++++++- .../ScmSpecialrebatedistributeRest.java | 2 +- .../ScmSpecialrebatedistributeService.java | 67 +++++++++++++++++-- .../ScmSpecialRebateWithApplyRest.java | 2 +- .../ScmSpecialRebateWithApplyService.java | 53 ++++++++++++++- .../ScmVehrebateCheckapplyRest.java | 2 +- .../ScmVehrebateCheckapplyService.java | 53 ++++++++++++++- .../ScmVehRebateWithApplyRest.java | 2 +- .../ScmVehRebateWithApplyService.java | 54 +++++++++++++-- 11 files changed, 282 insertions(+), 24 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 5173c0a2ee..8548cf0212 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -902,15 +902,28 @@ public class FinPaymentapplyService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } - updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); return rb.success().setData(resultBean.getData()); + } else { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } } } return rb.setMsg("操作失败!提交的数据不一致!"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index 3587982c56..2b8f9def1c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -147,7 +147,7 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + bv.setModelId(""); return scmSpecialrebateCheckapplyService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 4f1f8a1684..1474d1ad35 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -38,6 +38,7 @@ import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -371,9 +372,16 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(dto.getSid()); if (r == 1) { @@ -881,6 +889,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); if (bv.getTaskId().equals(scmSpecialrebateCheckapply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -943,6 +960,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -1017,7 +1043,17 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialrebateCheckapply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -1029,7 +1065,17 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialrebateCheckapply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java index 5e2bd785ba..df0a16e028 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java @@ -106,7 +106,7 @@ public class ScmSpecialrebatedistributeRest implements ScmSpecialrebatedistribut public ResultBean complete(ScmSpecialRebatedistributeCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId()); + bv.setModelId(""); return scmSpecialrebatedistributeService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java index db1a26e60c..2f02309c05 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java @@ -31,6 +31,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -53,6 +54,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.SubmitScmSpecialReb import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetail; import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDto; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; import com.yxt.anrui.scm.biz.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailService; import com.yxt.anrui.scm.biz.scmspecialrebatevehs.ScmSpecialrebateVehsService; @@ -332,9 +334,16 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -391,6 +400,15 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); if (bv.getTaskId().equals(scmSpecialrebatedistribute.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -441,6 +459,15 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebatedistribute.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -465,7 +492,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -475,6 +502,18 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + scmSpecialRebateService.updateState(query.getBusinessSid(), 4); + return rb.success().setData(resultBean.getData()); + } } } return rb.setMsg("操作失败!提交的数据不一致!"); @@ -488,7 +527,17 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialrebatedistribute scmSpecialrebatedistribute = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialrebatedistribute.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebatedistribute.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -500,7 +549,17 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialrebatedistribute scmSpecialrebatedistribute = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialrebatedistribute.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebatedistribute.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java index c9cd67f7c6..26d651a1c9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java @@ -121,7 +121,7 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); + bv.setModelId(""); return scmSpecialRebateWithApplyService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java index 4a7635caeb..fa4771966d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java @@ -38,6 +38,7 @@ import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -63,6 +64,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyDelegateQuery; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply; import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailsVo; import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailssVo; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; @@ -366,9 +368,16 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService scmSpecialRebateWiths = dto.getScmSpecialRebateWiths(); for (ScmSpecialRebateWithDto scmSpecialRebateWith : scmSpecialRebateWiths) { @@ -555,6 +564,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); List specialRebateSids = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(scmSpecialRebateWithApply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); @@ -610,6 +628,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -676,7 +703,17 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialRebateWithApply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -688,7 +725,17 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialRebateWithApply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java index f9ebf1209f..f370b539e5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java @@ -157,7 +157,7 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign { public ResultBean complete(ScmVehRebateCheckApplyCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId()); + bv.setModelId(""); return scmVehrebateCheckapplyService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index 46e3b61a83..e4b64902a5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -42,6 +42,7 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -67,6 +68,7 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.SubmitScmVehRebateCheck import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApply; import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService; import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; @@ -389,9 +391,16 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(dto.getSid()); if (r == 1) { @@ -459,6 +468,15 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); if (bv.getTaskId().equals(scmVehrebateCheckapply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -856,6 +874,15 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -931,7 +958,17 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmVehrebateCheckapply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -943,7 +980,17 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmVehrebateCheckapply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java index 8e64c65242..6091f64996 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java @@ -120,7 +120,7 @@ public class ScmVehRebateWithApplyRest implements ScmVehRebateWithApplyFeign { public ResultBean complete(ScmVehRebateWithApplyCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId()); + bv.setModelId(""); return scmVehRebateWithApplyService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index 34844f33cf..b68e6fc05a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -38,10 +38,12 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -371,9 +373,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService scmVehRebateWiths = dto.getScmVehRebateWiths(); for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) { @@ -632,6 +641,15 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); List vehRebateSids = scmVehRebateWithService.fetchVehReBateSidByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(scmVehRebateWithApply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); @@ -646,7 +664,6 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -755,7 +781,17 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmVehRebateWithApply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -767,7 +803,17 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmVehRebateWithApply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); From c403f6c060ee3649db2a11e42402e3185eabd118 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 10 Jan 2025 11:59:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B9=E6=8D=AEorgSid?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/sysstafforg/SysStaffOrgService.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 79082592f9..24ddf33dfb 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -344,16 +344,15 @@ public class SysStaffOrgService extends MybatisBaseService getOrgByPath(String orgSidPath) { ResultBean rb = ResultBean.fireFail(); OrgVo orgVo = new OrgVo(); - List stringList = Arrays.asList(orgSidPath.split("/")); - //根据orgSidPath查询该组织的层级 - SysOrganization sysOrganization = baseMapper.selectOrgSidPath(orgSidPath); - if ("1".equals(sysOrganization.getOrgLevelKey())) { - sysOrganization = sysOrganizationService.fetchBySid(stringList.get(0)); - } else if ("2".equals(sysOrganization.getOrgLevelKey())) { - sysOrganization = sysOrganizationService.fetchBySid(stringList.get(1)); + String[] levels = orgSidPath.split("/"); // 将orgSidPath按'/'分割 + String orgSid = ""; + // 判断层级 + if (levels.length > 3) { + orgSid = levels[2]; // 第三层级的sid } else { - sysOrganization = sysOrganizationService.fetchBySid(stringList.get(2)); + orgSid = levels[levels.length - 2]; // 倒数第二层级的sid } + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); orgVo.setUseOrgName(sysOrganization.getName()); orgVo.setUseOrgSid(sysOrganization.getSid()); orgVo.setOrgCode(sysOrganization.getOrgCode()); From 33b9cacf5346e5b02bb93bb0c9174a61c31622c5 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 10 Jan 2025 14:36:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../LoanBeOverdueVehExcelVo.java | 38 +++ .../LoanBeOverdueVehMapper.java | 9 +- .../LoanBeOverdueVehMapper.xml | 247 ++++++++++++++---- .../LoanBeOverdueVehRest.java | 26 +- .../LoanBeOverdueVehService.java | 101 ++++++- 6 files changed, 364 insertions(+), 59 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehExcelVo.java diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index d938239201..737b54c28b 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -23,7 +23,7 @@ public enum ProcDefEnum { // BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"), FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"), - FINPAYAPPLY("付款申请", "process_gin2tntb:5:16412504"), + FINPAYAPPLY("付款申请", "process_gin2tntb:6:16692504"), RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"), SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"), diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehExcelVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehExcelVo.java new file mode 100644 index 0000000000..5870be2ce2 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehExcelVo.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.riskcenter.api.loanbeoverdueveh; + +import com.yxt.common.core.utils.ExportEntityMap; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +@Data +public class LoanBeOverdueVehExcelVo { + + @ExportEntityMap(CnName = "序号", EnName = "rankNo") + private Integer rankNo; + @ExportEntityMap(CnName = "分公司", EnName = "useOrgName") + private String useOrgName; + @ExportEntityMap(CnName = "销售部门", EnName = "dept") + private String dept; + @ExportEntityMap(CnName = "贷款合同编号", EnName = "loanContractNo") + private String loanContractNo; + @ExportEntityMap(CnName = "车架号", EnName = "vinNo") + private String vinNo; + @ExportEntityMap(CnName = "车牌号", EnName = "carNum") + private String carNum; + @ExportEntityMap(CnName = "贷款人", EnName = "borrowerName") + private String borrowerName; + @ExportEntityMap(CnName = "还款操作人", EnName = "repaymentName") + private String repaymentName; + @ExportEntityMap(CnName = "逾期期数", EnName = "beOverduePeriod") + private String beOverduePeriod; + @ExportEntityMap(CnName = "逾期金额", EnName = "beOverdueMoney") + private String beOverdueMoney; + @ExportEntityMap(CnName = "换算期数", EnName = "beOverdueMoneyAndPeriod") + private String beOverdueMoneyAndPeriod; + @ExportEntityMap(CnName = "最近催收日期", EnName = "createTime") + private String createTime; + @ExportEntityMap(CnName = "风控专员", EnName = "riskStaffUserName") + private String riskStaffUserName; + @ExportEntityMap(CnName = "远程控制状态", EnName = "lockCarState") + private String lockCarState; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java index 814a668c01..47579ddde5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java @@ -1,18 +1,15 @@ package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit; +import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehExcelVo; import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo; import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.ReaRepaymentVo; -import com.yxt.anrui.riskcenter.api.loanborrower.AppLoanBorrowerListVo; -import com.yxt.anrui.riskcenter.api.loanborrower.LoanBorrower; -import com.yxt.anrui.riskcenter.api.loanborrower.LoanBorrowerVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; @@ -26,4 +23,6 @@ public interface LoanBeOverdueVehMapper { List initVehListByBorrSid(String borrowerSid); ReaRepaymentVo initReaRepayment(String saleVehSid); + + List excelList(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index 7445812721..7c80365ea6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -7,21 +7,21 @@ + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java index e82511ac60..90ab607b39 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java @@ -1,15 +1,21 @@ package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh; import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.*; -import com.yxt.anrui.riskcenter.api.loanborrower.*; +import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.List; @Api(tags = "逾期车辆列表") @@ -19,6 +25,8 @@ public class LoanBeOverdueVehRest implements LoanBeOverdueVehFegin { @Autowired private LoanBeOverdueVehService loanBeOverdueVehService; + @Autowired + private HttpServletResponse response; @Override public ResultBean> listPage(PagerQuery pq) { @@ -27,6 +35,22 @@ public class LoanBeOverdueVehRest implements LoanBeOverdueVehFegin { return rb.success().setData(pv); } + @ApiOperation("导出") + @PostMapping("/excelList") + public void excelList(@RequestBody LoanBeOverdueVehQuery query) { + //得到所有要导出的数据 + List exportVoList = loanBeOverdueVehService.excelList(query); + //定义导出的excel名字 + String excelName = "逾期车辆列表"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ExportExcelUtils.export(fileNameURL, exportVoList, LoanBeOverdueVehExcelVo.class, response); + } + @Override public ResultBean> riskListPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java index 05f9d191df..3782464e6a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java @@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; -import com.yxt.anrui.buscenter.api.bussalesvehicle.BusSalesVehicleFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -17,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -205,4 +205,103 @@ public class LoanBeOverdueVehService { ReaRepaymentVo reaRepaymentVo = loanBeOverdueVehMapper.initReaRepayment(saleVehSid); return reaRepaymentVo; } + + public List excelList(LoanBeOverdueVehQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("a1.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("a1.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("a1.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("a1.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("a1.createBySid", query.getUserSid()); + } else { + List loanBeOverdueVehExcelVoArrayList = new ArrayList(); + return loanBeOverdueVehExcelVoArrayList; + } + } else { + List loanBeOverdueVehExcelVoArrayList = new ArrayList(); + return loanBeOverdueVehExcelVoArrayList; + } + } + if (query.getIsFP()) { + qw.isNull("a1.riskStaffUserName"); + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("a1.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getDept())) { + qw.like("a1.dept", query.getDept()); + } + if (StringUtils.isNotBlank(query.getLoanContractNo())) { + qw.like("a1.loanContractNo", query.getLoanContractNo()); + } + if (StringUtils.isNotBlank(query.getBorrowerName())) { + qw.like("a1.borrowerName", query.getBorrowerName()); + } + if (StringUtils.isNotBlank(query.getRepaymentName())) { + qw.like("a1.reaRepaymentName", query.getRepaymentName()); + } + if (StringUtils.isNotBlank(query.getCarNum())) { + qw.like("a1.vehMark", query.getCarNum()); + } + if (StringUtils.isNotBlank(query.getBankName())) { + qw.like("a1.bankName", query.getBankName()); + } + if (StringUtils.isNotBlank(query.getBankContractNo())) { + qw.like("a1.bankContractNo", query.getBankContractNo()); + } + if (StringUtils.isNotBlank(query.getRiskStaffName())) { + qw.like("a1.riskStaffUserName", query.getRiskStaffName()); + } + if (StringUtils.isNotBlank(query.getLockCarState())) { + qw.eq("a1.lockCarState", query.getLockCarState()); + } + if (StringUtils.isNotBlank(query.getVinNo())) { + qw.like("a1.vinNo", query.getVinNo()); + } + String collectionStartDate = query.getCollectionStartDate(); + String collectionEndDate = query.getCollectionEndDate(); + qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(collectionEndDate), "date_format (a1.createTime,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')" + ); + qw.groupBy("a1.loanContractNo"); + qw.groupBy("a1.vinNo"); + qw.groupBy("a1.busVinSid"); + if (StringUtils.isNotBlank(query.getBeOverduePeriod())) { + qw.having("beOverduePeriod = {0}", query.getBeOverduePeriod()); + } + if (StringUtils.isNotBlank(query.getBeOverdueMoney())) { + qw.having("beOverdueMoney = {0}", query.getBeOverdueMoney()); + } + if (StringUtils.isNotBlank(query.getBeOverdueMoneyAndPeriod())) { + qw.having("beOverdueMoneyAndPeriod = {0}", query.getBeOverdueMoneyAndPeriod()); + } + List loanBeOverdueVehExcelVos = loanBeOverdueVehMapper.excelList(qw); + return loanBeOverdueVehExcelVos; + } } \ No newline at end of file From 775f16c3ea2a542d274e28ba847eb2328eba75cd Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 10 Jan 2025 14:37:07 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E8=B4=B4=E6=81=AF=E5=B7=AE=E5=BC=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/cheliang/dictcommons.js | 9 + .../financialDiscount/financialDiscount.js | 135 +++++ .../src/router/modules/codemenu.js | 51 +- .../differenceManagement.vue | 352 +++++++++++++ .../differenceManagementAdd.vue | 436 +++++++++++++++++ .../differenceManagementInfo.vue | 203 ++++++++ .../relation/chooseAdjustment.vue | 227 +++++++++ .../differenceManagement/varianceDetail.vue | 266 ++++++++++ .../differentialAdjustment.vue | 251 ++++++++++ .../differenceManagementDaiBan.vue | 463 ++++++++++++++++++ .../differenceManagementEdit.vue | 405 +++++++++++++++ .../differenceManagementYiBan.vue | 249 ++++++++++ .../relation/chooseAdjustment.vue | 227 +++++++++ 13 files changed, 3273 insertions(+), 1 deletion(-) create mode 100644 anrui-scm/anrui-scm-ui/src/api/financialDiscount/financialDiscount.js create mode 100644 anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/relation/chooseAdjustment.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/varianceDetail.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementDaiBan.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementYiBan.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/relation/chooseAdjustment.vue diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js index 449f4870d0..8643d28b28 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js @@ -139,6 +139,15 @@ export function selectOrgList(data) { }) } +// 根据当前登录用户sid获取本分公司下的销售专员 +export function selectStaffListByUseOrgSid(data) { + return request({ + url: '/portal/v1/sysorganization/selectStaffListByUseOrgSid', + method: 'get', + params: data + }) +} + // 根据选择的销售专员获取客户 export function selectCustomerList(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/api/financialDiscount/financialDiscount.js b/anrui-scm/anrui-scm-ui/src/api/financialDiscount/financialDiscount.js new file mode 100644 index 0000000000..04ba91d975 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/api/financialDiscount/financialDiscount.js @@ -0,0 +1,135 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 -- 金融差异调整管理 + finAdjustList: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/finAdjustList', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 金融差异调整申请 + listPage: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/listPage', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 金融贴息差异调整申请选择车辆 + getAdjustVehList: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/getAdjustVehList', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 金融贴息差异调整申请选择车辆 + adjustDetail: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustdetails/listPage', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 删除 + delete: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 新增保存修改记录 + save: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 通过sid查询一条记录 + fetchBySid: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + // 提交流程 + submit: function(params) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/submit', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（同意） + complete: function(params) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（加签） + delegate: function(params) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/delegate', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/scm/v1/scmfinanceadjustapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 0dd278e386..ba8b6673d5 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -1054,7 +1054,35 @@ const codemenu = [{ } ] }, - + // 金融贴息差异调整 + { + path: '/financialDiscount', + component: Layout, + redirect: '/financialDiscount', + meta: { + title: '金融贴息差异调整' + }, + children: [ + { + path: '/financialDiscount/differentialAdjustment', + component: () => import('@/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue'), + name: 'DifferentialAdjustment', + meta: { + title: '差异调整管理', + noCache: true + } + }, + { + path: '/financialDiscount/differenceManagement', + component: () => import('@/views/financialDiscount/differenceManagement/differenceManagement.vue'), + name: 'DifferenceManagement', + meta: { + title: '差异调整申请', + noCache: true + } + } + ] + }, // 流程审批 // 入库管理编辑 { @@ -1571,6 +1599,27 @@ const codemenu = [{ component: () => import('@/views/workFlow/chaijianpankuiFlow/inventoryLossesYiBan.vue'), name: 'InventoryLossesYiBan' + }, + // 金融贴息差异调整申请待办详情页面 + { + path: '/chayitiaozhengFlow/differenceManagementDaiBan', + component: () => + import('@/views/workFlow/chayitiaozhengFlow/differenceManagementDaiBan.vue'), + name: 'differenceManagementDaiBan' + }, + // 金融贴息差异调整申请已办详情 + { + path: '/chayitiaozhengFlow/differenceManagementEdit', + component: () => + import('@/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue'), + name: 'DifferenceManagementEdit' + }, + // 金融贴息差异调整申请办理 + { + path: '/chayitiaozhengFlow/differenceManagementYiBan', + component: () => + import('@/views/workFlow/chayitiaozhengFlow/differenceManagementYiBan.vue'), + name: 'DifferenceManagementYiBan' } ] export default codemenu diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue new file mode 100644 index 0000000000..8ecbb80af7 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue @@ -0,0 +1,352 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue new file mode 100644 index 0000000000..7544116716 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue @@ -0,0 +1,436 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementInfo.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementInfo.vue new file mode 100644 index 0000000000..fdfb58b1dd --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementInfo.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/relation/chooseAdjustment.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/relation/chooseAdjustment.vue new file mode 100644 index 0000000000..55d0e0c4ab --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/relation/chooseAdjustment.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/varianceDetail.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/varianceDetail.vue new file mode 100644 index 0000000000..c1f2957e5e --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/varianceDetail.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue new file mode 100644 index 0000000000..966703747e --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementDaiBan.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementDaiBan.vue new file mode 100644 index 0000000000..8387dac643 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementDaiBan.vue @@ -0,0 +1,463 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue new file mode 100644 index 0000000000..cf99a6ebe1 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue @@ -0,0 +1,405 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementYiBan.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementYiBan.vue new file mode 100644 index 0000000000..d20b3247c4 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementYiBan.vue @@ -0,0 +1,249 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/relation/chooseAdjustment.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/relation/chooseAdjustment.vue new file mode 100644 index 0000000000..22a0854f2f --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/relation/chooseAdjustment.vue @@ -0,0 +1,227 @@ + + + + + From 04a2ea7593f505dff8bb5e26b59e0259ee97aac8 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 10 Jan 2025 14:42:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=BE=E6=9C=9F?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=88=97=E8=A1=A8=20--=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/overduevehicle/overduevehicle.js | 9 +++++ .../views/overduevehicle/overduevehicle.vue | 35 +++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js b/anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js index 95c1131fdb..ce3c0f2c2b 100644 --- a/anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js +++ b/anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js @@ -10,6 +10,15 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + exportExcel(data) { + return request({ + url: '/riskcenter/v1/Loanbeoverdueveh/excelList', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 风控专员--查看的逾期车辆列表 riskListPage: function(data) { return request({ diff --git a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue index 859a8d351e..21c6f9c5da 100644 --- a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue +++ b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue @@ -158,6 +158,13 @@ export default { btnKey: 'toAllot', btnLabel: '分配风控人员' }, + { + type: 'primary', + size: 'small', + icon: 'export', + btnKey: 'doExport', + btnLabel: '导出' + }, { type: 'info', size: 'small', @@ -263,6 +270,9 @@ export default { break case 'toAllot': this.toAllot() + case 'doExport': + this.doExport() + break break case 'doClose': this.doClose() @@ -381,6 +391,31 @@ export default { this.$message({ showClose: true, type: 'error', message: '请选择风控人员' }) } }, + doExport() { + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + req.exportExcel(this.listQuery.params).then((resp) => { + loading.close() + const blob = new Blob([resp], { + type: 'application/vnd.ms-excel' + }) + const fileName = '逾期车辆列表' + '.xls' + const elink = document.createElement('a') + elink.download = fileName + elink.style.display = 'nonde' + elink.href = URL.createObjectURL(blob) + document.body.appendChild(elink) + elink.click() + URL.revokeObjectURL(elink.href) + document.body.removeChild(elink) + }).catch(() => { + loading.close() + }) + }, resetState() { this.viewState = 1 },