From 2eb99222ed2cab71fe4bd2c713c8382c879bd704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 10 Jun 2026 20:45:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(template):=20=E6=9B=B4=E6=96=B0=E5=85=8D?= =?UTF-8?q?=E6=A3=80=E7=89=A9=E6=96=99=E5=92=8C=E5=85=8D=E6=A3=80=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=B1=BB=E5=88=AB=E7=9A=84=E5=AF=BC=E5=85=A5=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加示例数据展示永久和周期两种豁免模式 - 为永久模式示例设置空的有效期字段 - 为周期模式示例设置具体的开始和结束日期 - 修改模板导出逻辑以包含两个不同模式的示例记录 --- .../controller/QmsExemptCategoryController.java | 12 ++++++++++-- .../controller/QmsExemptMaterialController.java | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptCategoryController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptCategoryController.java index 5798599a..1800d33a 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptCategoryController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptCategoryController.java @@ -199,16 +199,24 @@ public class QmsExemptCategoryController extends BaseController { */ @PostMapping("template") public void template(HttpServletResponse response) throws IOException { - QmsExemptCategoryImportDTO example = new QmsExemptCategoryImportDTO() + QmsExemptCategoryImportDTO example1 = new QmsExemptCategoryImportDTO() .setSupplierCode("示例供应商编码") .setSupplierName("示例供应商名称（非必填）") .setCategoryCode("示例物料类别编码") .setCategoryName("示例物料类别名称（非必填）") .setExemptMode("永久") + .setValidStartDate("") + .setValidEndDate(""); + QmsExemptCategoryImportDTO example2 = new QmsExemptCategoryImportDTO() + .setSupplierCode("示例供应商编码") + .setSupplierName("示例供应商名称（非必填）") + .setCategoryCode("示例物料类别编码") + .setCategoryName("示例物料类别名称（非必填）") + .setExemptMode("周期") .setValidStartDate("2026-01-01") .setValidEndDate("2026-12-31"); - EecExcelUtil.export("免检物料类别导入模板", "免检物料类别导入模板", List.of(example), response); + EecExcelUtil.export("免检物料类别导入模板", "免检物料类别导入模板", List.of(example1,example2), response); } /** diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptMaterialController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptMaterialController.java index 090c34ff..cd4ea205 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptMaterialController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsExemptMaterialController.java @@ -206,16 +206,24 @@ public class QmsExemptMaterialController extends BaseController { */ @PostMapping("template") public void template(HttpServletResponse response) throws IOException { - QmsExemptMaterialImportDTO example = new QmsExemptMaterialImportDTO() + QmsExemptMaterialImportDTO example1 = new QmsExemptMaterialImportDTO() .setSupplierCode("示例供应商编码") .setSupplierName("示例供应商名称（非必填）") .setMaterialNo("示例物料编号") .setMaterialDesc("示例物料描述（非必填）") .setExemptMode("永久") + .setValidStartDate("") + .setValidEndDate(""); + QmsExemptMaterialImportDTO example2 = new QmsExemptMaterialImportDTO() + .setSupplierCode("示例供应商编码") + .setSupplierName("示例供应商名称（非必填）") + .setMaterialNo("示例物料编号") + .setMaterialDesc("示例物料描述（非必填）") + .setExemptMode("周期") .setValidStartDate("2026-01-01") .setValidEndDate("2026-12-31"); - EecExcelUtil.export("免检物料导入模板", "免检物料导入模板", List.of(example), response); + EecExcelUtil.export("免检物料导入模板", "免检物料导入模板", List.of(example1,example2), response); } /**