From 85766196b2b6588e8dec502366b3c5619133004c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 三月 2025 17:35:13 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
cnas-resource-require/src/main/java/com/yuanchu/mom/controller/FeCalibrationScheduleController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..a22e625 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");
@@ -79,8 +79,8 @@
.doWrite(studentList);
}
- @ValueClassify(value = "閲忓�兼函婧愯鍒掑鍏�")
- @ApiOperation(value = "importOfValueTraceabilityPlan")
+ @ValueClassify(value = "閲忓�兼函婧愯鍒�")
+ @ApiOperation(value = "閲忓�兼函婧愯鍒掑鍏�")
@PostMapping("/importOfValueTraceabilityPlan")
public void importOfValueTraceabilityPlan(MultipartFile file) throws IOException {
if (file.isEmpty()) {
--
Gitblit v1.9.3