From 5d24aead2d1a45452942ddfc300fe6a232301a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java b/base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java
index 7df8a17..7d623ae 100644
--- a/base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java
+++ b/base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java
@@ -2,7 +2,8 @@
import com.yuanchu.mom.pojo.dto.TechnicalModelDto;
-import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
+import com.yuanchu.mom.service.TechnicalModelService;
+import com.yuanchu.mom.utils.ServletUtils;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -11,7 +12,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import com.yuanchu.mom.service.TechnicalModelService;
+
+import javax.servlet.http.HttpServletResponse;
/**
@@ -31,11 +33,11 @@
@ApiOperation(value = "鏌ヨ鎶�鏈寚鏍囩淮鎶ゅ垪琛�-->宸﹁竟浜岀骇灞曠ず宸ュ簭鍜屽伐鑹�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=0姗¤兌杩炴帴鍣�)", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=0姗¤兌杩炴帴鍣�)", dataTypeClass = String.class, required = true),
@ApiImplicitParam(name = "message", value = "鎼滅储鍐呭", dataTypeClass = String.class)
})
@GetMapping("/selectAllTechTem")
- public Result selectAllTechTem(Integer type, String message) {
+ public Result selectAllTechTem(String type, String message) {
return Result.success(technicalModelService.selectAllTechTem(type, message));
}
@@ -50,10 +52,10 @@
@ApiOperation(value = "鏂板鎶�鏈寚鏍囩淮鎶�-->閫夋嫨宸ュ簭鍜屽伐鑹�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = String.class, required = true)
})
@GetMapping("/chooseTechFath")
- public Result chooseTechFath(Integer type) {
+ public Result chooseTechFath(String type) {
return Result.success(technicalModelService.chooseTechFath(type));
}
@@ -112,5 +114,13 @@
return Result.success("鎵归噺鍒犻櫎鎴愬姛!");
}
+ @ApiOperation(value = "瀵煎嚭")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = String.class, required = true)
+ })
+ public void downloadDataValueExcel(String type){
+ HttpServletResponse response = ServletUtils.getResponse();
+ technicalModelService.downloadDataValueExcel(response,type);
+ }
}
--
Gitblit v1.9.3