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/GdApplicationInnovationController.java |   53 ++++++-----------------------------------------------
 1 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java
index ff71343..711daf1 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdApplicationInnovationController.java
@@ -31,7 +31,9 @@
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.gd.orderdata.dto.GdApplicationInnovationDTO;
 import org.sxkj.gd.orderdata.entity.GdApplicationInnovationEntity;
+import org.sxkj.gd.orderdata.param.GdApplicationInnovationPageParam;
 import org.sxkj.gd.orderdata.vo.GdApplicationInnovationVO;
 import org.sxkj.gd.orderdata.excel.GdApplicationInnovationExcel;
 import org.sxkj.gd.orderdata.wrapper.GdApplicationInnovationWrapper;
@@ -69,16 +71,6 @@
 		GdApplicationInnovationEntity detail = gdApplicationInnovationService.getOne(Condition.getQueryWrapper(gdApplicationInnovation));
 		return R.data(GdApplicationInnovationWrapper.build().entityVO(detail));
 	}
-	/**
-	 * 应用创新案例表 分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入gdApplicationInnovation")
-	public R<IPage<GdApplicationInnovationVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdApplicationInnovation, Query query) {
-		IPage<GdApplicationInnovationEntity> pages = gdApplicationInnovationService.page(Condition.getPage(query), Condition.getQueryWrapper(gdApplicationInnovation, GdApplicationInnovationEntity.class));
-		return R.data(GdApplicationInnovationWrapper.build().pageVO(pages));
-	}
 
 	/**
 	 * 应用创新案例表 自定义分页
@@ -86,30 +78,11 @@
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入gdApplicationInnovation")
-	public R<IPage<GdApplicationInnovationVO>> page(GdApplicationInnovationVO gdApplicationInnovation, Query query) {
+	public R<IPage<GdApplicationInnovationVO>> page(GdApplicationInnovationPageParam gdApplicationInnovation, Query query) {
 		IPage<GdApplicationInnovationVO> pages = gdApplicationInnovationService.selectGdApplicationInnovationPage(Condition.getPage(query), gdApplicationInnovation);
 		return R.data(pages);
 	}
 
-	/**
-	 * 应用创新案例表 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入gdApplicationInnovation")
-	public R save(@Valid @RequestBody GdApplicationInnovationEntity gdApplicationInnovation) {
-		return R.status(gdApplicationInnovationService.save(gdApplicationInnovation));
-	}
-
-	/**
-	 * 应用创新案例表 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入gdApplicationInnovation")
-	public R update(@Valid @RequestBody GdApplicationInnovationEntity gdApplicationInnovation) {
-		return R.status(gdApplicationInnovationService.updateById(gdApplicationInnovation));
-	}
 
 	/**
 	 * 应用创新案例表 新增或修改
@@ -117,8 +90,9 @@
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入gdApplicationInnovation")
-	public R submit(@Valid @RequestBody GdApplicationInnovationEntity gdApplicationInnovation) {
-		return R.status(gdApplicationInnovationService.saveOrUpdate(gdApplicationInnovation));
+	public R submit(@Valid @RequestBody GdApplicationInnovationDTO gdApplicationInnovation) {
+		GdApplicationInnovationEntity gdApplicationInnovationEntity = GdApplicationInnovationWrapper.build().entityDTO(gdApplicationInnovation);
+		return R.status(gdApplicationInnovationService.saveOrUpdate(gdApplicationInnovationEntity));
 	}
 
 	/**
@@ -132,20 +106,5 @@
 	}
 
 
-	/**
-	 * 导出数据
-	 */
-	@GetMapping("/export-gdApplicationInnovation")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入gdApplicationInnovation")
-	public void exportGdApplicationInnovation(@ApiIgnore @RequestParam Map<String, Object> gdApplicationInnovation, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<GdApplicationInnovationEntity> queryWrapper = Condition.getQueryWrapper(gdApplicationInnovation, GdApplicationInnovationEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(GdApplicationInnovation::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(GdApplicationInnovationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<GdApplicationInnovationExcel> list = gdApplicationInnovationService.exportGdApplicationInnovation(queryWrapper);
-		ExcelUtil.export(response, "应用创新案例表数据" + DateUtil.time(), "应用创新案例表数据表", list, GdApplicationInnovationExcel.class);
-	}
 
 }

--
Gitblit v1.9.3