From 56f09fd5c7fa601dbdaa74123b4a885522e6910b Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 21 Oct 2024 16:52:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E8=B4=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ma/controller/SupplierInfoController.java | 11 +++++ .../purchase/config/PurchaseModelEnum.java | 44 +++++++++++++++++++ .../PurchaseNoticePersonController.java | 1 - .../purchase/domain/PurchaseCheckInfo.java | 5 +++ .../purchase/domain/PurchaseNoticePerson.java | 3 ++ 5 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/config/PurchaseModelEnum.java diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java index b4a50319..af358571 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/SupplierInfoController.java @@ -49,6 +49,17 @@ public class SupplierInfoController extends BaseController { return getDataTable(list); } + /** + * 查询物资厂家--下拉框--不分页 + */ + @ApiOperation(value = "查询物资厂家下拉框--不分页") + @RequiresPermissions("ma:info:list") + @GetMapping("/select") + public TableDataInfo select(SupplierInfo supplierInfo) { + List list = supplierInfoService.selectSupplierInfoList(supplierInfo); + return getDataTable(list); + } + /** * 导出物资厂家管理列表 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/config/PurchaseModelEnum.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/config/PurchaseModelEnum.java new file mode 100644 index 00000000..c9e7af40 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/config/PurchaseModelEnum.java @@ -0,0 +1,44 @@ +package com.bonus.material.purchase.config; + +import lombok.Getter; + +/** + * @author : 阮世耀 + * @version : 1.0 + * @PackagePath: com.bonus.material.purchase.config + * @CreateTime: 2024-10-21 16:13 + * @Description: 新购模块阶段枚举 + */ +@Getter +public enum PurchaseModelEnum { + + PURCHASE_MODEL_MANAGE("新购管理"), + PURCHASE_MODEL_CONFIRM("新购确认"), + PURCHASE_MODEL_CHECK("新购验收"), + PURCHASE_MODEL_BIND("新购绑定"), + PURCHASE_MODEL_STORE("新购入库"); + + private final String modelName; + + /** + * 定义构造函数 + * @param modelName 模块名称 + */ + PurchaseModelEnum(String modelName) { + this.modelName = modelName; + } + + + /** + * 判断传入的参数是否存在于枚举类中 + * @return 如果存在返回 true，否则返回 false + */ + public static boolean containsModelName(String modelName) { + for (PurchaseModelEnum model : PurchaseModelEnum.values()) { + if (model.getModelName().equals(modelName)) { + return true; + } + } + return false; + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java index 4ae2994d..a4dd2342 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/controller/PurchaseNoticePersonController.java @@ -49,7 +49,6 @@ public class PurchaseNoticePersonController extends BaseController { @RequiresPermissions("purchase:person:list") @GetMapping("/list") public TableDataInfo list(PurchaseNoticePerson purchaseNoticePerson) { - startPage(); List list = purchaseNoticePersonService.selectPurchaseNoticePersonList(purchaseNoticePerson); return getDataTable(list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java index 6f2acd88..22897225 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java @@ -1,6 +1,8 @@ package com.bonus.material.purchase.domain; import java.util.Date; + +import com.bonus.material.purchase.config.PurchaseModelEnum; import com.fasterxml.jackson.annotation.JsonFormat; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; @@ -70,4 +72,7 @@ public class PurchaseCheckInfo extends BaseEntity { @ApiModelProperty(value = "操作人名称") private String createUserName; + @ApiModelProperty(value = "新购模块阶段名称") + private PurchaseModelEnum modelName; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java index ad7612fd..93a3efe7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseNoticePerson.java @@ -41,5 +41,8 @@ public class PurchaseNoticePerson extends BaseEntity { @ApiModelProperty(value = "联系电话") private String telphone; + /** 任务id */ + @ApiModelProperty("任务id") + private String taskId; }