From ee5f64ff15c79240681fc46b0201a293ccaf54ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 七月 2023 18:02:56 +0800
Subject: [PATCH] 检验模块
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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 fb71110..184292f 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,9 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+import com.yuanchu.limslaboratory.pojo.Inspection;
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,22 +12,21 @@
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 javax.annotation.Resource;
import java.util.Map;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟-->鏍峰搧鐩稿叧")
@RestController
@RequestMapping("/inspectionMaterialList")
public class InspectionMaterialListController {
@@ -35,13 +34,24 @@
@Autowired
InspectionMaterialListService inspectionMaterialListService;
- @ApiOperation("娣诲姞鏍峰搧")
+ @Resource
+ InspectionMapper inspectionMapper;
+
+ @ApiOperation("娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�")
@PostMapping("/addInspectionMaterialList")
public Result addInspectionMaterialList(@RequestHeader("X-Token") String token, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
- inspectionMaterialList.setState(1);
- Object object = RedisUtil.get(token);
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- return Result.success(inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, ""+unmarshal.get("id")));
+ //濡傛灉妫�楠屽崟宸蹭綔搴�,鐘舵�佷负0,鍒欐棤娉曟坊鍔犳牱鍝�
+ Inspection inspection = inspectionMapper.selectById(inspectionMaterialList.getInspectionId());
+ if (inspection.getState()==0) {
+ return Result.fail("妫�楠屽崟宸蹭綔搴熸棤娉曟坊鍔犳楠屾牱鍝�");
+ }
+ else {
+ inspectionMaterialList.setState(1);
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, "" + unmarshal.get("id"));
+ return Result.success();
+ }
}
@ApiOperation("鍒犻櫎鏍峰搧")
@@ -50,25 +60,26 @@
})
@PostMapping("/delInspectionMaterialList")
public Result delInspectionMaterialList(int inspectionMaterialListId) {
- return Result.success(inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId));
+ inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId);
+ return Result.success();
}
- @ApiOperation("鏍规嵁Id鏌ヨ鏍峰搧淇℃伅")
+ @ApiOperation("鏍规嵁鏍峰搧Id鏌ヨ鏍峰搧淇℃伅")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
})
- @PostMapping("/selectInspectionMaterialListById")
- public Result selectInspectionMaterialListById(int inspectionMaterialListId) throws Exception {
+ @PutMapping("/selectInspectionMaterialListById/{inspectionMaterialListId}")
+ public Result selectInspectionMaterialListById(@PathVariable Integer inspectionMaterialListId) {
return Result.success(inspectionMaterialListService.getById(inspectionMaterialListId));
}
- @ApiOperation("淇敼鏍峰搧淇℃伅")
+ @ApiOperation("鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
})
@PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
- public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
- return Result.success(inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId,inspectionMaterialList));
+ public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) {
+ inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialList);
+ return Result.success();
}
-
}
--
Gitblit v1.9.3