From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
index e5331a8..4dc32e3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
@@ -34,6 +34,14 @@
@Resource
Jwt jwt;
+ @ApiOperation(value = "鏂板鍘熸潗鏂欐楠屽崟-->鏍规嵁鍘熸潗鏂欑紪鐮佸緱鍒癷fs涓殑鎶ユ鏁版嵁")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "code", value = "鍘熸潗鏂欑紪鐮�", dataTypeClass = String.class, required = true)
+ })
+ @PostMapping("/chooseIFS")
+ public Result chooseIFS(String code){
+ return Result.success(rawInspectService.chooseIFS(code));
+ }
@ApiOperation(value = "鏂板鍘熸潗鏂欐楠屽崟")
@PostMapping("/addRawInspects")
@@ -71,16 +79,17 @@
@ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "number", value = "涓嶅悎鏍兼暟閲�", dataTypeClass = Integer.class)
})
@PostMapping("/updateRawInspectsById/{id}")
- public Result updateRawInspectsById(@PathVariable Integer id) {
+ public Result updateRawInspectsById(@PathVariable Integer id,Integer number) {
//濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
RawInspect rawInspect = rawInspectService.getById(id);
if (rawInspect.getInsState() == 1) {
return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
}
- return Result.success(rawInspectService.updateRawInspectsById(id));
+ return Result.success(rawInspectService.updateRawInspectsById(id,number));
}
}
--
Gitblit v1.9.3