From 9978fe196d10fc7b32980c1dd2a03de5f84dc80d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 21 Jan 2026 13:24:53 +0800
Subject: [PATCH] 数据异议申请
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataObjectionController.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 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 e63b08b..0438983 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
@@ -23,27 +23,19 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
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.GdDataObjectionDTO;
import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
+import org.sxkj.gd.orderdata.param.GdDataObjectionPageParam;
import org.sxkj.gd.orderdata.vo.GdDataObjectionVO;
-import org.sxkj.gd.orderdata.excel.GdDataObjectionExcel;
import org.sxkj.gd.orderdata.wrapper.GdDataObjectionWrapper;
import org.sxkj.gd.orderdata.service.IGdDataObjectionService;
import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
-import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
/**
* 数据异议申请表 控制器
@@ -72,13 +64,13 @@
/**
* 数据异议申请表 分页
*/
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入gdDataObjection")
- public R<IPage<GdDataObjectionVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdDataObjection, Query query) {
- IPage<GdDataObjectionEntity> pages = gdDataObjectionService.page(Condition.getPage(query), Condition.getQueryWrapper(gdDataObjection, GdDataObjectionEntity.class));
- return R.data(GdDataObjectionWrapper.build().pageVO(pages));
- }
+ // @GetMapping("/list")
+ // @ApiOperationSupport(order = 2)
+ // @ApiOperation(value = "分页", notes = "传入gdDataObjection")
+ // public R<IPage<GdDataObjectionVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdDataObjection, Query query) {
+ // IPage<GdDataObjectionEntity> pages = gdDataObjectionService.page(Condition.getPage(query), Condition.getQueryWrapper(gdDataObjection, GdDataObjectionEntity.class));
+ // return R.data(GdDataObjectionWrapper.build().pageVO(pages));
+ // }
/**
* 数据异议申请表 自定义分页
@@ -86,7 +78,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdDataObjection")
- public R<IPage<GdDataObjectionVO>> page(GdDataObjectionVO gdDataObjection, Query query) {
+ public R<IPage<GdDataObjectionVO>> page(GdDataObjectionPageParam gdDataObjection, Query query) {
IPage<GdDataObjectionVO> pages = gdDataObjectionService.selectGdDataObjectionPage(Condition.getPage(query), gdDataObjection);
return R.data(pages);
}
@@ -117,8 +109,8 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入gdDataObjection")
- public R submit(@Valid @RequestBody GdDataObjectionEntity gdDataObjection) {
- return R.status(gdDataObjectionService.saveOrUpdate(gdDataObjection));
+ public R submit(@Valid @RequestBody GdDataObjectionDTO gdDataObjectionDTO) {
+ return R.status(gdDataObjectionService.saveOrUpdateDataObjection(gdDataObjectionDTO));
}
/**
--
Gitblit v1.9.3