From 774c8b2ee14eef5fd10bbd46d85a180e7b19ab21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 22 Mar 2024 14:34:12 +0800
Subject: [PATCH] 查询过滤优化
---
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/controller/PlaceController.java b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
index 39da7d1..dfa56e7 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -26,18 +26,12 @@
import javax.validation.Valid;
import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.house.excel.HouseAndHoldExcel;
-import org.springblade.modules.house.excel.HouseAndHoldImporter;
import org.springblade.modules.place.excel.*;
-import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
-import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.place.entity.PlaceEntity;
@@ -78,7 +72,7 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "分页LIST", notes = "传入place")
public R<IPage<PlaceVO>> list(PlaceEntity place, Query query) {
IPage<PlaceEntity> pages = placeService.page(Condition.getPage(query), Condition.getQueryWrapper(place));
return R.data(PlaceWrapper.build().pageVO(pages));
@@ -89,7 +83,7 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "分页page", notes = "传入place")
public R<IPage<PlaceVO>> page(PlaceVO place, Query query) {
IPage<PlaceVO> pages = placeService.selectPlacePage(Condition.getPage(query), place);
return R.data(pages);
@@ -100,9 +94,20 @@
*/
@GetMapping("/ninePage")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "九小场所档案", notes = "传入place")
public R<IPage<PlaceVO>> ninePage(PlaceVO place, Query query) {
IPage<PlaceVO> pages = placeService.selectNinePlacePage(Condition.getPage(query), place);
+ return R.data(pages);
+ }
+
+ /**
+ * 企业商超列表查询
+ */
+ @GetMapping("/mallPage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "企业商超列表查询", notes = "传入place")
+ public R<IPage<PlaceVO>> mallPage(PlaceVO place, Query query) {
+ IPage<PlaceVO> pages = placeService.selectMallPage(Condition.getPage(query), place);
return R.data(pages);
}
@@ -117,11 +122,12 @@
}
/**
- * 自定义新增/修改
+ * 自定义新增
* @param placeVO
* @return
*/
@PostMapping("/add")
+ @ApiOperation(value = "自定义新增", notes = "传入place")
public R add(@RequestBody PlaceVO placeVO){
return R.status(placeService.addOrUpdate(placeVO));
}
@@ -133,6 +139,7 @@
* @return
*/
@PostMapping("/addOrUpdate")
+ @ApiOperation(value = "自定义新增/修改", notes = "传入place")
public R addOrUpdate(@RequestBody PlaceVO placeVO){
return R.status(placeService.addOrUpdate(placeVO));
}
@@ -154,6 +161,7 @@
* @return
*/
@PostMapping("/updatePlace")
+ @ApiOperation(value = "自定义修改", notes = "传入place")
public R updatePlace(@RequestBody PlaceVO placeVO){
return R.status(placeService.updatePlace(placeVO));
}
@@ -217,6 +225,7 @@
* @return
*/
@GetMapping("/getDetail")
+ @ApiOperation(value = "场所表 自定义详情查询", notes = "传入ids")
public R<PlaceVO> getDetail(PlaceVO place) {
return R.data(placeService.getDetail(place));
}
--
Gitblit v1.9.3