流程 重新发起,驳回 改为新写法

hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -107,24 +107,25 @@ public class AccountRequestFundsFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            // 获取提交数据
-            AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
-            commStart(accountRequestFundsDto, 1);
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            accountRequestFundsService.update(q -> q
-                    .eq(AccountRequestFunds::getId, businessId)
-                    .set(AccountRequestFunds::getStatus, FlowStatusEnum1.REJECT.getKey())//20为驳回
-                    .set(BasePo::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+
+        // 获取提交数据
+        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
+        commStart(accountRequestFundsDto, 1);
     }
 
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+
+        accountRequestFundsService.update(q -> q
+                .eq(AccountRequestFunds::getId, businessId)
+                .set(AccountRequestFunds::getStatus, FlowStatusEnum1.REJECT.getKey())//20为驳回
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
 
     /**
      * 开始公共代码抽取

hx-jxst/src/main/java/com/fjhx/jxst/flow/SalesContractFlow.java

@@ -2,7 +2,6 @@ package com.fjhx.jxst.flow;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.jxst.entity.sales.dto.SalesContractDto;
 import com.fjhx.jxst.entity.sales.po.SalesContractDetails;
 import com.fjhx.jxst.service.sales.SalesContractDetailsService;
@@ -53,8 +52,4 @@ public class SalesContractFlow extends FlowDelegate {
         }
     }
 
-    @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-
-    }
 }

hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -173,23 +173,22 @@ public class PayFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            Pay pay = submitData.toJavaObject(Pay.class);
-            commStart(pay, 1);
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            payService.update(q -> q
-                    .eq(Pay::getId, businessId)
-                    .set(Pay::getStatus, FlowStatusEnum1.REJECT.getKey())
-                    .set(BasePo::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        Pay pay = submitData.toJavaObject(Pay.class);
+        commStart(pay, 1);
     }
 
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        payService.update(q -> q
+                .eq(Pay::getId, businessId)
+                .set(Pay::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
 
     /**
      * 修改合同付款状态

hx-purchase/src/main/java/com/fjhx/purchase/flow/RefundFlow.java

@@ -106,20 +106,20 @@ public class RefundFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            Refund refund = submitData.toJavaObject(Refund.class);
-            commStart(refund, 1);
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            refundService.update(q -> q
-                    .eq(Refund::getId, businessId)
-                    .set(Refund::getStatus, FlowStatusEnum1.REJECT.getKey())
-                    .set(BasePo::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        Refund refund = submitData.toJavaObject(Refund.class);
+        commStart(refund, 1);
+    }
+
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        refundService.update(q -> q
+                .eq(Refund::getId, businessId)
+                .set(Refund::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
     }
 }

hx-purchase/src/main/java/com/fjhx/purchase/flow/SalesReturnFlow.java

@@ -150,21 +150,22 @@ public class SalesReturnFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            SalesReturn salesReturn = submitData.toJavaObject(SalesReturn.class);
-            commStart(salesReturn, 1);
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            salesReturnService.update(q -> q
-                    .eq(SalesReturn::getId, businessId)
-                    .set(SalesReturn::getStatus, FlowStatusEnum1.REJECT.getKey())
-                    .set(BasePo::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        SalesReturn salesReturn = submitData.toJavaObject(SalesReturn.class);
+        commStart(salesReturn, 1);
+    }
+
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+
+        salesReturnService.update(q -> q
+                .eq(SalesReturn::getId, businessId)
+                .set(SalesReturn::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
     }
 
 }

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -100,24 +100,23 @@ public class SubscribeFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            // 获取提交数据
-            Subscribe subscribe = submitData.toJavaObject(Subscribe.class);
-            commStart(subscribe, 1);
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            subscribeService.update(q -> q
-                    .eq(Subscribe::getId, businessId)
-                    .set(Subscribe::getSubcribeStatus, FlowStatusEnum1.REJECT.getKey())//20为驳回
-                    .set(BasePo::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        // 获取提交数据
+        Subscribe subscribe = submitData.toJavaObject(Subscribe.class);
+        commStart(subscribe, 1);
     }
 
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        subscribeService.update(q -> q
+                .eq(Subscribe::getId, businessId)
+                .set(Subscribe::getSubcribeStatus, FlowStatusEnum1.REJECT.getKey())//20为驳回
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
 
     /**
      * 开始公共代码抽取

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlowByWdly.java

@@ -8,7 +8,6 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeStatusEnum;
 import com.fjhx.purchase.entity.subscribe.po.Subscribe;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
@@ -78,8 +77,4 @@ public class SubscribeFlowByWdly extends FlowDelegate {
         subscribeFlow.end(flowId, businessId, submitData);
     }
 
-    @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-
-    }
 }

hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -117,16 +117,15 @@ public class ContractFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            reStart();
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            reject();
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        reStart();
+    }
 
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        reject();
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -128,15 +128,15 @@ public class ContractUpdateFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            reStart(submitData);
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            reject(businessId);
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        reStart(submitData);
+    }
+
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        reject(businessId);
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/flow/EhsdPurchaseFlow.java

@@ -13,7 +13,6 @@ import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
@@ -178,9 +177,4 @@ public class EhsdPurchaseFlow extends FlowDelegate {
         purchaseService.updateById(purchase);
     }
 
-    @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-
-    }
-
 }

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -159,19 +159,19 @@ public class PurchaseFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            // 获取提交数据
-            DynamicDataSourceContextHolder.push(SourceConstant.PURCHASE);
-            PurchaseVo purchase = submitData.toJavaObject(PurchaseVo.class);
-            commStart(purchase, 1);
-            DynamicDataSourceContextHolder.poll();
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            reject();
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        // 获取提交数据
+        DynamicDataSourceContextHolder.push(SourceConstant.PURCHASE);
+        PurchaseVo purchase = submitData.toJavaObject(PurchaseVo.class);
+        commStart(purchase, 1);
+        DynamicDataSourceContextHolder.poll();
+    }
+
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        reject();
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlowByWdly.java

@@ -10,7 +10,6 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
-import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
@@ -200,9 +199,4 @@ public class PurchaseFlowByWdly extends FlowDelegate {
                 .lambda().eq(PurchaseDetail::getPurchaseId, purchase.getId()));
     }
 
-    @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-
-    }
-
 }

hx-sale/src/main/java/com/fjhx/sale/flow/SaleQuotationFlow.java

@@ -88,22 +88,22 @@ public class SaleQuotationFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            SaleQuotationDto saleQuotation = submitData.toJavaObject(SaleQuotationDto.class);
-            Assert.notEmpty(saleQuotation.getId(), "报价单id不能为空");
-            commStart(saleQuotation, 1);
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            saleQuotationService.update(q -> q
-                    .eq(SaleQuotation::getId, businessId)
-                    .set(SaleQuotation::getStatus, FlowStatusEnum1.REJECT.getKey())
-                    .set(BasePo::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        SaleQuotationDto saleQuotation = submitData.toJavaObject(SaleQuotationDto.class);
+        Assert.notEmpty(saleQuotation.getId(), "报价单id不能为空");
+        commStart(saleQuotation, 1);
+    }
+
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        saleQuotationService.update(q -> q
+                .eq(SaleQuotation::getId, businessId)
+                .set(SaleQuotation::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
     }
 
     /**

hx-sale/src/main/java/com/fjhx/sale/flow/SampleFlow.java

@@ -129,8 +129,4 @@ public class SampleFlow extends FlowDelegate {
         sampleService.updateById(sample);
     }
 
-    @Override
-    public void defaultMethod(Long flowId, Long businessId, com.fjhx.flow.enums.FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-
-    }
 }

hx-sale/src/main/java/com/fjhx/sale/flow/ServiceContractFlow.java

@@ -92,22 +92,23 @@ public class ServiceContractFlow extends FlowDelegate {
     }
 
     @Override
-    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
-        //重新发起
-        if (FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
-            ServiceContractDto contract = submitData.toJavaObject(ServiceContractDto.class);
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
 
-            commStart(contract, 1);
-        }
-        //驳回
-        if (FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
-            serviceContractService.update(q -> q
-                    .eq(ServiceContract::getId, businessId)
-                    .set(ServiceContract::getStatus, FlowStatusEnum1.REJECT.getKey())
-                    .set(BasePo::getUpdateTime, new Date())
-                    .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
-            );
-        }
+        ServiceContractDto contract = submitData.toJavaObject(ServiceContractDto.class);
+        commStart(contract, 1);
+    }
+
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+
+        serviceContractService.update(q -> q
+                .eq(ServiceContract::getId, businessId)
+                .set(ServiceContract::getStatus, FlowStatusEnum1.REJECT.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
     }
 
     /**