流程添加默认方法

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

@@ -17,6 +17,7 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.flow.enums.FlowStatusEnum;
 import com.ruoyi.common.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -114,6 +115,11 @@ public class AccountRequestFundsFlow extends FlowDelegate {
 
     }
 
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
+
     /**
      * 添加打款表的数据
      */

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

@@ -2,12 +2,12 @@ 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;
 import com.fjhx.jxst.service.sales.SalesContractService;
 import com.fjhx.mes.entity.work.dto.WorkOrderDto;
-import com.fjhx.mes.entity.work.po.WorkOrder;
 import com.fjhx.mes.service.work.WorkOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -52,4 +52,9 @@ public class SalesContractFlow extends FlowDelegate {
             workOrderService.add(workOrder);
         }
     }
+
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
 }

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

@@ -12,6 +12,7 @@ import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.purchase.entity.pay.enums.PayStatusEnum;
 import com.fjhx.purchase.entity.pay.po.Pay;
 import com.fjhx.purchase.entity.pay.po.PayDetail;
@@ -141,6 +142,11 @@ public class PayFlow extends FlowDelegate {
 
     }
 
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
+
 
     /**
      * 修改合同付款状态

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.purchase.entity.pay.enums.PayStatusEnum;
 import com.fjhx.purchase.entity.refund.po.Refund;
 import com.fjhx.purchase.entity.refund.po.RefundDetail;
@@ -67,7 +68,7 @@ public class RefundFlow extends FlowDelegate {
         RefundService refundService = SpringUtil.getBean(RefundService.class);
         //通过业务ID查询申购数据
         Refund refund = refundService.getById(businessId);
-        if(ObjectUtils.isEmpty(refund)){
+        if (ObjectUtils.isEmpty(refund)) {
             throw new ServiceException("退款单不存在");
         }
         //修改采购状态为审批通过
@@ -75,4 +76,9 @@ public class RefundFlow extends FlowDelegate {
         refund.setApprovedDate(new Date());
         refundService.updateById(refund);
     }
+
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
 }

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

@@ -10,6 +10,7 @@ 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.sales.enums.SalesReturnDetailStatusEnum;
 import com.fjhx.purchase.entity.sales.enums.SalesReturnStatusEnum;
 import com.fjhx.purchase.entity.sales.po.SalesReturn;
@@ -123,4 +124,9 @@ public class SalesReturnFlow extends FlowDelegate {
         stockWaitDetailsService.saveBatch(stockWaitDetailsList);
     }
 
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
+
 }

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

@@ -8,6 +8,7 @@ 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.SubscribeDetailStatusEnum;
 import com.fjhx.purchase.entity.subscribe.enums.SubscribeStatusEnum;
 import com.fjhx.purchase.entity.subscribe.po.Subscribe;
@@ -100,4 +101,9 @@ public class SubscribeFlow extends FlowDelegate {
 
     }
 
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
+
 }

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

@@ -8,6 +8,7 @@ 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;
@@ -67,12 +68,18 @@ public class SubscribeFlowByWdly extends FlowDelegate {
 
     /**
      * 结束流程
-     * @param flowId 流程ID
+     *
+     * @param flowId     流程ID
      * @param businessId 业务ID
      * @param submitData 数据
      */
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
-       subscribeFlow.end(flowId,businessId,submitData);
+        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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.enums.CodingRuleEnum;
-import com.fjhx.common.enums.FlowStatusEnum;
+import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.common.utils.ExchangeRateUtil;
@@ -106,11 +106,24 @@ public class ContractFlow extends FlowDelegate {
         }
 
         // 修改采购状态为审批通过
-        contract.setStatus(FlowStatusEnum.PASS.getKey());
+        contract.setStatus(FlowStatusEnum1.PASS.getKey());
         contract.setApprovedDate(new Date());
         contractService.updateById(contract);
     }
 
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, com.fjhx.flow.enums.FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+        //重新发起
+        if (com.fjhx.flow.enums.FlowStatusEnum.READY_START.equals(flowStatusEnum)) {
+            reStart();
+        }
+        //驳回
+        if (com.fjhx.flow.enums.FlowStatusEnum.REJECT.equals(flowStatusEnum)) {
+            reject();
+        }
+
+    }
+
     public Long start(ContractDto contract) {
 
         long contractId = IdWorker.getId();
@@ -136,7 +149,7 @@ public class ContractFlow extends FlowDelegate {
             contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
         }
         contract.setUserName(SecurityUtils.getUsername());
-        contract.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
+        contract.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         contract.setBuyCityId(contract.getCityId());
         contract.setBuyCountryId(contract.getCountryId());
         contract.setBuyProvinceId(contract.getProvinceId());
@@ -210,7 +223,7 @@ public class ContractFlow extends FlowDelegate {
         contract.setId(contractId);
 //        contract.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(), contract.getBuyCorporationId()));
         contract.setUserName(SecurityUtils.getUsername());
-        contract.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
+        contract.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         contract.setBuyCityId(contract.getCityId());
         contract.setBuyCountryId(contract.getCountryId());
         contract.setBuyProvinceId(contract.getProvinceId());

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

@@ -3,7 +3,7 @@ package com.fjhx.sale.flow;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.fjhx.common.enums.FlowStatusEnum;
+import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.po.Contract;
@@ -118,9 +118,14 @@ public class ContractUpdateFlow extends FlowDelegate {
         if (oldContract == null) {
             throw new ServiceException("原合同不存在");
         }
-        oldContract.setStatus(FlowStatusEnum.UPDATE.getKey());
+        oldContract.setStatus(FlowStatusEnum1.UPDATE.getKey());
         oldContract.setIsChange("1");
         contractService.updateById(oldContract);
     }
 
+    @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/EhsdPurchaseFlow.java

@@ -13,6 +13,7 @@ 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;
@@ -168,7 +169,7 @@ public class EhsdPurchaseFlow extends FlowDelegate {
         if(CollectionUtils.isNotEmpty(upContractProduct)){//扣减销售合同数量
             contractProductService.updateBatchById(upContractProduct);
         }
-        if(CollectionUtils.isNotEmpty(upSampleProduct)){//扣减样品单数量
+        if (CollectionUtils.isNotEmpty(upSampleProduct)) {//扣减样品单数量
             sampleProductService.updateBatchById(upSampleProduct);
         }
         //修改采购状态为审批通过
@@ -177,4 +178,9 @@ 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

@@ -11,6 +11,7 @@ import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.core.FlowThreadLocalUtil;
+import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.flow.enums.HandleTypeEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDataResourceEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
@@ -187,6 +188,11 @@ public class PurchaseFlow 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/PurchaseFlowByWdly.java

@@ -10,6 +10,7 @@ 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;
@@ -199,4 +200,9 @@ 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

@@ -10,6 +10,7 @@ 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.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
 import com.fjhx.sale.entity.sale.dto.SaleQuotationDto;
@@ -87,11 +88,16 @@ public class SaleQuotationFlow extends FlowDelegate {
         SaleQuotationService saleQuotationService = SpringUtil.getBean(SaleQuotationService.class);
         //通过业务ID查询合同数据
         SaleQuotation contract = saleQuotationService.getById(businessId);
-        if(ObjectUtils.isEmpty(contract)){
+        if (ObjectUtils.isEmpty(contract)) {
             throw new ServiceException("报价单不存在");
         }
         //修改采购状态为审批通过
         contract.setStatus(SaleQuotationEnum.PASS.getKey());
         saleQuotationService.updateById(contract);
     }
+
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
 }

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.CodingRuleEnum;
-import com.fjhx.common.enums.FlowStatusEnum;
+import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
@@ -72,8 +72,8 @@ public class SampleFlow extends FlowDelegate {
         sample.setBuyCountryId(sample.getCountryId());
         sample.setBuyProvinceId(sample.getProvinceId());
 //        sample.setCode(CodeEnum.SAMPLE_CODE.getCode());
-        sample.setCode(codingRuleService.createCode(CodingRuleEnum.SAMPLE.getKey(),sample.getBuyCorporationId()));
-        sample.setStatus(FlowStatusEnum.UNDER_REVIEW.getKey());
+        sample.setCode(codingRuleService.createCode(CodingRuleEnum.SAMPLE.getKey(), sample.getBuyCorporationId()));
+        sample.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         sample.setUserName(SecurityUtils.getUsername());
 
         sampleService.save(sample);
@@ -120,12 +120,17 @@ public class SampleFlow extends FlowDelegate {
         SampleService sampleService = SpringUtil.getBean(SampleService.class);
         //通过业务ID查询样品单数据
         Sample sample = sampleService.getById(businessId);
-        if(ObjectUtils.isEmpty(sample)){
+        if (ObjectUtils.isEmpty(sample)) {
             throw new ServiceException("样品单不存在");
         }
         //修改样品单状态为审批通过
-        sample.setStatus(FlowStatusEnum.PASS.getKey());
+        sample.setStatus(FlowStatusEnum1.PASS.getKey());
         sample.setApprovedDate(new Date());
         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

@@ -10,6 +10,7 @@ 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.sale.entity.serviceContract.dto.ServiceContractDto;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContract;
 import com.fjhx.sale.entity.serviceContract.po.ServiceContractPay;
@@ -93,11 +94,16 @@ public class ServiceContractFlow extends FlowDelegate {
         ServiceContractService contractService = SpringUtil.getBean(ServiceContractService.class);
         //通过业务ID查询合同数据
         ServiceContract contract = contractService.getById(businessId);
-        if(ObjectUtils.isEmpty(contract)){
+        if (ObjectUtils.isEmpty(contract)) {
             throw new ServiceException("服务合同不存在");
         }
         //修改采购状态为审批通过
         contract.setStatus(ServiceContractEnum.PASS.getKey());
         contractService.updateById(contract);
     }
+
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
 }