From 6654ce7a8e75581e5cf800831bede765cd006fbb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Sat, 17 Jan 2026 09:41:58 +0800
Subject: [PATCH] 需求填报分页接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java
index f1f01a1..984e1bb 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandController.java
@@ -32,6 +32,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.orderdata.entity.GdSupplyDemandEntity;
+import org.sxkj.gd.orderdata.param.GdSupplyDemandPageParam;
import org.sxkj.gd.orderdata.vo.GdSupplyDemandVO;
import org.sxkj.gd.orderdata.excel.GdSupplyDemandExcel;
import org.sxkj.gd.orderdata.wrapper.GdSupplyDemandWrapper;
@@ -86,30 +87,30 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdSupplyDemand")
- public R<IPage<GdSupplyDemandVO>> page(GdSupplyDemandVO gdSupplyDemand, Query query) {
+ public R<IPage<GdSupplyDemandVO>> page(GdSupplyDemandPageParam gdSupplyDemand, Query query) {
IPage<GdSupplyDemandVO> pages = gdSupplyDemandService.selectGdSupplyDemandPage(Condition.getPage(query), gdSupplyDemand);
return R.data(pages);
}
- /**
- * 供需需求信息表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdSupplyDemand")
- public R save(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
- return R.status(gdSupplyDemandService.save(gdSupplyDemand));
- }
+// /**
+// * 供需需求信息表 新增
+// */
+// @PostMapping("/save")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "新增", notes = "传入gdSupplyDemand")
+// public R save(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
+// return R.status(gdSupplyDemandService.save(gdSupplyDemand));
+// }
- /**
- * 供需需求信息表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdSupplyDemand")
- public R update(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
- return R.status(gdSupplyDemandService.updateById(gdSupplyDemand));
- }
+// /**
+// * 供需需求信息表 修改
+// */
+// @PostMapping("/update")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "修改", notes = "传入gdSupplyDemand")
+// public R update(@Valid @RequestBody GdSupplyDemandEntity gdSupplyDemand) {
+// return R.status(gdSupplyDemandService.updateById(gdSupplyDemand));
+// }
/**
* 供需需求信息表 新增或修改
@@ -132,20 +133,20 @@
}
- /**
- * 导出数据
- */
- @GetMapping("/export-gdSupplyDemand")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入gdSupplyDemand")
- public void exportGdSupplyDemand(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemand, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<GdSupplyDemandEntity> queryWrapper = Condition.getQueryWrapper(gdSupplyDemand, GdSupplyDemandEntity.class);
+// /**
+// * 导出数据
+// */
+// @GetMapping("/export-gdSupplyDemand")
+// @ApiOperationSupport(order = 9)
+// @ApiOperation(value = "导出数据", notes = "传入gdSupplyDemand")
+// public void exportGdSupplyDemand(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemand, BladeUser bladeUser, HttpServletResponse response) {
+// QueryWrapper<GdSupplyDemandEntity> queryWrapper = Condition.getQueryWrapper(gdSupplyDemand, GdSupplyDemandEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(GdSupplyDemand::getTenantId, bladeUser.getTenantId());
//}
- queryWrapper.lambda().eq(GdSupplyDemandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<GdSupplyDemandExcel> list = gdSupplyDemandService.exportGdSupplyDemand(queryWrapper);
- ExcelUtil.export(response, "供需需求信息表数据" + DateUtil.time(), "供需需求信息表数据表", list, GdSupplyDemandExcel.class);
- }
+// queryWrapper.lambda().eq(GdSupplyDemandEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+// List<GdSupplyDemandExcel> list = gdSupplyDemandService.exportGdSupplyDemand(queryWrapper);
+// ExcelUtil.export(response, "供需需求信息表数据" + DateUtil.time(), "供需需求信息表数据表", list, GdSupplyDemandExcel.class);
+// }
}
--
Gitblit v1.9.3