From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 17 三月 2025 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index 7029913..05b3d3e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -78,12 +78,12 @@
return Result.success(insReportService.upReportUrl(id));
}
- @ValueClassify("鎶ュ憡缂栧埗")
+ /*@ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鎶ュ憡鍦ㄧ嚎缂栧埗")
@GetMapping("/upReportFile")
public Result upReportFile() {
return Result.success();
- }
+ }*/
@ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鎻愪氦")
@@ -151,12 +151,13 @@
}
@ValueAuth
- @ApiOperation(value = "鏌ュ嚭璇ヨ鍗曚笅姣忎釜绔欑偣涓嬬殑妫�楠屾鏁�")
+ @ApiOperation(value = "鏌ュ嚭璇ヨ鍗曚笅姣忎釜鏍峰搧涓嬫瘡涓珯鐐圭殑妫�楠屾鏁�")
@GetMapping("/getInsOrderStateCount")
- public Result getInsOrderStateCount(Integer id){
- return Result.success(insReportService.getInsOrderStateCount(id));
+ public Result getInsOrderStateCount(Integer id,Integer sampleId){
+ return Result.success(insReportService.getInsOrderStateCount(id,sampleId));
}
+ //鍙栨秷2.26
@ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鍒ゆ柇鏄惁鐢熸垚鎬绘姤鍛�")
@PostMapping("/isReport")
--
Gitblit v1.9.3