From 010b1e70f0c43c88ee93f4b770c0ea0cf9add2d2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 20 十二月 2024 14:51:01 +0800
Subject: [PATCH] (更新至 353906)
---
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeCalibrationScheduleController.java | 2 +-
cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeStandardSubstanceAcceptance.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeCalibrationScheduleController.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeCalibrationScheduleController.java
index f69873e..f7756f8 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeCalibrationScheduleController.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeCalibrationScheduleController.java
@@ -65,7 +65,7 @@
@PostMapping("exportOfValueTraceabilityPlan")
public void exportOfValueTraceabilityPlan(String instrumentName, String managementNumber,
HttpServletResponse response) throws Exception {
- IPage<FeCalibrationSchedule> data = feCalibrationScheduleService.page(new Page<>(1, -1),instrumentName, managementNumber);
+ IPage<FeCalibrationSchedule> data = feCalibrationScheduleService.page(new Page<>(-1, -1),instrumentName, managementNumber);
List<FeCalibrationScheduleExport> studentList = JSONObject.parseArray(JSON.toJSONString(data.getRecords()), FeCalibrationScheduleExport.class);
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("requestType", "excel");
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeStandardSubstanceAcceptance.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeStandardSubstanceAcceptance.java
index f7fe9c3..5ee3b86 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeStandardSubstanceAcceptance.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/pojo/FeStandardSubstanceAcceptance.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.pojo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -30,6 +31,7 @@
@Setter
@TableName("cnas_fe_standard_substance_acceptance")
@ApiModel(value = "FeStandardSubstanceAcceptance瀵硅薄", description = "鏍囧噯鐗╄川楠屾敹")
+@ExcelIgnoreUnannotated
public class FeStandardSubstanceAcceptance implements Serializable {
private static final long serialVersionUID = 1L;
@@ -38,7 +40,6 @@
private Integer id;
@ApiModelProperty("娓呭崟id")
- @ExcelProperty("娓呭崟id")
private Integer substanceId;
@ApiModelProperty("鍒拌揣鏃ユ湡")
--
Gitblit v1.9.3