From ad7151b14f2721b0fa40a903c6e65a2c511dd4c5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 15:08:13 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27第二次标准库完成修改
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
index b59d454..0405b39 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
@@ -1,9 +1,8 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
-import com.yuanchu.limslaboratory.pojo.Material;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -12,11 +11,8 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import java.util.Map;
/**
@@ -27,7 +23,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟-->鏍峰搧鐩稿叧")
@RestController
@RequestMapping("/inspectionMaterialList")
public class InspectionMaterialListController {
@@ -35,7 +31,7 @@
@Autowired
InspectionMaterialListService inspectionMaterialListService;
- @ApiOperation("娣诲姞鏍峰搧")
+ @ApiOperation("娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�")
@PostMapping("/addInspectionMaterialList")
public Result addInspectionMaterialList(@RequestHeader("X-Token") String token, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
inspectionMaterialList.setState(1);
@@ -55,14 +51,14 @@
@ApiOperation("鏍规嵁Id鏌ヨ鏍峰搧淇℃伅")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "inspectionId", value = "鏍峰搧ID", dataTypeClass = String.class, required = true),
})
- @PutMapping("/selectInspectionMaterialListById/{inspectionMaterialListId}")
- public Result selectInspectionMaterialListById(@PathVariable Integer inspectionMaterialListId) {
- return Result.success(inspectionMaterialListService.getById(inspectionMaterialListId));
+ @GetMapping("/selectInspectionMaterialListById/{inspectionId}")
+ public Result selectInspectionMaterialListById(@PathVariable String inspectionId) {
+ return Result.success(inspectionMaterialListService.list(new QueryWrapper<InspectionMaterialList>().eq("inspection_id", inspectionId).eq("state", 1)));
}
- @ApiOperation("淇敼鏍峰搧淇℃伅")
+ @ApiOperation("鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
})
--
Gitblit v1.9.3