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

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
abea4a0cdd 5c7bc1d17a
commit
ae66196be5
5 changed files with 84 additions and 21 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. 56
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  2. 4
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
  3. 4
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue
  4. 27
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  5. 14
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

56
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -656,6 +656,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
@ -668,10 +669,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
baseMapper.updateStateBySid(3, bv.getBusinessSid());
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
@ -1080,9 +1080,25 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if(StringUtils.isNotBlank(query.getBusinessSid())){
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
bv.setModelId(busDeliveredApply.getProcDefId());
Map<String,Object> variables = new HashMap<>();
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
appMap.put("outboundSid", query.getBusinessSid());
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
}else{
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
}
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());
@ -1102,6 +1118,21 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if(StringUtils.isNotBlank(query.getBusinessSid())){
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
bv.setModelId(busDeliveredApply.getProcDefId());
Map<String,Object> variables = new HashMap<>();
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
appMap.put("outboundSid", query.getBusinessSid());
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
bv.setFormVariables(variables);
}else{
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
}
@ -1136,6 +1167,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
flowProcessMapQuery.setVariables(variables);
@ -1146,7 +1178,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
baseMapper.updateStateBySid(1, query.getBusinessSid());
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
@ -1159,6 +1190,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
//更新该合同的该车架号的状态为1
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
baseMapper.updateStateBySid(1, query.getBusinessSid());
}
//极光推送
UpdateFlowFieldVo ufVo = resultBean.getData();
@ -1208,11 +1240,25 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> variables = new HashMap<>();
//若app移动端有此功能，则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
appMap.put("outboundSid", query.getBusinessSid());
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg("操作失败!");
}
baseMapper.updateStateBySid(1, query.getBusinessSid());
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
busDeliveredApply = fetchBySid(query.getBusinessSid());
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId());
@ -1223,6 +1269,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid());
//更新该合同的该车架号的状态为1
busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
baseMapper.updateStateBySid(1, query.getBusinessSid());
}
return rb.success().setData(resultBean.getData());
@ -1836,6 +1883,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appMap.put("contractId", busDeliveredApply.getContractNo());
appMap.put("contract_id", busDeliveredApply.getContractNo());
variables.put("app", appMap);
variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);

4
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
View File

@ -394,7 +394,7 @@ export default {
this.operation = val
this.currentLink = true
this.dialogList.comment = '同意'
getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
@ -408,7 +408,7 @@ export default {
this.operation = val
this.currentLink = true
this.dialogList.comment = ''
getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]

4
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue
View File

@ -286,7 +286,7 @@ export default {
contractNo: '',
customerName: '',
vinNo: '',
billingStateKey: '001',
billingStateKey: '',
transferStateKey: '',
invoicingName: '',
invoiceCode: '',
@ -441,7 +441,7 @@ export default {
contractNo: '',
customerName: '',
vinNo: '',
billingStateKey: '001',
billingStateKey: '',
transferStateKey: '',
invoicingName: '',
invoiceCode: '',

27
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -585,8 +585,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//判断是否是高低开，若是，则isTrue网关参数为true=============添加
String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) {
variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@ -701,7 +704,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
}
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
@ -742,8 +744,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} else {
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
}
//判断是否是高低开，若是，则isTrue网关参数为true=============添加
String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) {
variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@ -776,8 +781,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} else {
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
}
//判断是否是高低开，若是，则isTrue网关参数为true=============添加
String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) {
variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@ -819,8 +827,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//判断是否是高低开，若是，则isTrue网关参数为true=============添加
String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) {
variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@ -3065,8 +3076,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//判断是否是高低开，若是，则isTrue网关参数为true=============添加
String contractNo = finBillApplication.getContractNo();
//判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
variables.put("isdbdk","2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) {
variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
@ -3232,7 +3246,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
}
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());

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

@ -12,12 +12,14 @@ public enum ProcDefEnum {
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"),
//FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:2:1592504"),
//QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:3:1592508"),
//QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"),
QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
// ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:2:1347504"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:3:1595008"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"),
SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"),
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
@ -31,7 +33,7 @@ public enum ProcDefEnum {
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:3:770004"),
BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:4:1595004"),
BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),

Write Preview
Loading…
Cancel
Save