From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改
---
src/main/java/com/whyc/controller/BatttestdataInfController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BatttestdataInfController.java b/src/main/java/com/whyc/controller/BatttestdataInfController.java
index ecd9ca1..61fe0de 100644
--- a/src/main/java/com/whyc/controller/BatttestdataInfController.java
+++ b/src/main/java/com/whyc/controller/BatttestdataInfController.java
@@ -4,6 +4,7 @@
import com.whyc.dto.paramter.GroupTestCapPar;
import com.whyc.pojo.Battinf;
import com.whyc.service.BatttestdataInfService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -31,7 +32,8 @@
@PostMapping("/searchBattLastHrDataById")
@ApiOperation(value = "鏈�鍚庝竴娆℃牳瀹规斁鐢垫暟鎹�")
public Response searchBattLastHrDataById(@RequestParam int battGroupId, @RequestParam int devId) {
- return service.searchBattLastHrDataById(battGroupId, devId);
+ String lang = ActionUtil.getLang();
+ return service.searchBattLastHrDataById(battGroupId, devId, lang);
}
@PostMapping("/searchBattLife")
@@ -57,4 +59,28 @@
return service.searchGroupTestCap(groupCapPar);
}
+
+ @GetMapping("getHrYeardisBatt")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍(宸插純鐢ㄦ病鏈夊姞and test_stoptype in (2, 3, 4, 6))")
+ public Response getHrYeardisBatt() {
+ return service.getHrYeardisBatt();
+ }
+
+ @GetMapping("getJcdisBatt")
+ @ApiOperation(value = "鑾峰彇瀹炴椂鍋滅數鏀剧數鏈烘埧")
+ public Response getJcdisBatt() {
+ return service.getJcdisBatt();
+ }
+
+ @GetMapping("getHrYeardisBattInfo")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍鏈�鏂颁竴娆℃暟鎹鎯�")
+ public Response getHrYeardisBattInfo() {
+ return service.getHrYeardisBattInfo();
+ }
+
+ @GetMapping("getHrYeardisBattInfoZC")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍鏈�鏂颁竴娆℃暟鎹鎯�(姝ｅ父鍋滄:2.3.4.6)")
+ public Response getHrYeardisBattInfoZC() {
+ return service.getHrYeardisBattInfoZC();
+ }
}
--
Gitblit v1.9.1