Merge remote-tracking branch 'origin/master'

xiebin

2026-01-15 fdf4b81f3df919c3f1ff98e112a68cf4df46b9a5

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workOrder/controller/GdWorkOrderController.java

@@ -16,7 +16,6 @@
 */
package org.sxkj.gd.workOrder.controller;

import com.github.xiaoymin.knife4j.annotations.Ignore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -54,7 +53,7 @@
 */
@RestController
@AllArgsConstructor
@RequestMapping("gdWorkOrder/gdWorkOrder")
@RequestMapping("workOrder/gdWorkOrder")
@Api(value = "工单任务表", tags = "工单任务表接口")
public class GdWorkOrderController extends BladeController {

@@ -73,13 +72,13 @@
   /**
    * 工单任务表 分页
    */
   // @GetMapping("/list")
   // @ApiOperationSupport(order = 2)
   // @ApiOperation(value = "分页", notes = "传入gdWorkOrder")
   // public R<IPage<GdWorkOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrder, Query query) {
   //    IPage<GdWorkOrderEntity> pages = gdWorkOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(gdWorkOrder, GdWorkOrderEntity.class));
   //    return R.data(GdWorkOrderWrapper.build().pageVO(pages));
   // }
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入gdWorkOrder")
   public R<IPage<GdWorkOrderVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrder, Query query) {
      IPage<GdWorkOrderEntity> pages = gdWorkOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(gdWorkOrder, GdWorkOrderEntity.class));
      return R.data(GdWorkOrderWrapper.build().pageVO(pages));
   }

   /**
    * 工单任务表 自定义分页
@@ -95,22 +94,22 @@
   /**
    * 工单任务表 新增
    */
   // @PostMapping("/save")
   // @ApiOperationSupport(order = 4)
   // @ApiOperation(value = "新增", notes = "传入gdWorkOrder")
   // public R save(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
   //    return R.status(gdWorkOrderService.save(gdWorkOrder));
   // }
   @PostMapping("/save")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入gdWorkOrder")
   public R save(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
      return R.status(gdWorkOrderService.save(gdWorkOrder));
   }

   /**
    * 工单任务表 修改
    */
   // @PostMapping("/update")
   // @ApiOperationSupport(order = 5)
   // @ApiOperation(value = "修改", notes = "传入gdWorkOrder")
   // public R update(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
   //    return R.status(gdWorkOrderService.updateById(gdWorkOrder));
   // }
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入gdWorkOrder")
   public R update(@Valid @RequestBody GdWorkOrderEntity gdWorkOrder) {
      return R.status(gdWorkOrderService.updateById(gdWorkOrder));
   }

   /**
    * 工单任务表 新增或修改
@@ -138,7 +137,6 @@
    */
   @GetMapping("/export-gdWorkOrder")
   @ApiOperationSupport(order = 9)
   @ApiIgnore
   @ApiOperation(value = "导出数据", notes = "传入gdWorkOrder")
   public void exportGdWorkOrder(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrder, BladeUser bladeUser, HttpServletResponse response) {
      QueryWrapper<GdWorkOrderEntity> queryWrapper = Condition.getQueryWrapper(gdWorkOrder, GdWorkOrderEntity.class);