From bc7b6fe334d195b107a21201e55bb0e13bdfc409 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 21 Jan 2026 18:05:54 +0800
Subject: [PATCH] 数据异议申请

---
 drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java
index fe0777f..6c24932 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java
@@ -21,6 +21,7 @@
 import io.swagger.annotations.ApiParam;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
 import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
@@ -60,8 +61,8 @@
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入gdDataObjection")
 	public R<GdDataObjectionVO> detail(GdDataObjectionDetailParam gdDataObjection) {
-		GdDataObjectionEntity detail = gdDataObjectionService.getOne(Condition.getQueryWrapper(GenericConverter.convert(gdDataObjection, GdDataObjectionEntity.class)));
-		return R.data(GdDataObjectionWrapper.build().entityVO(detail));
+		GdDataObjectionVO gdDataObjectionVO = gdDataObjectionService.getDetail(gdDataObjection);
+		return R.data(gdDataObjectionVO);
 	}
 
 	/**
@@ -105,9 +106,9 @@
 //	@ApiOperation(value = "导出数据", notes = "传入gdDataObjection")
 //	public void exportGdDataObjection(@ApiIgnore @RequestParam Map<String, Object> gdDataObjection, BladeUser bladeUser, HttpServletResponse response) {
 //		QueryWrapper<GdDataObjectionEntity> queryWrapper = Condition.getQueryWrapper(gdDataObjection, GdDataObjectionEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(GdDataObjection::getTenantId, bladeUser.getTenantId());
-		//}
+	// if (!AuthUtil.isAdministrator()) {
+	//	queryWrapper.lambda().eq(GdDataObjection::getTenantId, bladeUser.getTenantId());
+	//}
 //		queryWrapper.lambda().eq(GdDataObjectionEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 //		List<GdDataObjectionExcel> list = gdDataObjectionService.exportGdDataObjection(queryWrapper);
 //		ExcelUtil.export(response, "数据异议申请表数据" + DateUtil.time(), "数据异议申请表数据表", list, GdDataObjectionExcel.class);

--
Gitblit v1.9.3