From 7f92c90d3d086f799847471ab73c55af6edf76b3 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 26 Jun 2023 09:21:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderService.java | 18 ------------------ .../anrui/flowable/biz/flow/FlowableRest.java | 16 ---------------- 2 files changed, 34 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index bedeca5102..4f8f6579fe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -5122,20 +5122,12 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo()); - CommonContract commonContract = commonContractResultBean.getData();*/ //单台成交价与单台订金相等 if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString(); List vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); - /* if (commonContract != null) { - //合同sid - unCollectionDto.setContractSid(commonContract.getSid()); - //合同编号 - unCollectionDto.setContractNo(commonContract.getContractNo()); - }*/ unCollectionDto.setContractNo(busSalesOrder.getContractNo()); //客户名称 unCollectionDto.setCustomerName(vo.getName()); @@ -5176,16 +5168,12 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo()); - CommonContract commonContract = commonContractResultBean.getData();*/ //单台成交价与单台订金相等 if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 String money = new BigDecimal(solutionsDetailsVo.getRealTotal()).subtract(new BigDecimal(deposit)).toString(); List vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); - //合同sid -// unCollectionDto.setContractSid(commonContract.getSid()); //合同编号 unCollectionDto.setContractNo(busSalesOrder.getContractNo()); //客户名称 @@ -5227,16 +5215,12 @@ public class BusSalesOrderService extends MybatisBaseService commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo()); - CommonContract commonContract = commonContractResultBean.getData();*/ //单台成交价与单台订金相等 if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款 String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString(); List vinList = appOrderModelInfoVo.getVinListsVos(); for (int i = 0; i < vinList.size(); i++) { UnCollectionDto unCollectionDto = new UnCollectionDto(); - //合同sid -// unCollectionDto.setContractSid(commonContract.getSid()); //合同编号 unCollectionDto.setContractNo(busSalesOrder.getContractNo()); //客户名称 @@ -5282,7 +5266,6 @@ public class BusSalesOrderService extends MybatisBaseService variables = getOrderMap(busSalesOrder); bv.setFormVariables(variables); -// bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); bv.setModelId(busSalesOrder.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo @@ -5305,7 +5288,6 @@ public class BusSalesOrderService extends MybatisBaseService variables = getOrderMap(busSalesOrder); bv.setFormVariables(variables); -// bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); bv.setModelId(busSalesOrder.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 925a2752b2..2264315839 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -557,10 +557,6 @@ public class FlowableRest implements FlowableFeign { contains = true; break; } - /* if(sysUserVoLists.size() == 0){ - adminSecondsContains = true; - break; - }*/ } } if (contains) { @@ -577,14 +573,6 @@ public class FlowableRest implements FlowableFeign { dto.setComment("因与下一级审批人相同，系统自动处理，需以下一级审批人审批意见为准！"); return handleProsess(dto, false); } - /* if (adminSecondsContains) { - dto.setUserSid(nextUserSid); - dto.setTaskId(vo.getTaskId()); - dto.setTaskDefKey(taskDefKey); - dto.setComment("系统自动跳过"); - return handleProsess(dto, false); - }*/ - vo.setProcInsId(instanceId); vo.setProcDefId(task.getProcessDefinitionId()); vo.setNodeState(nodeState); @@ -792,9 +780,6 @@ public class FlowableRest implements FlowableFeign { vo.setNodeState(nodeState); vo.setTaskDefKey(taskDefKey); vo.setTaskId(taskId); - /* if (incomingSourceRef.contains("start")) { - vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode()); - }*/ Map formVariables = new HashMap<>(); formVariables.put(BusinessVariables.ORGPATH, orgPath); //在act_ru_variable表中增加环节上的业务参数的变量 @@ -909,7 +894,6 @@ public class FlowableRest implements FlowableFeign { mfq.setUserSids(userSids.toString()); UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); -// uff.setTaskDefKey(taskDefKey); uff.setTaskDefKey(historicTaskInstance.getTaskDefinitionKey()); uff.setTaskId(taskId); uff.setProcInsId(proInstId);