From 769ba15e9071b01cb53a65e8fdf4c8f37ac005b9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 07 十一月 2024 17:15:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
index b7036ca..85be829 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
@@ -16,6 +16,7 @@
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.taskReliability.dao.AssessItemDao;
import com.zt.life.modules.mainPart.taskReliability.model.AssessItem;
+import com.zt.life.modules.mainPart.taskReliability.model.AssessResult;
import com.zt.life.modules.mainPart.taskReliability.model.OperatCondit;
import com.zt.life.modules.mainPart.taskReliability.model.ReliabilityAssess;
import com.zt.life.modules.mainPart.taskReliability.service.ReliabilityAssessService;
@@ -29,6 +30,8 @@
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -42,15 +45,11 @@
@Autowired
AssessItemDao assessItemDao;
- @GetMapping("page")
+ @PostMapping("page")
@ApiOperation("鍒嗛〉")
- @ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- })
- public Result<List<ReliabilityAssess>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
-
- return Result.ok(null);
+ public Result<List<ReliabilityAssess>> page(@RequestBody AssessResult assessResult) {
+ List<ReliabilityAssess> list = reliabilityAssessService.page(assessResult);
+ return Result.ok(list);
}
@PostMapping("importProductExcel")
@@ -61,11 +60,15 @@
StringBuilder str = new StringBuilder();
ImportUtil.importResult(result, importResults, str);
ImportUtil.ImportErrResult(result, importResults, str);
-
} catch (Exception e) {
e.printStackTrace();
}
return result;
+ }
+
+ @GetMapping("downloadXml")
+ public void downloadXml(HttpServletRequest request, HttpServletResponse response, Long productId, Long taskId, Long itemId,Integer xml) {
+ reliabilityAssessService.downloadXml(request,response,productId,taskId,itemId,xml);
}
@PostMapping("add")
@@ -79,6 +82,15 @@
return Result.ok();
}
+ @PostMapping("assess")
+ @ApiOperation("璇勫畾")
+ @LogOperation("璇勫畾")
+ public Result<List<ReliabilityAssess>> assess(@RequestBody AssessResult assessResult){
+ List<ReliabilityAssess> list = reliabilityAssessService.assess(assessResult);
+
+ return Result.ok(list);
+ }
+
@GetMapping("getAssessDataList")
public Result<List<AssessItem>> getAssessDataList(Long productId){
List<AssessItem> dataList = reliabilityAssessService.getAssessDataList(productId);
--
Gitblit v1.9.1