From 1510366fa12fafd5197ebcd8d7fbc45d2383218d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 15:49:27 +0800
Subject: [PATCH] 设备管理优化

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditAttachmentController.java |   98 +++++++++++++++++++++++++++----------------------
 1 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditAttachmentController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditAttachmentController.java
index c17d655..65687ed 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditAttachmentController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdSupplyDemandAuditAttachmentController.java
@@ -60,25 +60,35 @@
 	private final IGdSupplyDemandAuditAttachmentService gdSupplyDemandAuditAttachmentService;
 
 	/**
+	 * 供需需求审核附件表 列表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "列表", notes = "传入demandId")
+	public R<List<GdSupplyDemandAuditAttachmentVO>> list(@ApiParam(value = "供需需求ID", required = true) @RequestParam Long demandId) {
+		return R.data(gdSupplyDemandAuditAttachmentService.listSupplyDemandAuditAttachments(demandId));
+	}
+
+	/**
 	 * 供需需求审核附件表 详情
 	 */
 	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入gdSupplyDemandAuditAttachment")
-	public R<GdSupplyDemandAuditAttachmentVO> detail(GdSupplyDemandAuditAttachmentEntity gdSupplyDemandAuditAttachment) {
-		GdSupplyDemandAuditAttachmentEntity detail = gdSupplyDemandAuditAttachmentService.getOne(Condition.getQueryWrapper(gdSupplyDemandAuditAttachment));
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "详情", notes = "传入id")
+	public R<GdSupplyDemandAuditAttachmentVO> detail(@ApiParam(value = "主键ID", required = true) @RequestParam Long id) {
+		GdSupplyDemandAuditAttachmentEntity detail = gdSupplyDemandAuditAttachmentService.getById(id);
 		return R.data(GdSupplyDemandAuditAttachmentWrapper.build().entityVO(detail));
 	}
-	/**
-	 * 供需需求审核附件表 分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入gdSupplyDemandAuditAttachment")
-	public R<IPage<GdSupplyDemandAuditAttachmentVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemandAuditAttachment, Query query) {
-		IPage<GdSupplyDemandAuditAttachmentEntity> pages = gdSupplyDemandAuditAttachmentService.page(Condition.getPage(query), Condition.getQueryWrapper(gdSupplyDemandAuditAttachment, GdSupplyDemandAuditAttachmentEntity.class));
-		return R.data(GdSupplyDemandAuditAttachmentWrapper.build().pageVO(pages));
-	}
+//	/**
+//	 * 供需需求审核附件表 分页
+//	 */
+//	@GetMapping("/list")
+//	@ApiOperationSupport(order = 2)
+//	@ApiOperation(value = "分页", notes = "传入gdSupplyDemandAuditAttachment")
+//	public R<IPage<GdSupplyDemandAuditAttachmentVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemandAuditAttachment, Query query) {
+//		IPage<GdSupplyDemandAuditAttachmentEntity> pages = gdSupplyDemandAuditAttachmentService.page(Condition.getPage(query), Condition.getQueryWrapper(gdSupplyDemandAuditAttachment, GdSupplyDemandAuditAttachmentEntity.class));
+//		return R.data(GdSupplyDemandAuditAttachmentWrapper.build().pageVO(pages));
+//	}
 
 	/**
 	 * 供需需求审核附件表 自定义分页
@@ -91,25 +101,25 @@
 		return R.data(pages);
 	}
 
-	/**
-	 * 供需需求审核附件表 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入gdSupplyDemandAuditAttachment")
-	public R save(@Valid @RequestBody GdSupplyDemandAuditAttachmentEntity gdSupplyDemandAuditAttachment) {
-		return R.status(gdSupplyDemandAuditAttachmentService.save(gdSupplyDemandAuditAttachment));
-	}
+//	/**
+//	 * 供需需求审核附件表 新增
+//	 */
+//	@PostMapping("/save")
+//	@ApiOperationSupport(order = 4)
+//	@ApiOperation(value = "新增", notes = "传入gdSupplyDemandAuditAttachment")
+//	public R save(@Valid @RequestBody GdSupplyDemandAuditAttachmentEntity gdSupplyDemandAuditAttachment) {
+//		return R.status(gdSupplyDemandAuditAttachmentService.save(gdSupplyDemandAuditAttachment));
+//	}
 
-	/**
-	 * 供需需求审核附件表 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入gdSupplyDemandAuditAttachment")
-	public R update(@Valid @RequestBody GdSupplyDemandAuditAttachmentEntity gdSupplyDemandAuditAttachment) {
-		return R.status(gdSupplyDemandAuditAttachmentService.updateById(gdSupplyDemandAuditAttachment));
-	}
+//	/**
+//	 * 供需需求审核附件表 修改
+//	 */
+//	@PostMapping("/update")
+//	@ApiOperationSupport(order = 5)
+//	@ApiOperation(value = "修改", notes = "传入gdSupplyDemandAuditAttachment")
+//	public R update(@Valid @RequestBody GdSupplyDemandAuditAttachmentEntity gdSupplyDemandAuditAttachment) {
+//		return R.status(gdSupplyDemandAuditAttachmentService.updateById(gdSupplyDemandAuditAttachment));
+//	}
 
 	/**
 	 * 供需需求审核附件表 新增或修改
@@ -132,20 +142,20 @@
 	}
 
 
-	/**
-	 * 导出数据
-	 */
-	@GetMapping("/export-gdSupplyDemandAuditAttachment")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入gdSupplyDemandAuditAttachment")
-	public void exportGdSupplyDemandAuditAttachment(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemandAuditAttachment, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<GdSupplyDemandAuditAttachmentEntity> queryWrapper = Condition.getQueryWrapper(gdSupplyDemandAuditAttachment, GdSupplyDemandAuditAttachmentEntity.class);
+//	/**
+//	 * 导出数据
+//	 */
+//	@GetMapping("/export-gdSupplyDemandAuditAttachment")
+//	@ApiOperationSupport(order = 9)
+//	@ApiOperation(value = "导出数据", notes = "传入gdSupplyDemandAuditAttachment")
+//	public void exportGdSupplyDemandAuditAttachment(@ApiIgnore @RequestParam Map<String, Object> gdSupplyDemandAuditAttachment, BladeUser bladeUser, HttpServletResponse response) {
+//		QueryWrapper<GdSupplyDemandAuditAttachmentEntity> queryWrapper = Condition.getQueryWrapper(gdSupplyDemandAuditAttachment, GdSupplyDemandAuditAttachmentEntity.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(GdSupplyDemandAuditAttachment::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(GdSupplyDemandAuditAttachmentEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<GdSupplyDemandAuditAttachmentExcel> list = gdSupplyDemandAuditAttachmentService.exportGdSupplyDemandAuditAttachment(queryWrapper);
-		ExcelUtil.export(response, "供需需求审核附件表数据" + DateUtil.time(), "供需需求审核附件表数据表", list, GdSupplyDemandAuditAttachmentExcel.class);
-	}
+//		queryWrapper.lambda().eq(GdSupplyDemandAuditAttachmentEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+//		List<GdSupplyDemandAuditAttachmentExcel> list = gdSupplyDemandAuditAttachmentService.exportGdSupplyDemandAuditAttachment(queryWrapper);
+//		ExcelUtil.export(response, "供需需求审核附件表数据" + DateUtil.time(), "供需需求审核附件表数据表", list, GdSupplyDemandAuditAttachmentExcel.class);
+//	}
 
 }

--
Gitblit v1.9.3