From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面
---
cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java b/cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java
index d93381f..bf94ea9 100644
--- a/cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java
+++ b/cnas-process/src/main/java/com/yuanchu/mom/controller/QualitySuperviseController.java
@@ -6,6 +6,7 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.QualitySuperviseDetailsDto;
+import com.yuanchu.mom.dto.QualitySuperviseDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.QualitySuperviseDetailsCorrectFileMapper;
import com.yuanchu.mom.pojo.*;
@@ -61,9 +62,9 @@
@ValueAuth
@ApiOperation(value = "鐩戠潱璁″垝鍒楄〃")
@PostMapping("/pageQualitySupervise")
- public Result<IPage<QualitySupervise>> pageQualitySupervise(@RequestBody Map<String, Object> data) throws Exception {
+ public Result<IPage<QualitySuperviseDto>> pageQualitySupervise(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- QualitySupervise qualitySupervise = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), QualitySupervise.class);
+ QualitySupervise qualitySupervise = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), QualitySuperviseDto.class);
return Result.success(qualitySuperviseService.pageQualitySupervise(page, qualitySupervise));
}
--
Gitblit v1.9.3