From f31ae33e37895b9517ee6ace6bd703f4bbb47e81 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 23 六月 2024 23:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java
index 49f76bb..e9834ee 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/EvaluateController.java
@@ -9,12 +9,11 @@
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.Map;
/**
@@ -35,12 +34,19 @@
private EvaluateService evaluateService;
@ValueClassify("浜哄憳鑰冭瘎")
- @ApiOperation(value="鑰冭瘎鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "鏌ヨ鑰冭瘎")
@PostMapping("/page")
public Result page(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
Evaluate entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Evaluate.class);
- return Result.success(evaluateService.getPage(page,entity));
+ return Result.success(evaluateService.getPage(page, entity));
+ }
+
+ @ValueClassify("浜哄憳鑰冭瘎")
+ @ApiOperation(value = "瀵煎嚭鑰冭瘎")
+ @PostMapping("/exportEvaluate")
+ public void exportEvaluate(@RequestParam("month") String month, @RequestParam("name") String name, @RequestParam("departLims") String departLims, HttpServletResponse response) throws IOException {
+ evaluateService.export(month, name, departLims, response);
}
}
--
Gitblit v1.9.3