流程实现通用方法

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,6 +2,7 @@ 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;
@@ -52,4 +53,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/entity/pay/enums/PayStatusEnum.java → hx-purchase/src/main/java/com/fjhx/purchase/entity/pay/enums/PayStatusEnum1.java

@@ -8,7 +8,7 @@ import java.util.Map;
 /**
  * 采购付款状态枚举
  */
-public enum PayStatusEnum {
+public enum PayStatusEnum1 {
     DRAFT(0, "草稿"),
     UNDER_REVIEW(10, "审批中"),
     REJECT(20, "驳回"),
@@ -21,7 +21,7 @@ public enum PayStatusEnum {
 
     private static Map<Integer, String> map = new LinkedHashMap<>();
 
-    PayStatusEnum(int key, String value) {
+    PayStatusEnum1(int key, String value) {
         this.key = key;
         this.value = value;
     }
@@ -35,7 +35,7 @@ public enum PayStatusEnum {
         if (MapUtils.isNotEmpty(map)) {
             return map;
         }
-        for (PayStatusEnum ms : values()) {
+        for (PayStatusEnum1 ms : values()) {
             map.put(ms.key, ms.value);
         }
         return map;

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

@@ -11,7 +11,8 @@ 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.purchase.entity.pay.enums.PayStatusEnum;
+import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.purchase.entity.pay.enums.PayStatusEnum1;
 import com.fjhx.purchase.entity.pay.po.Pay;
 import com.fjhx.purchase.entity.pay.po.PayDetail;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
@@ -66,7 +67,7 @@ public class PayFlow extends FlowDelegate {
     public Long start(Long flowId, JSONObject submitData) {
         Pay pay = submitData.toJavaObject(Pay.class);
 
-        pay.setStatus(PayStatusEnum.UNDER_REVIEW.getKey());
+        pay.setStatus(PayStatusEnum1.UNDER_REVIEW.getKey());
         payService.save(pay);
 
         List<PayDetail> payDetailList = pay.getPayDetailList();
@@ -96,7 +97,7 @@ public class PayFlow extends FlowDelegate {
         }
 
         // 修改采购状态为审批通过
-        pay.setStatus(PayStatusEnum.PASS.getKey());
+        pay.setStatus(PayStatusEnum1.PASS.getKey());
         pay.setApprovedDate(new Date());
         payService.updateById(pay);
 
@@ -125,6 +126,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,7 +7,8 @@ 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.purchase.entity.pay.enums.PayStatusEnum;
+import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.purchase.entity.pay.enums.PayStatusEnum1;
 import com.fjhx.purchase.entity.refund.po.Refund;
 import com.fjhx.purchase.entity.refund.po.RefundDetail;
 import com.fjhx.purchase.service.refund.RefundDetailService;
@@ -44,7 +45,7 @@ public class RefundFlow extends FlowDelegate {
         RefundService refundService = SpringUtil.getBean(RefundService.class);
         RefundDetailService refundDetailService = SpringUtil.getBean(RefundDetailService.class);
         Refund refund = submitData.toJavaObject(Refund.class);
-        refund.setStatus(PayStatusEnum.UNDER_REVIEW.getKey());
+        refund.setStatus(PayStatusEnum1.UNDER_REVIEW.getKey());
         refundService.save(refund);
         List<RefundDetail> refundDetailList = refund.getRefundDetailList();
         if(CollectionUtils.isNotEmpty(refundDetailList)){
@@ -71,8 +72,13 @@ public class RefundFlow extends FlowDelegate {
             throw new ServiceException("退款单不存在");
         }
         //修改采购状态为审批通过
-        refund.setStatus(PayStatusEnum.PASS.getKey());
+        refund.setStatus(PayStatusEnum1.PASS.getKey());
         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;
@@ -75,4 +76,9 @@ public class SubscribeFlowByWdly extends FlowDelegate {
     public void end(Long flowId, Long businessId, JSONObject submitData) {
        subscribeFlow.end(flowId,businessId,submitData);
     }
+
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/pay/impl/PayDetailServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.purchase.entity.pay.dto.PayDetailDto;
 import com.fjhx.purchase.entity.pay.dto.PayDetailSelectDto;
-import com.fjhx.purchase.entity.pay.enums.PayStatusEnum;
+import com.fjhx.purchase.entity.pay.enums.PayStatusEnum1;
 import com.fjhx.purchase.entity.pay.po.PayDetail;
 import com.fjhx.purchase.entity.pay.vo.PayDetailVo;
 import com.fjhx.purchase.mapper.pay.PayDetailMapper;
@@ -77,7 +77,7 @@ public class PayDetailServiceImpl extends ServiceImpl<PayDetailMapper, PayDetail
     public Map<Long, BigDecimal> getPayMoneyCountByPurchaseId(List<Long> purchaseIdList) {
 
         QueryWrapper<Object> queryWrapper = Wrappers.query()
-                .ge("p.status", PayStatusEnum.PASS.getKey())
+                .ge("p.status", PayStatusEnum1.PASS.getKey())
                 .in("pd.purchase_id", purchaseIdList);
 
         List<PayDetail> list = baseMapper.getPayMoneyCountByPurchaseId(queryWrapper);

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

@@ -105,6 +105,11 @@ public class ContractFlow extends FlowDelegate {
         contractService.updateById(contract);
     }
 
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, com.fjhx.flow.enums.FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
+
     public Long start(ContractDto contract) {
 
         long contractId = IdWorker.getId();

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

@@ -120,4 +120,9 @@ public class ContractUpdateFlow extends FlowDelegate {
         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

@@ -12,6 +12,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.purchase.entity.subscribe.enums.SubscribeDetailStatusEnum;
@@ -223,5 +224,10 @@ public class EhsdPurchaseFlow extends FlowDelegate {
         }
     }
 
+    @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;
@@ -94,4 +95,9 @@ public class SaleQuotationFlow extends FlowDelegate {
         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

@@ -128,4 +128,9 @@ public class SampleFlow extends FlowDelegate {
         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;
@@ -100,4 +101,9 @@ public class ServiceContractFlow extends FlowDelegate {
         contract.setStatus(ServiceContractEnum.PASS.getKey());
         contractService.updateById(contract);
     }
+
+    @Override
+    public void defaultMethod(Long flowId, Long businessId, FlowStatusEnum flowStatusEnum, JSONObject submitData) {
+
+    }
 }