refactor(workorder): 重构工单状态聚合逻辑-只处理撤回任务状态

linwei

3 days ago 92dc5972adbd94d47c0e6501ce4a7b51af09e3c3

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

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

import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -23,6 +24,7 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -52,6 +54,7 @@
 * @author lw
 * @since 2026-01-14
 */
@Slf4j
@RestController
@AllArgsConstructor
@RequestMapping("workOrder/gdClueEvent")
@@ -77,8 +80,10 @@
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "固定过滤本部门，onlyMine=1时仅我的数据")
   public R<List<GdClueEventListVO>> list(@ApiParam(value = "是否仅我的数据，1为是，0为否")
         @RequestParam(value = "onlyMine", required = false, defaultValue = "0") Integer onlyMine) {
      List<GdClueEventListVO> list = gdClueEventService.listGdClueEventByDept(onlyMine);
         @RequestParam(value = "onlyMine", required = false, defaultValue = "0") Integer onlyMine,
         @ApiParam(value = "事件编号关键字")
         @RequestParam(value = "keyword", required = false) String keyword) {
      List<GdClueEventListVO> list = gdClueEventService.listGdClueEventByDept(onlyMine, keyword);
      return R.data(list);
   }

@@ -88,8 +93,9 @@
   @GetMapping("/count")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "数量统计", notes = "返回全部工单与我的工单数量")
   public R<GdClueEventCountVO> count() {
      return R.data(gdClueEventService.getGdClueEventCount());
   public R<GdClueEventCountVO> count(@ApiParam(value = "事件编号关键字")
         @RequestParam(value = "keyword", required = false) String keyword) {
      return R.data(gdClueEventService.getGdClueEventCount(keyword));
   }

   /**
@@ -134,6 +140,17 @@
   }

   /**
    * 事件表（线索事件） 新增或修改-对外接口
    */
   @PostMapping("/submitExternal")
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入gdClueEvent")
   public R submitExternal(@Valid @RequestBody GdClueEventEntity gdClueEvent) {
      log.info("submitExternal-gdClueEvent:{}", JSON.toJSONString(gdClueEvent));
      return R.status(gdClueEventService.saveOrUpdateExternal(gdClueEvent));
   }

   /**
    * 事件表（线索事件） 删除
    */
   @PostMapping("/remove")
@@ -144,13 +161,13 @@
   }

   /**
    * 事件驳回
    * 事件处理
    */
   @PostMapping("/reject")
   @PostMapping("/handle")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "驳回", notes = "传入事件ID")
   public R reject(@Valid @RequestBody GdClueEventRejectParam rejectParam) {
      return R.status(gdClueEventService.rejectClueEvent(rejectParam));
   @ApiOperation(value = "处理", notes = "传入事件ID与事件状态")
   public R handle(@Valid @RequestBody GdClueEventRejectParam rejectParam) {
      return R.status(gdClueEventService.handleClueEvent(rejectParam));
   }

//   /**