Merge remote-tracking branch 'origin/master'

rain

2026-01-20 cdc60b89add7a32ee458c4b9c27acfdf40fc14fd

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderFlowController.java

@@ -1,19 +1,3 @@
/*
 *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
 *
 *  Redistribution and use in source and binary forms, with or without
 *  modification, are permitted provided that the following conditions are met:
 *
 *  Redistributions of source code must retain the above copyright notice,
 *  this list of conditions and the following disclaimer.
 *  Redistributions in binary form must reproduce the above copyright
 *  notice, this list of conditions and the following disclaimer in the
 *  documentation and/or other materials provided with the distribution.
 *  Neither the name of the dreamlu.net developer nor the names of its
 *  contributors may be used to endorse or promote products derived from
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.gd.workorder.controller;

import io.swagger.annotations.Api;
@@ -70,26 +54,26 @@
      return R.data(GdWorkOrderFlowWrapper.build().entityVO(detail));
   }
   /**
    * 流程记录表 分页
    * 流程记录表 列表
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入gdWorkOrderFlow")
   public R<IPage<GdWorkOrderFlowVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrderFlow, Query query) {
      IPage<GdWorkOrderFlowEntity> pages = gdWorkOrderFlowService.page(Condition.getPage(query), Condition.getQueryWrapper(gdWorkOrderFlow, GdWorkOrderFlowEntity.class));
      return R.data(GdWorkOrderFlowWrapper.build().pageVO(pages));
   @ApiOperation(value = "列表", notes = "传入gdWorkOrderFlow")
   public R<List<GdWorkOrderFlowVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrderFlow) {
      List<GdWorkOrderFlowEntity> list = gdWorkOrderFlowService.list(Condition.getQueryWrapper(gdWorkOrderFlow, GdWorkOrderFlowEntity.class));
      return R.data(GdWorkOrderFlowWrapper.build().entityVOList(list));
   }

   /**
    * 流程记录表 自定义分页
    */
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入gdWorkOrderFlow")
   public R<IPage<GdWorkOrderFlowVO>> page(GdWorkOrderFlowVO gdWorkOrderFlow, Query query) {
      IPage<GdWorkOrderFlowVO> pages = gdWorkOrderFlowService.selectGdWorkOrderFlowPage(Condition.getPage(query), gdWorkOrderFlow);
      return R.data(pages);
   }
   // @GetMapping("/page")
   // @ApiOperationSupport(order = 3)
   // @ApiOperation(value = "分页", notes = "传入gdWorkOrderFlow")
   // public R<IPage<GdWorkOrderFlowVO>> page(GdWorkOrderFlowVO gdWorkOrderFlow, Query query) {
   //    IPage<GdWorkOrderFlowVO> pages = gdWorkOrderFlowService.selectGdWorkOrderFlowPage(Condition.getPage(query), gdWorkOrderFlow);
   //    return R.data(pages);
   // }

   /**
    * 流程记录表 新增
@@ -104,32 +88,32 @@
   /**
    * 流程记录表 修改
    */
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入gdWorkOrderFlow")
   public R update(@Valid @RequestBody GdWorkOrderFlowEntity gdWorkOrderFlow) {
      return R.status(gdWorkOrderFlowService.updateById(gdWorkOrderFlow));
   }
   // @PostMapping("/update")
   // @ApiOperationSupport(order = 5)
   // @ApiOperation(value = "修改", notes = "传入gdWorkOrderFlow")
   // public R update(@Valid @RequestBody GdWorkOrderFlowEntity gdWorkOrderFlow) {
   //    return R.status(gdWorkOrderFlowService.updateById(gdWorkOrderFlow));
   // }

   /**
    * 流程记录表 新增或修改
    */
   @PostMapping("/submit")
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入gdWorkOrderFlow")
   public R submit(@Valid @RequestBody GdWorkOrderFlowEntity gdWorkOrderFlow) {
      return R.status(gdWorkOrderFlowService.saveOrUpdate(gdWorkOrderFlow));
   }
   // @PostMapping("/submit")
   // @ApiOperationSupport(order = 6)
   // @ApiOperation(value = "新增或修改", notes = "传入gdWorkOrderFlow")
   // public R submit(@Valid @RequestBody GdWorkOrderFlowEntity gdWorkOrderFlow) {
   //    return R.status(gdWorkOrderFlowService.saveOrUpdate(gdWorkOrderFlow));
   // }

   /**
    * 流程记录表 删除
    */
   @PostMapping("/remove")
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      return R.status(gdWorkOrderFlowService.deleteLogic(Func.toLongList(ids)));
   }
   // @PostMapping("/remove")
   // @ApiOperationSupport(order = 7)
   // @ApiOperation(value = "逻辑删除", notes = "传入ids")
   // public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
   //    return R.status(gdWorkOrderFlowService.deleteLogic(Func.toLongList(ids)));
   // }


   /**
@@ -138,6 +122,7 @@
   @GetMapping("/export-gdWorkOrderFlow")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "导出数据", notes = "传入gdWorkOrderFlow")
   @ApiIgnore
   public void exportGdWorkOrderFlow(@ApiIgnore @RequestParam Map<String, Object> gdWorkOrderFlow, BladeUser bladeUser, HttpServletResponse response) {
      QueryWrapper<GdWorkOrderFlowEntity> queryWrapper = Condition.getQueryWrapper(gdWorkOrderFlow, GdWorkOrderFlowEntity.class);
      //if (!AuthUtil.isAdministrator()) {