From 599c4f50670fdd4769ef13441871a3e9cd1b34a1 Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 17 Jul 2025 15:43:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E4=BC=98=E5=8C=96=E5=B0=B8?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=92=8Ccontroller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -为以下控制器添加了导出模板功能： - QcInspectionItemCategoryController - QcInspectionItemController - QcInspectionItemsController - QcInspectionMainController - QcInspectionTemplateControlle - QcInspectionTypeController - 导出模板功能允许用户下载无数据的 Excel 模板 - inspectionQty、qualifiedQty、unqualifiedQty将 Integer 改为 BigDecimal - 移除了部分字段的 NotNull 注解 --- .../QcInspectionItemCategoryController.java | 12 ++++++++++++ .../qms/controller/QcInspectionItemController.java | 12 ++++++++++++ .../qms/controller/QcInspectionItemsController.java | 12 ++++++++++++ .../qms/controller/QcInspectionMainController.java | 12 ++++++++++++ .../controller/QcInspectionTemplateController.java | 12 ++++++++++++ .../qms/controller/QcInspectionTypeController.java | 12 ++++++++++++ .../org/dromara/qms/domain/QcInspectionMain.java | 8 +++++--- .../dromara/qms/domain/bo/QcInspectionItemBo.java | 2 +- .../qms/domain/bo/QcInspectionItemCategoryBo.java | 2 +- .../dromara/qms/domain/bo/QcInspectionMainBo.java | 10 ++++++---- .../dromara/qms/domain/bo/QcInspectionResultBo.java | 2 +- .../qms/domain/bo/QcInspectionTemplateBo.java | 2 +- .../dromara/qms/domain/bo/QcInspectionTypeBo.java | 2 +- .../org/dromara/qms/domain/bo/QcTemplateItemBo.java | 2 +- .../dromara/qms/domain/vo/QcInspectionMainVo.java | 8 +++++--- 15 files changed, 94 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java index 6b60d38..b7ba958 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemCategoryController.java @@ -1,5 +1,6 @@ package org.dromara.qms.controller; +import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; @@ -57,6 +58,17 @@ public class QcInspectionItemCategoryController extends BaseController { ExcelUtil.exportExcel(list, "检测项类别", QcInspectionItemCategoryVo.class, response); } + /** + * 导出检测项类别列表模板（无任何数据） + */ + @SaCheckPermission("qms:qcInspectionItemCategory:export") + @Log(title = "检测项类别", businessType = BusinessType.EXPORT) + @PostMapping("/exportTemplate") + public void exportTemplate(HttpServletResponse response) { + List list = new ArrayList<>(); + ExcelUtil.exportExcel(list, "检测项类别", QcInspectionItemCategoryVo.class, response); + } + /** * 获取检测项类别详细信息 * diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemController.java index f8418bc..e2b1bee 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemController.java @@ -1,5 +1,6 @@ package org.dromara.qms.controller; +import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; @@ -57,6 +58,17 @@ public class QcInspectionItemController extends BaseController { ExcelUtil.exportExcel(list, "检测项定义", QcInspectionItemVo.class, response); } + /** + * 导出检测项定义列表模板（无任何数据） + */ + @SaCheckPermission("qms:qcInspectionItem:export") + @Log(title = "检测项定义", businessType = BusinessType.EXPORT) + @PostMapping("/exportTemplate") + public void exportTemplate(HttpServletResponse response) { + List list = new ArrayList<>(); + ExcelUtil.exportExcel(list, "检测项定义", QcInspectionItemVo.class, response); + } + /** * 获取检测项定义详细信息 * diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemsController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemsController.java index 8a737a0..f401eea 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemsController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionItemsController.java @@ -1,5 +1,6 @@ package org.dromara.qms.controller; +import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; @@ -57,6 +58,17 @@ public class QcInspectionItemsController extends BaseController { ExcelUtil.exportExcel(list, "检验项目", QcInspectionItemsVo.class, response); } + /** + * 导出检验项目列表模板（无任何数据） + */ + @SaCheckPermission("qms:inspectionItems:export") + @Log(title = "检验项目", businessType = BusinessType.EXPORT) + @PostMapping("/exportTemplate") + public void exportTemplate(HttpServletResponse response) { + List list = new ArrayList<>(); + ExcelUtil.exportExcel(list, "检验项目", QcInspectionItemsVo.class, response); + } + /** * 获取检验项目详细信息 * diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionMainController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionMainController.java index d5f87da..2449722 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionMainController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionMainController.java @@ -1,5 +1,6 @@ package org.dromara.qms.controller; +import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; @@ -57,6 +58,17 @@ public class QcInspectionMainController extends BaseController { ExcelUtil.exportExcel(list, "质检主表", QcInspectionMainVo.class, response); } + /** + * 导出质检主表列表模板（无任何数据） + */ + @SaCheckPermission("qms:QcInspectionMain:export") + @Log(title = "质检主表", businessType = BusinessType.EXPORT) + @PostMapping("/exportTemplate") + public void exportTemplate(HttpServletResponse response) { + List list = new ArrayList<>(); + ExcelUtil.exportExcel(list, "质检结果", QcInspectionMainVo.class, response); + } + /** * 获取质检主表详细信息 * diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTemplateController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTemplateController.java index 2e44eb8..699477e 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTemplateController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTemplateController.java @@ -1,5 +1,6 @@ package org.dromara.qms.controller; +import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; @@ -57,6 +58,17 @@ public class QcInspectionTemplateController extends BaseController { ExcelUtil.exportExcel(list, "检测模板主", QcInspectionTemplateVo.class, response); } + /** + * 导出检测模板主列表模板（无任何数据） + */ + @SaCheckPermission("qms:qcInspectionTemplate:export") + @Log(title = "检测模板主", businessType = BusinessType.EXPORT) + @PostMapping("/exportTemplate") + public void exportTemplate(HttpServletResponse response) { + List list = new ArrayList<>(); + ExcelUtil.exportExcel(list, "检测模板", QcInspectionTemplateVo.class, response); + } + /** * 获取检测模板主详细信息 * diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTypeController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTypeController.java index db34093..94cf820 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTypeController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcInspectionTypeController.java @@ -1,5 +1,6 @@ package org.dromara.qms.controller; +import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; @@ -57,6 +58,17 @@ public class QcInspectionTypeController extends BaseController { ExcelUtil.exportExcel(list, "检测类型", QcInspectionTypeVo.class, response); } + /** + * 导出检测类型列表模板（无任何数据） + */ + @SaCheckPermission("qms:qcInspectionType:export") + @Log(title = "检测类型", businessType = BusinessType.EXPORT) + @PostMapping("/exportTemplate") + public void exportTemplate(HttpServletResponse response) { + List list = new ArrayList<>(); + ExcelUtil.exportExcel(list, "检测类型", QcInspectionTypeVo.class, response); + } + /** * 获取检测类型详细信息 * diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java index 4452592..b399e74 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java @@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -62,17 +64,17 @@ public class QcInspectionMain extends TenantEntity { /** * 质检数量 */ - private Integer inspectionQty; + private BigDecimal inspectionQty; /** * 合格数 */ - private Integer qualifiedQty; + private BigDecimal qualifiedQty; /** * 不合格数 */ - private Integer unqualifiedQty; + private BigDecimal unqualifiedQty; /** * 质检结果（0合格/1不合格） diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java index 0ca9ab0..d48cb0a 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemBo.java @@ -23,7 +23,7 @@ public class QcInspectionItemBo extends BaseEntity { /** * 检测项主键 */ - @NotNull(message = "检测项主键不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "检测项主键不能为空", groups = { AddGroup.class, EditGroup.class }) private Long itemId; /** diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemCategoryBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemCategoryBo.java index 9b0867e..7d4cefb 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemCategoryBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionItemCategoryBo.java @@ -23,7 +23,7 @@ public class QcInspectionItemCategoryBo extends BaseEntity { /** * 检测项类别主键 */ - @NotNull(message = "检测项类别主键不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "检测项类别主键不能为空", groups = { AddGroup.class, EditGroup.class }) private Long categoryId; /** diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java index 14c22b3..b94ac25 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java @@ -8,6 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; + +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -25,7 +27,7 @@ public class QcInspectionMainBo extends BaseEntity { /** * 质检主键 */ - @NotNull(message = "质检主键不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "质检主键不能为空", groups = { AddGroup.class, EditGroup.class }) private Long inspectionId; /** @@ -61,17 +63,17 @@ public class QcInspectionMainBo extends BaseEntity { /** * 质检数量 */ - private Integer inspectionQty; + private BigDecimal inspectionQty; /** * 合格数 */ - private Integer qualifiedQty; + private BigDecimal qualifiedQty; /** * 不合格数 */ - private Integer unqualifiedQty; + private BigDecimal unqualifiedQty; /** * 质检结果（0合格/1不合格） diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java index 0741a0c..ec982c4 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionResultBo.java @@ -24,7 +24,7 @@ public class QcInspectionResultBo extends BaseEntity { /** * 结果主键 */ - @NotNull(message = "结果主键不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "结果主键不能为空", groups = { AddGroup.class, EditGroup.class }) private Long resultId; /** diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTemplateBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTemplateBo.java index 1bee476..6e0c3fd 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTemplateBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTemplateBo.java @@ -23,7 +23,7 @@ public class QcInspectionTemplateBo extends BaseEntity { /** * 模板主键 */ - @NotNull(message = "模板主键不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "模板主键不能为空", groups = { AddGroup.class, EditGroup.class }) private Long templateId; /** diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTypeBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTypeBo.java index 79ba9d8..6cb3fc5 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTypeBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTypeBo.java @@ -23,7 +23,7 @@ public class QcInspectionTypeBo extends BaseEntity { /** * 检测类型主键 */ - @NotNull(message = "检测类型主键不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "检测类型主键不能为空", groups = { AddGroup.class, EditGroup.class }) private Long typeId; /** diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java index fe8a998..11af045 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcTemplateItemBo.java @@ -24,7 +24,7 @@ public class QcTemplateItemBo extends BaseEntity { /** * 模板子表主键 */ - @NotNull(message = "模板子表主键不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "模板子表主键不能为空", groups = { AddGroup.class, EditGroup.class }) private Long templateItemId; /** diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java index 96ea665..b9f482b 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java @@ -1,5 +1,6 @@ package org.dromara.qms.domain.vo; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.qms.domain.QcInspectionMain; @@ -22,6 +23,7 @@ import java.util.Date; * @author zch * @date 2025-07-14 */ + @Data @ExcelIgnoreUnannotated @AutoMapper(target = QcInspectionMain.class) @@ -76,19 +78,19 @@ public class QcInspectionMainVo implements Serializable { * 质检数量 */ @ExcelProperty(value = "质检数量") - private Integer inspectionQty; + private BigDecimal inspectionQty; /** * 合格数 */ @ExcelProperty(value = "合格数") - private Integer qualifiedQty; + private BigDecimal qualifiedQty; /** * 不合格数 */ @ExcelProperty(value = "不合格数") - private Integer unqualifiedQty; + private BigDecimal unqualifiedQty; /** * 质检结果（0合格/1不合格）