From 3664ff0935aeab26d23926331333a1f55caea1c1 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 19 Jan 2026 15:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditController.java | 67 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditController.java
index d96a1b3..42e161c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditController.java
@@ -64,10 +64,9 @@
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入gdSupplyDemandAudit")
- public R<GdSupplyDemandAuditVO> detail(GdSupplyDemandAuditEntity gdSupplyDemandAudit) {
- GdSupplyDemandAuditEntity detail = gdSupplyDemandAuditService.getOne(Condition.getQueryWrapper(gdSupplyDemandAudit));
- return R.data(GdSupplyDemandAuditWrapper.build().entityVO(detail));
+ @ApiOperation(value = "详情", notes = "传入demandId")
+ public R<List<GdSupplyDemandAuditVO>> detail(@ApiParam(value = "供需需求ID", required = true) @RequestParam Long demandId) {
+ return R.data(gdSupplyDemandAuditService.listSupplyDemandAudit(demandId));
}
/**
* 供需需求审核记录表 分页
@@ -91,25 +90,25 @@
return R.data(pages);
}
- /**
- * 供需需求审核记录表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdSupplyDemandAudit")
- public R save(@Valid @RequestBody GdSupplyDemandAuditEntity gdSupplyDemandAudit) {
- return R.status(gdSupplyDemandAuditService.save(gdSupplyDemandAudit));
- }
+// /**
+// * 供需需求审核记录表 新增
+// */
+// @PostMapping("/save")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "新增", notes = "传入gdSupplyDemandAudit")
+// public R save(@Valid @RequestBody GdSupplyDemandAuditEntity gdSupplyDemandAudit) {
+// return R.status(gdSupplyDemandAuditService.save(gdSupplyDemandAudit));
+// }
- /**
- * 供需需求审核记录表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdSupplyDemandAudit")
- public R update(@Valid @RequestBody GdSupplyDemandAuditEntity gdSupplyDemandAudit) {
- return R.status(gdSupplyDemandAuditService.updateById(gdSupplyDemandAudit));
- }
+// /**
+// * 供需需求审核记录表 修改
+// */
+// @PostMapping("/update")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "修改", notes = "传入gdSupplyDemandAudit")
+// public R update(@Valid @RequestBody GdSupplyDemandAuditEntity gdSupplyDemandAudit) {
+// return R.status(gdSupplyDemandAuditService.updateById(gdSupplyDemandAudit));
+// }
/**
* 供需需求审核记录表 新增或修改
@@ -132,20 +131,20 @@
}
- /**
- * 导出数据
- */
- @GetMapping("/export-gdSupplyDemandAudit")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入gdSupplyDemandAudit")
- public void exportGdSupplyDemandAudit(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemandAudit, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<GdSupplyDemandAuditEntity> queryWrapper = Condition.getQueryWrapper(gdSupplyDemandAudit, GdSupplyDemandAuditEntity.class);
+// /**
+// * 导出数据
+// */
+// @GetMapping("/export-gdSupplyDemandAudit")
+// @ApiOperationSupport(order = 9)
+// @ApiOperation(value = "导出数据", notes = "传入gdSupplyDemandAudit")
+// public void exportGdSupplyDemandAudit(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemandAudit, BladeUser bladeUser, HttpServletResponse response) {
+// QueryWrapper<GdSupplyDemandAuditEntity> queryWrapper = Condition.getQueryWrapper(gdSupplyDemandAudit, GdSupplyDemandAuditEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(GdSupplyDemandAudit::getTenantId, bladeUser.getTenantId());
//}
- queryWrapper.lambda().eq(GdSupplyDemandAuditEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<GdSupplyDemandAuditExcel> list = gdSupplyDemandAuditService.exportGdSupplyDemandAudit(queryWrapper);
- ExcelUtil.export(response, "供需需求审核记录表数据" + DateUtil.time(), "供需需求审核记录表数据表", list, GdSupplyDemandAuditExcel.class);
- }
+// queryWrapper.lambda().eq(GdSupplyDemandAuditEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+// List<GdSupplyDemandAuditExcel> list = gdSupplyDemandAuditService.exportGdSupplyDemandAudit(queryWrapper);
+// ExcelUtil.export(response, "供需需求审核记录表数据" + DateUtil.time(), "供需需求审核记录表数据表", list, GdSupplyDemandAuditExcel.class);
+// }
}
--
Gitblit v1.9.3