Merge remote-tracking branch 'origin/master'

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<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        /*ResultBean<CommonContract> 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<VinListsVo> 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<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        /*ResultBean<CommonContract> 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<VinListsVo> 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<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        /*ResultBean<CommonContract> 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<VinListsVo> 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<BusSalesOrderMapper
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
         Map<String, Object> variables = getOrderMap(busSalesOrder);
         bv.setFormVariables(variables);
-//        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
         bv.setModelId(busSalesOrder.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@@ -5305,7 +5288,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
         Map<String, Object> variables = getOrderMap(busSalesOrder);
         bv.setFormVariables(variables);
-//        bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
         bv.setModelId(busSalesOrder.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -421,6 +421,10 @@ public class FlowableRest implements FlowableFeign {
                 }
 
             }
+        }else{
+            if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextUserSid)){
+                adminContains = true;
+            }
         }
         String comment = dto.getComment();
         if (StringUtils.isBlank(comment)) {
@@ -553,10 +557,6 @@ public class FlowableRest implements FlowableFeign {
                         contains = true;
                         break;
                     }
-                  /*  if(sysUserVoLists.size() == 0){
-                        adminSecondsContains = true;
-                        break;
-                    }*/
                 }
             }
             if (contains) {
@@ -573,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);
@@ -788,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<String, Object> formVariables = new HashMap<>();
         formVariables.put(BusinessVariables.ORGPATH, orgPath);
         //在act_ru_variable表中增加环节上的业务参数的变量
@@ -905,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);