修改工单

smart-steward-api/src/main/java/com/smartSteward/web/controller/work/WorkOrderController.java

@@ -104,7 +104,6 @@ public class WorkOrderController extends BaseController {
     @Log(title = "工单", businessType = BusinessType.UPDATE)
     @PutMapping("/submit/{id}")
     public AjaxResult submit(@PathVariable("id") Long id) {
-        // 获取工单对应的流程定义
         WorkOrder workOrder = workOrderService.selectWorkOrderById(id);
         if (workOrder == null) {
             return AjaxResult.error("工单不存在");
@@ -117,12 +116,36 @@ public class WorkOrderController extends BaseController {
         if (flowDefinition == null) {
             return AjaxResult.error("未找到对应的流程定义,无法流转工单");
         }
-        if (!workOrder.getReporterId().equals(getUserId())) {
+        if (!workOrderService.checkPermission(workOrder)) {
             return AjaxResult.error("只有工单创建人才能提交工单");
         }
         return toAjax(workOrderService.submitWorkOrder(workOrder, flowDefinition));
     }
 
+    @ApiOperation("修改工单")
+    @PreAuthorize("@ss.hasPermi('workOrder:order:update')")
+    @Log(title = "工单", businessType = BusinessType.UPDATE)
+    @PutMapping("/{id}")
+    public AjaxResult update(@PathVariable("id") Long id, @RequestBody WorkOrderInput workOrderInput) {
+        WorkOrder workOrder = workOrderService.selectWorkOrderById(id);
+        if (workOrder == null) {
+            return AjaxResult.error("工单不存在");
+        }
+        // 检查工单类型是否为空
+        if (workOrderInput.getTicketType() == null || workOrderInput.getTicketType().isEmpty()) {
+            return AjaxResult.error("工单类型不能为空");
+        }
+        // 获取工单对应的流程定义
+        FlowDefinition flowDefinition = workOrderService.getFlowDefinition(workOrderInput.getTicketType());
+        if (flowDefinition == null) {
+            return AjaxResult.error("未找到对应的流程定义,无法流转工单");
+        }
+        if (!workOrderService.checkPermission(workOrder)) {
+            return AjaxResult.error("只有工单创建人才能提交工单");
+        }
+        return toAjax(workOrderService.updateWorkOrder(workOrder, workOrderInput,flowDefinition));
+    }
+
 
     @ApiOperation("查询待办任务列表")
     @PreAuthorize("@ss.hasPermi('workOrder:order:list')")

smart-steward-entity/src/main/java/com/smartSteward/entity/input/work/WorkOrderInput.java

@@ -12,6 +12,8 @@ import lombok.Data;
 @Data
 public class WorkOrderInput {
 
+
+
     /** 工单类型 */
     @ApiModelProperty("工单类型")
     private String ticketType;

smart-steward-service/src/main/java/com/smartSteward/service/work/IWorkOrderService.java

@@ -178,9 +178,11 @@ public interface IWorkOrderService
      * 修改工单
      * 
      * @param workOrder 工单
+     * @param workOrderInput 工单输入参数
+     * @param flowDefinition 工单流程定义
      * @return 结果
      */
-    public int updateWorkOrder(WorkOrder workOrder);
+    public int updateWorkOrder(WorkOrder workOrder, WorkOrderInput workOrderInput, FlowDefinition flowDefinition);
 
     /**
      * 批量删除工单

smart-steward-service/src/main/java/com/smartSteward/service/work/impl/WorkOrderServiceImpl.java

@@ -146,6 +146,42 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
         }
         return insert;
     }
+    /**
+     * 修改工单
+     *
+     * @param workOrder 工单
+     * @return 结果
+     */
+    @Override
+    public int updateWorkOrder(WorkOrder workOrder, WorkOrderInput workOrderInput, FlowDefinition flowDefinition) {
+        workOrder.setTicketType(workOrderInput.getTicketType());
+        workOrder.setStationId(workOrderInput.getStationId());
+        workOrder.setContact(workOrderInput.getContact());
+        workOrder.setPhone(workOrderInput.getPhone());
+        workOrder.setContent(workOrderInput.getContent());
+        workOrder.setAttachments(workOrderInput.getAttachments());
+        workOrder.setUpdateTime(new Date());
+        insertWorkOrderRecord(workOrder.getId(), workOrder.getOrderNo(), WorkOderOperationType.UPDATE.name(),
+                "修改工单", SecurityUtils.getUserId(), SecurityUtils.getUsername());
+        Long userId = SecurityUtils.getUserId();
+        String userName = SecurityUtils.getUsername();
+        int update = workOrderMapper.updateWorkOrder(workOrder);
+        if (update > 0) {
+            //提交工单时，异步处理工作流相关数据
+            if (workOrderInput.getIsSubmit()) {
+                //异步处理工作流相关数据
+                CompletableFuture.supplyAsync(() -> nodeStartProcessing
+                                (flowDefinition, workOrder, userId, userName)).thenAccept(result -> System.out.println("Result: " + result))
+                        .exceptionally(ex -> {
+                            ex.printStackTrace();
+                            log.error("修改工单{}时，处理工作流相关数据异常", workOrder.getOrderNo(), ex);
+                            return null;
+                        });
+
+            }
+        }
+        return workOrderMapper.updateWorkOrder(workOrder);
+    }
 
      /**
      * 提交工单
@@ -721,24 +757,12 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
     public boolean checkPermission(WorkOrder workOrder) {
         // 管理员、工单创建人、工单场站在用户场站列表中，都可以操作工单
         return SecurityUtils.isAdmin(SecurityUtils.getUserId())
-                || workOrder.getReporterId().equals(SecurityUtils.getUsername())
+                || workOrder.getReporterId().equals(SecurityUtils.getUserId())
                 || SecurityUtils.hasStation(workOrder.getStationId());
     }
 
 
-    /**
-     * 修改工单
-     *
-     * @param workOrder 工单
-     * @return 结果
-     */
-    @Override
-    public int updateWorkOrder(WorkOrder workOrder) {
-        workOrder.setUpdateTime(new Date());
-        insertWorkOrderRecord(workOrder.getId(), workOrder.getOrderNo(), WorkOderOperationType.UPDATE.name(),
-                "修改工单", SecurityUtils.getUserId(), SecurityUtils.getUsername());
-        return workOrderMapper.updateWorkOrder(workOrder);
-    }
+
 
     /**
      * 添加工单记录
@@ -916,7 +940,7 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
                         workOrder.setStatus(WorkOrderStatus.PENDING_HANDING.getStatus());
                      insertWorkOrderRecord(workOrder.getId(), workOrder.getOrderNo(), WorkOderOperationType.PROCESS.name(),
                                 "工单进入待办任务"+node.getNodeName(), userId, userName);
-                        nodeIds.append(taskId).append(",");
+                        nodeIds.append(taskId).append(StringUtils.SEPARATORSTR);
                     }
                 }
             } else {
@@ -991,7 +1015,7 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
             String parallelNode = nextNodes.stream()
                     .map(FlowNode::getId)
                     .map(String::valueOf)  // 将Long转换为String
-                    .collect(Collectors.joining(","));
+                    .collect(Collectors.joining(StringUtils.SEPARATORSTR));
             for (FlowNode node : nextNodes) {
                 long taskId= insertWorkOrderTask(workOrder, node,parallelNode);
                 // 工单状态为待处理
@@ -999,7 +1023,7 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
                 workOrder.setStatus(WorkOrderStatus.PENDING_HANDING.getStatus());
                 insertWorkOrderRecord(workOrder.getId(), workOrder.getOrderNo(), WorkOderOperationType.PROCESS.name(),
                         "工单退回至待办任务"+node.getNodeName(), userId, userName);
-                nodeIds.append(taskId).append(",");
+                nodeIds.append(taskId).append(StringUtils.SEPARATORSTR);
             }
         } else {
             // 没有下一个节点，说明流程定义有问题,工单直接完结