From ada810aa38609da55b0f348b86cc8a8d8ace0efb Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 15 十月 2024 15:08:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
index 811745c..3b3c1ba 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java
@@ -62,20 +62,6 @@
@Autowired
private SimulatAssessService simulatAssessService;
-
- /* @GetMapping("page")
- @ApiOperation("鍒嗛〉")
- @ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @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 PageResult<SimulatAssess> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
-
- return PageResult.ok(simulatAssessService.page(queryFilter));
- }*/
-
@GetMapping("{id}")
@ApiOperation("淇℃伅")
public Result<SimulatAssess> get(@PathVariable("id") Long id) {
@@ -121,8 +107,8 @@
}
@GetMapping("getStatus")
- public Result<String> getTimeDiagram(Long productId, Long taskId, Long fzId) {
- String data = simulatAssessService.getTimeDiagram(productId, taskId, fzId);
+ public Result<TimeDiagramDto> getTimeDiagram(Long productId, Long taskId, Long fzId, double smallWidth,double minPointNum) {
+ TimeDiagramDto data = simulatAssessService.getTimeDiagram(productId, taskId, fzId, smallWidth,minPointNum);
return Result.ok(data);
}
@@ -168,12 +154,14 @@
}
@GetMapping("SchemeCompar")
- public Result<SchemeComparDto> SchemeCompar(@RequestParam("taskList[]") String[] taskList) {
- SchemeComparDto data = simulatAssessService.SchemeCompar(taskList);
+ public Result<SchemeComparDto> SchemeCompar(@RequestParam("taskList[]") String[] taskList,Long showProductId) {
+ SchemeComparDto data = simulatAssessService.SchemeCompar(taskList,showProductId);
return Result.ok(data);
}
+
+
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
--
Gitblit v1.9.1