From f77a2eba10ce3f430d31a34790a8a1184c8069e6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 11:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index fd379d3..321f720 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -6,6 +6,7 @@
import java.util.*;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yuanchu.limslaboratory.mapper.UserMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
@@ -45,6 +46,9 @@
@Resource
LinkBasicInformationService linkBasicInformationService;
+ @Resource
+ UserMapper userMapper;
+
@ApiOperation(value = "鏌ヨ妫�楠岀敵璇峰崟鍒楄〃")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -71,10 +75,10 @@
case 0:
//鍘熸潗鏂�
return Result.success(rawMaterialService.selectRawmaAll());
- case 1:
+ case 2:
//濮旀墭鍗�
return Result.success(linkBasicInformationService.selectLinkAll());
- case 2:
+ case 1:
//鎴愬搧妫�楠�
return Result.success("璇疯緭鍏ユ楠屼俊鎭�!");
}
@@ -99,19 +103,31 @@
return Result.success(inspectionService.selectInspectsListById(id));
}
- @ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
+ @ApiOperation(value = "閫夋嫨妫�楠岄」鐩殑璐ｄ换浜�")
+ @GetMapping("/selectUser")
+ public Result selectUser() {
+ return Result.success(userMapper.selectUser());
+ }
+
+ @ApiOperation(value = "淇濆瓨妫�楠岄」鐩矗浠讳汉")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟椤圭洰id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "userProId", value = "璐ｄ换浜篿d", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/chooseUseProId")
+ public Result chooseUseProId(Integer id,Integer userProId) {
+ return Result.success(inspectionService.chooseUseProId(id,userProId));
+ }
+
+ @ApiOperation(value = "浣滃簾妫�楠屽崟")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
})
- @PostMapping("/updateInspectsById")
- public Result updateInspectsById(Integer id) {
- //濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
- Inspection inspection = inspectionService.getById(id);
- if (ObjectUtils.isNotEmpty(inspection.getInspectionStatus())) {
- return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
- }
- return Result.success(inspectionService.updateInspectsById(id));
+ @PostMapping("/delInspect")
+ public Result delInspect(Integer id) {
+ return Result.success(inspectionService.delInspect(id));
}
+
}
--
Gitblit v1.9.3