From 061a51a1aacddf2c7e61c89255fa1200c880c685 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 1 Jul 2025 17:16:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE-=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/ims/domain/OrderGoods.java | 2 +- .../core/ims/domain/PurchaseContract.java | 2 +- .../canteen/core/ims/domain/PurchasePlan.java | 2 +- .../domain/constants/ApproveStatusEnum.java | 32 +++++++++++++++++++ .../service/impl/OrderGoodsServiceImpl.java | 2 ++ .../impl/PurchaseContractServiceImpl.java | 2 ++ .../service/impl/PurchasePlanServiceImpl.java | 2 ++ 7 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/constants/ApproveStatusEnum.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/OrderGoods.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/OrderGoods.java index 2f7056e..c6f30e9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/OrderGoods.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/OrderGoods.java @@ -76,7 +76,7 @@ public class OrderGoods extends BaseEntity { /** 采购审批状态(1待审核,2审批中,3审批通过,4审批不通过) */ @Excel(name = "采购审批状态(1待审核,2审批中,3审批通过,4审批不通过)") @ApiModelProperty(value = "采购审批状态(1待审核,2审批中,3审批通过,4审批不通过)") - private Long approveStatus; + private Integer approveStatus; /** 审批流程id */ @Excel(name = "审批流程id") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchaseContract.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchaseContract.java index 2ab1fc2..07afe31 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchaseContract.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchaseContract.java @@ -97,7 +97,7 @@ public class PurchaseContract extends BaseEntity { /** 合同审批状态(1待审核,2审批中,3审批通过,4审批不通过) */ @Excel(name = "合同审批状态(1待审核,2审批中,3审批通过,4审批不通过)") @ApiModelProperty(value = "合同审批状态(1待审核,2审批中,3审批通过,4审批不通过)") - private Long approveStatus; + private Integer approveStatus; /** 审批流程id */ @Excel(name = "审批流程id") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchasePlan.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchasePlan.java index ebd98cf..01db450 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchasePlan.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchasePlan.java @@ -57,7 +57,7 @@ public class PurchasePlan extends BaseEntity { /** 采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝) */ @Excel(name = "采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝)") @ApiModelProperty(value = "采购审批状态(1待审批,2审批中,3审批同意,4审批拒绝)") - private Long approveStatus; + private Integer approveStatus; /** 审批流程id */ @Excel(name = "审批流程id") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/constants/ApproveStatusEnum.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/constants/ApproveStatusEnum.java new file mode 100644 index 0000000..edaf0b5 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/constants/ApproveStatusEnum.java @@ -0,0 +1,32 @@ +package com.bonus.canteen.core.ims.domain.constants; + +public enum ApproveStatusEnum { + WAIT_APPROVE(1, "待审批"), + IN_PROGRESS(2, "审批中"), + APPROVED(3, "审批通过"), + REJECTED(4, "审批拒绝"); + + private final Integer key; + private final String desc; + + private ApproveStatusEnum(Integer key, String desc) { + this.key = key; + this.desc = desc; + } + public Integer getKey() { + return this.key; + } + + public String getDesc() { + return this.desc; + } + + public static String getDescByKey(Integer targetKey) { + for (ApproveStatusEnum approveStatusEnum : ApproveStatusEnum.values()) { + if (approveStatusEnum.getKey().equals(targetKey)) { + return approveStatusEnum.getDesc(); + } + } + return ""; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java index e80b7a1..f4823e3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java @@ -6,6 +6,7 @@ import java.util.Objects; import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.ims.domain.OrderGoodsDetail; +import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum; import com.bonus.canteen.core.ims.domain.vo.OrderGoodsVO; import com.bonus.canteen.core.ims.service.IOrderGoodsDetailService; import com.bonus.canteen.core.ims.utils.NoGenerateUtils; @@ -91,6 +92,7 @@ public class OrderGoodsServiceImpl implements IOrderGoodsService { try { String orderGoodsCode = NoGenerateUtils.generateOrderGoodsCode(); orderGoods.setOrderGoodsCode(orderGoodsCode); + orderGoods.setApproveStatus(ApproveStatusEnum.APPROVED.getKey()); int result = orderGoodsMapper.insertOrderGoods(orderGoods); List orderGoodsDetails = orderGoods.getOrderGoodsDetailList(); if(CollUtil.isNotEmpty(orderGoodsDetails)) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java index 165b405..44353cb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java @@ -7,6 +7,7 @@ import java.util.Objects; import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.ims.domain.PurchaseContractDetail; +import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum; import com.bonus.canteen.core.ims.domain.constants.PurchaseContractStatusEnum; import com.bonus.canteen.core.ims.domain.vo.PurchaseContractVO; import com.bonus.canteen.core.ims.service.IPurchaseContractDetailService; @@ -110,6 +111,7 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService { try { String contractCode = NoGenerateUtils.generateContractCode(); purchaseContract.setContractCode(contractCode); + purchaseContract.setApproveStatus(ApproveStatusEnum.APPROVED.getKey()); int result = purchaseContractMapper.insertPurchaseContract(purchaseContract); List purchaseContractDetails = purchaseContract.getPurchaseContractDetailList(); if(CollUtil.isNotEmpty(purchaseContractDetails)) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java index b23b4c6..9300940 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java @@ -9,6 +9,7 @@ import java.util.stream.Collectors; import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.ims.domain.ImsUnit; import com.bonus.canteen.core.ims.domain.PurchasePlanDetail; +import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum; import com.bonus.canteen.core.ims.domain.vo.PurchasePlanVO; import com.bonus.canteen.core.ims.service.IImsUnitService; import com.bonus.canteen.core.ims.service.IPurchasePlanDetailService; @@ -121,6 +122,7 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService { try { String purchasePlanCode = generatePurchasePlanCode(); purchasePlan.setPlanCode(purchasePlanCode); + purchasePlan.setApproveStatus(ApproveStatusEnum.APPROVED.getKey()); int result = purchasePlanMapper.insertPurchasePlan(purchasePlan); List purchasePlanDetails = purchasePlan.getPurchasePlanDetailList(); if(CollUtil.isNotEmpty(purchasePlanDetails)) {