吉安感知网项目-后端
linwei
2026-01-21 bc7b6fe334d195b107a21201e55bb0e13bdfc409
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;
@@ -29,8 +30,10 @@
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.common.GenericConverter;
import org.sxkj.gd.orderdata.dto.GdDataObjectionDTO;
import org.sxkj.gd.orderdata.entity.GdDataObjectionEntity;
import org.sxkj.gd.orderdata.param.GdDataObjectionDetailParam;
import org.sxkj.gd.orderdata.param.GdDataObjectionPageParam;
import org.sxkj.gd.orderdata.vo.GdDataObjectionVO;
import org.sxkj.gd.orderdata.wrapper.GdDataObjectionWrapper;
@@ -57,20 +60,10 @@
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入gdDataObjection")
   public R<GdDataObjectionVO> detail(GdDataObjectionEntity gdDataObjection) {
      GdDataObjectionEntity detail = gdDataObjectionService.getOne(Condition.getQueryWrapper(gdDataObjection));
      return R.data(GdDataObjectionWrapper.build().entityVO(detail));
   public R<GdDataObjectionVO> detail(GdDataObjectionDetailParam gdDataObjection) {
      GdDataObjectionVO gdDataObjectionVO = gdDataObjectionService.getDetail(gdDataObjection);
      return R.data(gdDataObjectionVO);
   }
   /**
    * 数据异议申请表 分页
    */
   // @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));
   // }
   /**
    * 数据异议申请表 自定义分页
@@ -83,25 +76,6 @@
      return R.data(pages);
   }
//   /**
//    * 数据异议申请表 新增
//    */
//   @PostMapping("/save")
//   @ApiOperationSupport(order = 4)
//   @ApiOperation(value = "新增", notes = "传入gdDataObjection")
//   public R save(@Valid @RequestBody GdDataObjectionEntity gdDataObjection) {
//      return R.status(gdDataObjectionService.save(gdDataObjection));
//   }
//   /**
//    * 数据异议申请表 修改
//    */
//   @PostMapping("/update")
//   @ApiOperationSupport(order = 5)
//   @ApiOperation(value = "修改", notes = "传入gdDataObjection")
//   public R update(@Valid @RequestBody GdDataObjectionEntity gdDataObjection) {
//      return R.status(gdDataObjectionService.updateById(gdDataObjection));
//   }
   /**
    * 数据异议申请表 新增或修改
@@ -132,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);