From 5dc34f36049194d1a124eb60dd68cb17e498caec Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 30 四月 2026 09:49:13 +0800
Subject: [PATCH] fix：原料、过程与出厂检验导出列修改
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 29 +++++++++++++++++++----------
src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java | 4 ----
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 2 +-
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 7329f61..adb48bf 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -58,7 +58,7 @@
/**
* 宸ュ簭(杩囩▼妫�楠�)
*/
- @Excel(name = "宸ュ簭")
+ @Excel(name = "閮ㄤ欢绫诲瀷")
private String process;
/**
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 6810aeb..6a8d220 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -197,17 +197,26 @@
}
ExcelUtil<QualityInspect> util = new ExcelUtil<>(QualityInspect.class);
- switch (qualityInspect.getInspectType()) {
- case 0:
- util.exportExcel(response, qualityInspects, "鍘熸潗鏂欐楠屽鍑�");
- break;
- case 1:
- util.exportExcel(response, qualityInspects, "杩囩▼妫�楠屽鍑�");
- break;
- case 2:
- util.exportExcel(response, qualityInspects, "鍑哄巶妫�楠屽鍑�");
- break;
+ String sheetName = "妫�楠屽鍑�";
+ if (qualityInspect != null && qualityInspect.getInspectType() != null) {
+ switch (qualityInspect.getInspectType()) {
+ case 0:
+ util.hideColumn("customer", "process");
+ sheetName = "鍘熸潗鏂欐楠屽鍑�";
+ break;
+ case 1:
+ util.hideColumn("supplier", "customer");
+ sheetName = "杩囩▼妫�楠屽鍑�";
+ break;
+ case 2:
+ util.hideColumn("supplier", "customer", "process");
+ sheetName = "鍑哄巶妫�楠屽鍑�";
+ break;
+ default:
+ break;
+ }
}
+ util.exportExcel(response, qualityInspects, sheetName);
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
index bc48229..21b9e0e 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityTestStandardServiceImpl.java
@@ -1,11 +1,8 @@
package com.ruoyi.quality.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.mapper.ProductModelMapper;
-import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -15,7 +12,6 @@
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
-import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
--
Gitblit v1.9.3