From 981a3d85848753a799da2d909089c2fe4fcd3ccf Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 18 Jul 2022 14:53:15 +0800
Subject: [PATCH] 农产品库存，操作人列表查询修改，溯源码详情查询修改，
---
src/main/java/org/springblade/modules/remote/controller/RemoteController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/remote/controller/RemoteController.java b/src/main/java/org/springblade/modules/remote/controller/RemoteController.java
index cd3327d..a5c15cf 100644
--- a/src/main/java/org/springblade/modules/remote/controller/RemoteController.java
+++ b/src/main/java/org/springblade/modules/remote/controller/RemoteController.java
@@ -27,6 +27,8 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.desk.entity.Notice;
+import org.springblade.modules.remote.wrapper.RemoteWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -34,6 +36,9 @@
import org.springblade.modules.remote.vo.RemoteVO;
import org.springblade.modules.remote.service.IRemoteService;
import org.springblade.core.boot.ctrl.BladeController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Map;
/**
* 控制器
@@ -61,18 +66,19 @@
}
/**
- * 分页
+ * 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入remote")
- public R<IPage<Remote>> list(Remote remote, Query query) {
- IPage<Remote> pages = remoteService.page(Condition.getPage(query), Condition.getQueryWrapper(remote));
- return R.data(pages);
+ public R<IPage<RemoteVO>> list(@ApiIgnore @RequestParam Map<String, Object> remote, Query query) {
+ //IPage<Remote> pages = remoteService.page(Condition.getPage(query), Condition.getQueryWrapper(remote));
+ IPage<Remote> pages = remoteService.page(Condition.getPage(query), Condition.getQueryWrapper(remote, Remote.class));
+ return R.data(RemoteWrapper.build().pageVO(pages));
}
/**
- * 自定义分页
+ * 自定义分页
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@@ -83,7 +89,7 @@
}
/**
- * 新增
+ * 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@@ -93,7 +99,7 @@
}
/**
- * 修改
+ * 修改
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@@ -103,7 +109,7 @@
}
/**
- * 新增或修改
+ * 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@@ -112,9 +118,9 @@
return R.status(remoteService.saveOrUpdate(remote));
}
-
+
/**
- * 删除
+ * 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@@ -123,5 +129,5 @@
return R.status(remoteService.deleteLogic(Func.toLongList(ids)));
}
-
+
}
--
Gitblit v1.9.3