yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 4 months ago
parent
775f16c3ea 0a6e39e93a
commit
f5ad7b82ca
19 changed files with 677 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  2. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  3. 15
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
  4. 38
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehExcelVo.java
  5. 9
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java
  6. 247
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
  7. 26
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java
  8. 101
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java
  9. 48
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
  10. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
  11. 52
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  12. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java
  13. 67
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
  14. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java
  15. 53
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
  16. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
  17. 53
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
  18. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
  19. 54
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

17
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
View File

@ -902,15 +902,28 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
String businessTaskId = finPaymentapply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (query.getUserSid().equals(finPaymentapply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
return rb.success().setData(resultBean.getData());
}
}
}
return rb.setMsg("操作失败!提交的数据不一致!");

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -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"),

15
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java
View File

@ -344,16 +344,15 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
public ResultBean<OrgVo> getOrgByPath(String orgSidPath) {
ResultBean<OrgVo> rb = ResultBean.fireFail();
OrgVo orgVo = new OrgVo();
List<String> 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());

38
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehExcelVo.java
View File

@ -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;
}

9
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java
View File

@ -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<LoanBeCollectionRecordVehInit> initVehListByBorrSid(String borrowerSid);
ReaRepaymentVo initReaRepayment(String saleVehSid);
List<LoanBeOverdueVehExcelVo> excelList(@Param(Constants.WRAPPER) QueryWrapper<LoanBeOverdueVehVo> qw);
}

247
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml
View File

@ -7,21 +7,21 @@
<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo">
SELECT
a1.busVinSid AS saleVehSid,
a1.`useOrgName`,
a1.`dept`,
a1.`loanContractNo`,
a1.useOrgName,
a1.dept,
a1.loanContractNo,
a1.borrowerName,
RIGHT(a1.vinNo, 8) AS vinNo,
a1.vehMark AS carNum,
a1.`bankName`,
a1.`bankContractNo`,
a1.bankName,
a1.bankContractNo,
a1.dueMoney AS bankMonthRep,
a1.dueDate AS firstBeDate,
COUNT(a1.sid) AS beOverduePeriod,
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
SUM(lbpv.bankBeInter)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
@ -44,7 +44,7 @@
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
SUM(lbpv.bankBeInter)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
@ -77,26 +77,26 @@
(SELECT
lrpd.sid,
lrpd.busVinSid,
lrpd.`useOrgName`,
lrpd.`dept`,
lrpd.`loanContractNo`,
lrpd.useOrgName,
lrpd.dept,
lrpd.loanContractNo,
lrpd.borrowerName,
lrpd.`vinNo`,
lrpd.`vehMark`,
lrpd.`bankName`,
lrpd.`bankContractNo`,
lrpd.vinNo,
lrpd.vehMark,
lrpd.bankName,
lrpd.bankContractNo,
lrpd.dueMoney,
lrpd.dueDate,
(
IFNULL(lrs.mainMidRepay, 0) + IFNULL(lrs.otherMidRepay, 0)
) AS qjyh,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.`dueMoney` AS yq_hsqs,
lrpd.`paymentMoney` AS yd_dkje,
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.dueMoney AS yq_hsqs,
lrpd.paymentMoney AS yd_dkje,
lrpd.fund AS yd_zjzyf,
lrpd.orgSidPath,
lrpd.createBySid,
@ -126,10 +126,10 @@
ORDER BY lbca.createTime DESC
LIMIT 1) AS lockCarState
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 loan_repayment_schedule lrs
ON lrpd.scheduleSid = lrs.sid
@ -142,7 +142,7 @@
ORDER BY createTime DESC) lr
ON lrpd.busVinSid = lr.saleVehSid
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
GROUP BY lrpd.`sid`
GROUP BY lrpd.sid
HAVING (yq_total > 0)) a1
<where>
${ew.sqlSegment}
@ -151,7 +151,7 @@
<update id="allocationRiskStaff">
UPDATE
anrui_buscenter.`bus_sales_order_vehicle`
anrui_buscenter.bus_sales_order_vehicle
SET riskStaffUserSid = #{userSid},
riskStaffUserName = #{userName}
WHERE sid = #{saleVehSid}
@ -163,9 +163,9 @@
RIGHT (a1.vinNo, 8) AS vinNo,
a1.customer AS custName,
a1.mobile AS custPhone,
a1.`loanContractNo`,
a1.loanContractNo,
a1.bankContractNo,
a1.`bankName`,
a1.bankName,
a1.borrowerName AS loanName,
a1.vehMark AS carNum,
a1.dueDate AS firstBeDate,
@ -173,7 +173,7 @@
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
SUM(lbpv.bankBeInter)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
@ -195,7 +195,7 @@
ROUND((
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.`bankBeInter`)
SUM(lbpv.bankBeInter)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
@ -221,21 +221,21 @@
(SELECT
lrpd.sid,
lrpd.busVinSid,
lrpd.`loanContractNo`,
lrpd.`bankContractNo`,
lrpd.`vinNo`,
lrpd.`bankName`,
lrpd.loanContractNo,
lrpd.bankContractNo,
lrpd.vinNo,
lrpd.bankName,
lrpd.borrowerName,
lrpd.dueDate,
lrpd.vehMark,
lrpd.dueMoney,
(IFNULL(lrs.mainMidRepay,0) + IFNULL(lrs.otherMidRepay,0)) AS qjyh,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,
(
lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.`dueMoney` AS yq_hsqs,
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.dueMoney AS yq_hsqs,
lrpd.customer,
ct.mobile,
lr.createTime,
@ -263,10 +263,10 @@
ORDER BY lbca.createTime DESC
LIMIT 1) AS lockCarState
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 loan_repayment_schedule lrs
ON lrpd.scheduleSid = lrs.sid
@ -279,10 +279,10 @@
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') &lt; CURDATE()
GROUP BY lrpd.`sid`
GROUP BY lrpd.sid
HAVING (yq_total > 0)) a1
WHERE a1.borrowerSid = #{borrowerSid}
GROUP BY a1.loanContractNo,
@ -291,16 +291,161 @@
</select>
<select id="initReaRepayment" resultType="com.yxt.anrui.riskcenter.api.loanbeoverdueveh.ReaRepaymentVo">
SELECT DISTINCT ld.`vinNo`,
ld.`vehMark` AS carNum,
ld.`customer` AS custName,
ld.`borrowerName` AS borrerName,
bv.`reaRepaymentName`,
bv.`reaRepaymentPhone`,
ld.`busVinSid` AS saleVehSid
SELECT DISTINCT ld.vinNo,
ld.vehMark AS carNum,
ld.customer AS custName,
ld.borrowerName AS borrerName,
bv.reaRepaymentName,
bv.reaRepaymentPhone,
ld.busVinSid AS saleVehSid
FROM loan_repayment_plan_details ld
LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
ON ld.`busVinSid` = bv.`sid`
WHERE ld.`busVinSid` = #{saleVehSid}
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv
ON ld.busVinSid = bv.sid
WHERE ld.busVinSid = #{saleVehSid}
</select>
<select id="excelList" resultType="com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehExcelVo">
SELECT
a1.busVinSid AS saleVehSid,
a1.useOrgName,
a1.dept,
a1.loanContractNo,
a1.borrowerName,
RIGHT(a1.vinNo, 8) AS vinNo,
a1.vehMark AS carNum,
a1.bankName,
a1.bankContractNo,
a1.dueMoney AS bankMonthRep,
a1.dueDate AS firstBeDate,
COUNT(a1.sid) AS beOverduePeriod,
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.bankBeInter)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
0
) + IFNULL(
(SELECT
SUM(fund)
FROM
loan_fund_day
WHERE busSid IN
(SELECT
lrpd.sid
FROM
loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())),
0
)
) AS beOverdueMoney,
ROUND(
(
SUM(a1.yq_total) + IFNULL(
(SELECT
SUM(lbpv.bankBeInter)
FROM
loan_be_padsincere_veh lbpv
WHERE lbpv.saleVehSid = a1.busVinSid),
0
) + IFNULL(
(SELECT
SUM(fund)
FROM
loan_fund_day
WHERE busSid IN
(SELECT
lrpd.sid
FROM
loan_repayment_plan_details lrpd
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE())),
0
)
) / a1.qjyh,
1
) AS beOverdueMoneyAndPeriod,
SUM(a1.yd_dkje) AS advMoney,
SUM(a1.yd_zjzyf) AS fundPossCostMoney,
a1.riskStaffUserSid,
a1.riskStaffUserName,
a1.reaRepaymentName AS repaymentName,
a1.createTime,
a1.orgSidPath,
a1.lockCarState
FROM
(SELECT
lrpd.sid,
lrpd.busVinSid,
lrpd.useOrgName,
lrpd.dept,
lrpd.loanContractNo,
lrpd.borrowerName,
lrpd.vinNo,
lrpd.vehMark,
lrpd.bankName,
lrpd.bankContractNo,
lrpd.dueMoney,
lrpd.dueDate,
(
IFNULL(lrs.mainMidRepay, 0) + IFNULL(lrs.otherMidRepay, 0)
) AS qjyh,
(
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) AS yq_total,
(
lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))
) / lrpd.dueMoney AS yq_hsqs,
lrpd.paymentMoney AS yd_dkje,
lrpd.fund AS yd_zjzyf,
lrpd.orgSidPath,
lrpd.createBySid,
bv.riskStaffUserSid,
bv.riskStaffUserName,
bv.reaRepaymentName,
lr.createTime,
(SELECT
CASE
lbcv.lockCarState
WHEN 0
THEN '未控制'
WHEN 1
THEN '控制成功'
WHEN 2
THEN '控制失败'
WHEN 3
THEN '已解控'
END AS lockCarState
FROM
loan_be_collection_veh lbcv
LEFT JOIN loan_be_collection_apply lbca
ON lbca.sid = lbcv.mainSid
WHERE lbca.collMeasure LIKE '%远程控制%'
AND lbca.nodeState = '已办结'
AND lbcv.saleVehSid = lrpd.busVinSid
ORDER BY lbca.createTime DESC
LIMIT 1) AS lockCarState
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 loan_repayment_schedule lrs
ON lrpd.scheduleSid = lrs.sid
LEFT JOIN
(SELECT
saleVehSid,
createTime
FROM
loan_be_collection_record
ORDER BY createTime DESC) lr
ON lrpd.busVinSid = lr.saleVehSid
WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
GROUP BY lrpd.sid
HAVING (yq_total > 0)) a1
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

26
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java
View File

@ -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<PagerVo<LoanBeOverdueVehVo>> listPage(PagerQuery<LoanBeOverdueVehQuery> 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<LoanBeOverdueVehExcelVo> 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<PagerVo<LoanBeOverdueVehVo>> riskListPage(PagerQuery<LoanBeOverdueVehQuery> pq) {
ResultBean rb = ResultBean.fireFail();

101
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java
View File

@ -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<LoanBeOverdueVehExcelVo> excelList(LoanBeOverdueVehQuery query) {
QueryWrapper<LoanBeOverdueVehVo> 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<String> 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<LoanBeOverdueVehExcelVo> loanBeOverdueVehExcelVoArrayList = new ArrayList<LoanBeOverdueVehExcelVo>();
return loanBeOverdueVehExcelVoArrayList;
}
} else {
List<LoanBeOverdueVehExcelVo> loanBeOverdueVehExcelVoArrayList = new ArrayList<LoanBeOverdueVehExcelVo>();
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<LoanBeOverdueVehExcelVo> loanBeOverdueVehExcelVos = loanBeOverdueVehMapper.excelList(qw);
return loanBeOverdueVehExcelVos;
}
}

48
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
View File

@ -4,7 +4,7 @@
<insert id="saveList">
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
<foreach collection="list" item="item" index="index" separator=",">
@ -57,7 +57,7 @@
select *
from loan_repayment_plan_details
where bankContractNo = #{bankContractNo}
and `period` = #{period}
and period = #{period}
-- and policyOrOther = '0'
</select>
@ -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') &lt; CURDATE()
GROUP BY lrpd.`sid`
GROUP BY lrpd.sid
HAVING (yq_total > 0)) a
</select>
@ -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')
&lt; 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') &lt; CURDATE()
AND lrpd.busVinSid = #{saleVehSid}
GROUP BY lrpd.`sid`
GROUP BY lrpd.sid
HAVING (notRepaidMoney > 0)
ORDER BY lrpd.period
</select>

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
View File

@ -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);
}

52
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
View File

@ -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<ScmSpe
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
//========================================
scmSpecialrebateCheckapply = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//查询单车明细
List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(dto.getSid());
if (r == 1) {
@ -881,6 +889,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmSpecialrebateCheckapply.getProcDefId());
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -943,6 +960,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -1017,7 +1043,17 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> 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<ScmSpe
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java
View File

@ -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);
}

67
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
View File

@ -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<ScmSpe
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId());
//========================================
scmSpecialrebatedistribute = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
@ -391,6 +400,15 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmSpecialrebatedistribute scmSpecialrebatedistribute = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmSpecialrebatedistribute.getProcDefId());
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -441,6 +459,15 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -465,7 +492,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
ScmSpecialrebatedistribute scmSpecialrebatedistribute = fetchBySid(query.getBusinessSid());
String businessTaskId = scmSpecialrebatedistribute.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (query.getUserSid().equals(scmSpecialrebatedistribute.getCreateBySid())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@ -475,6 +502,18 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
scmSpecialRebateService.updateState(query.getBusinessSid(), 4);
return rb.success().setData(resultBean.getData());
}else {
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> 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<ScmSpe
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> 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<ScmSpe
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java
View File

@ -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);
}

53
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
View File

@ -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<ScmSpec
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
//========================================
scmSpecialRebateWithApply = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//获取专项返利sid
List<ScmSpecialRebateWithDto> scmSpecialRebateWiths = dto.getScmSpecialRebateWiths();
for (ScmSpecialRebateWithDto scmSpecialRebateWith : scmSpecialRebateWiths) {
@ -555,6 +564,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmSpecialRebateWithApply.getProcDefId());
Map<String, Object> 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<String> specialRebateSids = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmSpecialRebateWithApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
@ -610,6 +628,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -676,7 +703,17 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> 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<ScmSpec
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
View File

@ -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);
}

53
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
View File

@ -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<ScmVehreba
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId());
//========================================
scmVehrebateCheckapply = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//查询单车明细
List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(dto.getSid());
if (r == 1) {
@ -459,6 +468,15 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmVehrebateCheckapply.getProcDefId());
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -856,6 +874,15 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -931,7 +958,17 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> 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<ScmVehreba
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java
View File

@ -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);
}

54
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
View File

@ -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<ScmVehRebat
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId());
//========================================
scmVehRebateWithApply = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
//获取单车返利sid
List<ScmVehRebateWithDto> scmVehRebateWiths = dto.getScmVehRebateWiths();
for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) {
@ -632,6 +641,15 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid());
bv.setModelId(scmVehRebateWithApply.getProcDefId());
Map<String, Object> 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<String> vehRebateSids = scmVehRebateWithService.fetchVehReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmVehRebateWithApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
@ -646,7 +664,6 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
}
//推送单车返利预提凭证
pushVehRebateWithVoucher(bv.getBusinessSid());
}
return rb.success().setData(resultBean.getData());
} else {
@ -689,6 +706,15 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> 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<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -755,7 +781,17 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> 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<ScmVehRebat
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId());
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
Map<String, Object> 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<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

Write Preview
Loading…
Cancel
Save