From aa3256f25ea88527455f96c02d39e6e319fcf8e4 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 09 八月 2023 17:53:20 +0800
Subject: [PATCH] 不合格反馈与不合格评审
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
index e312512..a5d2ce3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
@@ -29,7 +29,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-28
*/
-@Api(tags = "1銆佺墿鏂欒〃")
+@Api(tags = "鎶ユ绠＄悊-->鍘熸潗鏂欐姤妫�-->椤甸潰鐗堟湰琛�")
@RestController
@RequestMapping("/raw-material")
public class RawMaterialController {
@@ -43,11 +43,11 @@
@ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "materialCoding", value = "鏉愭枡缂栫爜", dataTypeClass = String.class),
@ApiImplicitParam(name = "materialName", value = "鏉愭枡鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "condition", value = "鐘舵��", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "condition", value = "鐘舵��", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "createTime", value = "鏉ユ枡鏃ユ湡", dataTypeClass = String.class)
})
@GetMapping("/selectAll")
- public Result<?> selectRawMaterial(Integer pageSize, Integer pageNo, String materialCoding, String materialName, String condition, String createTime) {
+ public Result<?> selectRawMaterial(Integer pageSize, Integer pageNo, String materialCoding, String materialName, Integer condition, String createTime) {
IPage<RawMaterial> iPage = rawMaterialService.selectRawMaterial(materialCoding, materialName, condition, createTime, new Page<Objects>(pageNo, pageSize));
Map<String, Object> map = new HashMap<>();
map.put("row", iPage.getRecords());
--
Gitblit v1.9.3