From 8bb407e6af7af441783dba54ce5db8eaf23956c3 Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期二, 08 八月 2023 09:25:26 +0800
Subject: [PATCH] 提交代码
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 bea06b8..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
@@ -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