From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 0405b39..0a2467c 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,8 +1,11 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+import com.yuanchu.limslaboratory.pojo.Inspection;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -13,6 +16,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
import java.util.Map;
/**
@@ -31,13 +36,24 @@
@Autowired
InspectionMaterialListService inspectionMaterialListService;
+ @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("鍒犻櫎鏍峰搧")
@@ -46,10 +62,11 @@
})
@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 = "inspectionId", value = "鏍峰搧ID", dataTypeClass = String.class, required = true),
})
@@ -63,8 +80,8 @@
@ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
})
@PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
- public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) {
- return Result.success(inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialList));
+ public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialListDto inspectionMaterialListDto) {
+ inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialListDto);
+ return Result.success();
}
-
}
--
Gitblit v1.9.3