From e3f3cc7ec499675ac0719f46359544b541c0da41 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 29 二月 2024 15:03:58 +0800
Subject: [PATCH] 功能调整
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 4 ++++
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 3 ++-
cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 12 ++++++------
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index 23a3c0c..e508f55 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.service.LaboratoryService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -9,10 +11,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -54,8 +53,9 @@
}
@ApiOperation(value = "鑾峰彇瀹為獙瀹ゅ悕绉�")
- @PostMapping("/obtainItemParameterList")
- public Result obtainItemParameterList() {
+ @GetMapping("/obtainItemParameterList")
+ @ValueAuth
+ public Result obtainItemParameterList() {
return Result.success(laboratoryService.obtainItemParameterList());
}
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index ff977a5..dec42e6 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -69,6 +69,10 @@
@ApiModelProperty(value = "妫�楠岄」绫诲瀷")
private String inspectionItemType;
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "妫�楠屽�肩被鍨�")
+ private String inspectionValueType;
+
@ValueTableShow(10)
@ApiModelProperty(value = "璁惧缁�")
private String deviceGroup;
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 521e1c7..d2894e5 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -26,7 +26,8 @@
update_time,
method,
man_day,
- bsm
+ bsm,
+ inspection_value_type
from structure_item_parameter
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
--
Gitblit v1.9.3