Pārlūkot izejas kodu

采购单赋值流程状态

24282 1 gadu atpakaļ
vecāks
revīzija
617bd7a353

+ 0 - 38
sd-business/src/main/java/com/sd/business/entity/purchase/enums/PurchaseEnums.java

@@ -1,38 +0,0 @@
-package com.sd.business.entity.purchase.enums;
-
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.fjhx.flow.enums.FlowStatusEnum;
-import com.ruoyi.common.exception.ServiceException;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.apache.commons.collections4.MapUtils;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-@Getter
-@AllArgsConstructor
-public enum PurchaseEnums {
-    DRAUGHT(1, "草稿"),
-    NOT_INITIATED(2, "未发起"),
-    IN_PROGRESS(3, "进行中"),
-    PASSED(4, "已通过"),
-    REJECTED(5, "已驳回"),
-            ;
-
-    private final Integer key;
-
-    private final String value;
-
-    private static final Map<Integer, PurchaseEnums> map = new HashMap<>();
-
-    static {
-        for (PurchaseEnums value : PurchaseEnums.values()) {
-            map.put(value.getKey(), value);
-        }
-    }
-
-
-
-}

+ 2 - 3
sd-business/src/main/java/com/sd/business/flow/PurchaseFlow.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.sd.business.entity.apply.po.ApplyBuy;
 import com.sd.business.entity.apply.po.ApplyBuyBom;
 import com.sd.business.entity.purchase.dto.PurchaseDto;
-import com.sd.business.entity.purchase.enums.PurchaseEnums;
 import com.sd.business.entity.purchase.po.Purchase;
 import com.sd.business.entity.purchase.po.PurchaseBom;
 import com.sd.business.service.apply.ApplyBuyBomService;
@@ -51,7 +50,7 @@ public class PurchaseFlow  extends FlowDelegate {
     public Long start(Long flowId, JSONObject submitData) {
 
         PurchaseDto purchase = submitData.toJavaObject(PurchaseDto.class);
-        purchase.setFlowStatus(PurchaseEnums.IN_PROGRESS.getKey());
+        purchase.setFlowStatus(FlowStatusEnum.IN_PROGRESS.getKey());
         purchase.setFlowId(flowId);
 
         if (purchase.getId() == null) {
@@ -66,7 +65,7 @@ public class PurchaseFlow  extends FlowDelegate {
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
         Purchase purchase = purchaseService.getById(businessId);
-        purchase.setFlowStatus(PurchaseEnums.PASSED.getKey());
+        purchase.setFlowStatus(FlowStatusEnum.PASS.getKey());
         purchase.setFlowId(flowId);
         // 修改采购暂存表的数据
         purchaseService.updateById(purchase);