From 9b2837d4b844099f3b7536065ada857b136c1c92 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 11 十二月 2024 15:29:12 +0800 Subject: [PATCH] 电路试验的驻波比csv报告解析2.0(加报告)+撤销项目还需要判断样品下的项目是不是全部都撤销了,如果都撤销了,样品也需要撤销 --- inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java index aa41a21..92e2acc 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.Map; @RestController @@ -44,7 +46,7 @@ @ApiOperation(value = "鑾峰彇鏍囧噯鏍�(妫�楠屼笅鍗�)") @GetMapping("/selectStandardTreeList2") public Result selectStandardTreeList2() { - return Result.success(standardTreeService.selectStandardTreeList()); + return Result.success(standardTreeService.selectStandardTreeList2()); } @ValueClassify("鏍囧噯搴�") @@ -181,6 +183,13 @@ return Result.success(); } + @ValueClassify("鏍囧噯搴�") + @ApiOperation("瀵煎嚭鏍囧噯搴�") + @GetMapping("/exportStandTree") + public void exportStandTree(HttpServletResponse response) throws IOException { + standardTreeService.exportStandTree(response); + } + @ValueAuth @ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�") @PostMapping("/resetTreeOfPrice") -- Gitblit v1.9.3