处理工单

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

@@ -196,16 +196,31 @@ public class WorkOrderController extends BaseController {
     }
 
 
-    @ApiOperation("修改工单")
-    @PreAuthorize("@ss.hasPermi('workOrder:order:edit')")
+    @ApiOperation("退回工单")
+    @PreAuthorize("@ss.hasPermi('workOrder:order:return')")
     @Log(title = "工单", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody WorkOrder workOrder) {
-        // 检查工单权限
-        if (!workOrderService.checkPermission(workOrder)) {
-            return AjaxResult.error("您没有权限操作该工单");
+    @PutMapping("/return/{taskId}")
+    public AjaxResult edit(@PathVariable Long taskId) {
+        // 查询工单任务详情
+        WorkOrderTask taskDetail = workOrderService.getWorkOrderTask(taskId);
+        if (taskDetail == null) {
+            return AjaxResult.error("工单任务不存在");
+        }
+        // 检查工单任务是否是处理中状态
+        if (!taskDetail.getStatus().equals(WorkTaskStatus.PROCESSING.getStatus())) {
+            return AjaxResult.error("工单任务不是处理中状态,无法退回");
+        }
+        // 查询工单任务与用户关联列表
+        List<WorkTaskUser> taskUserList = workOrderService.getWorkTaskUserList(taskId);
+        if (taskUserList == null || taskUserList.isEmpty()) {
+            return AjaxResult.error("工单任务未分配用户,无法退回");
+        } else {
+            // 检查用户是否有处理该任务的权限
+            if (!workOrderService.checkTaskPermission(taskUserList)) {
+                return AjaxResult.error("您不是工单任务的处理人,无法退回");
+            }
         }
-        return toAjax(workOrderService.updateWorkOrder(workOrder));
+        return toAjax(workOrderService.returnWorkOrder(taskDetail));
     }
 
 

smart-steward-entity/src/main/java/com/smartSteward/entity/database/work/WorkOrderTask.java

@@ -39,10 +39,10 @@ public class WorkOrderTask extends BaseEntity
     @ApiModelProperty("工单类型")
     private String ticketType;
 
-    /** 承接状态：0-待处理，1-已接单，2-已完成 */
+    /** 状态：0-待处理，1-已接单，2-已完成 */
     @Excel(name = "状态")
     @ApiModelProperty("状态：0-待处理，1-处理中，2-已处理")
-    private Long acceptStatus;
+    private Long  Status;
 
     /** 要求完成时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

smart-steward-mapper/src/main/resources/mapper/work/WorkOrderTaskMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskId"    column="task_id"    />
         <result property="orderId"    column="order_id"    />
         <result property="orderNo"    column="order_no"    />
-        <result property="acceptStatus"    column="accept_status"    />
+        <result property="status"    column="status"    />
         <result property="expectedCompleteTime"    column="expected_complete_time"    />
         <result property="attachments"    column="attachments"    />
         <result property="remark"    column="remark"    />
@@ -21,20 +21,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWorkOrderTaskVo">
-        select task_id, order_id, order_no, accept_status,  expected_complete_time,
+        select task_id, order_id, order_no, status,  expected_complete_time,
         attachments, remark, create_time, current_node, station_id,
         button,ticket_type,parallel_node from work_order_task
     </sql>
 
     <sql id="selectWorkOrderMyTaskVo">
-        select t.task_id, order_id, order_no, accept_status,
+        select t.task_id, order_id, order_no, status,
         expected_complete_time, attachments, remark, create_time, current_node, station_id,
         accept_orders_user, button,ticket_type,parallel_node from work_order_task t
         inner join  work_task_user u on t.task_id=u.task_id
     </sql>
 
     <sql id="selectWorkOrderMyOverTaskVo">
-        select t.task_id, order_id, order_no, accept_status,
+        select t.task_id, order_id, order_no, status,
         expected_complete_time, attachments, remark, create_time, current_node, station_id,
         accept_orders_user, button,ticket_type,parallel_node from work_order_task t
         inner join  work_task_over_user u on t.task_id=u.task_id
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="orderId != null "> and order_id = #{orderId}</if>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
-            <if test="acceptStatus != null "> and accept_status = #{acceptStatus}</if>
+            <if test="status != null "> and status = #{status}</if>
             <if test="expectedCompleteTime != null "> and expected_complete_time = #{expectedCompleteTime}</if>
             <if test="attachments != null  and attachments != ''"> and attachments = #{attachments}</if>
             <if test="currentNode != null "> and current_node = #{currentNode}</if>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="orderId != null "> and order_id = #{orderId}</if>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
-            <if test="acceptStatus != null "> and accept_status = #{acceptStatus}</if>
+            <if test="status != null "> and status = #{status}</if>
             <if test="expectedCompleteTime != null "> and expected_complete_time = #{expectedCompleteTime}</if>
             <if test="attachments != null  and attachments != ''"> and attachments = #{attachments}</if>
             <if test="currentNode != null "> and current_node = #{currentNode}</if>
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="orderId != null "> and order_id = #{orderId}</if>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
-            <if test="acceptStatus != null "> and accept_status = #{acceptStatus}</if>
+            <if test="status != null "> and status = #{status}</if>
             <if test="expectedCompleteTime != null "> and expected_complete_time = #{expectedCompleteTime}</if>
             <if test="attachments != null  and attachments != ''"> and attachments = #{attachments}</if>
             <if test="currentNode != null "> and current_node = #{currentNode}</if>
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderId != null">order_id,</if>
             <if test="orderNo != null and orderNo != ''">order_no,</if>
-            <if test="acceptStatus != null">accept_status,</if>
+            <if test="status != null">status,</if>
             <if test="expectedCompleteTime != null">expected_complete_time,</if>
             <if test="attachments != null">attachments,</if>
             <if test="remark != null">remark,</if>
@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">#{orderId},</if>
             <if test="orderNo != null and orderNo != ''">#{orderNo},</if>
-            <if test="acceptStatus != null">#{acceptStatus},</if>
+            <if test="status != null">#{status},</if>
             <if test="expectedCompleteTime != null">#{expectedCompleteTime},</if>
             <if test="attachments != null">#{attachments},</if>
             <if test="remark != null">#{remark},</if>
@@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="orderId != null">order_id = #{orderId},</if>
             <if test="orderNo != null and orderNo != ''">order_no = #{orderNo},</if>
-            <if test="acceptStatus != null">accept_status = #{acceptStatus},</if>
+            <if test="status != null">status = #{status},</if>
             <if test="expectedCompleteTime != null">expected_complete_time = #{expectedCompleteTime},</if>
             <if test="attachments != null">attachments = #{attachments},</if>
             <if test="remark != null">remark = #{remark},</if>

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

@@ -419,8 +419,8 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
         WorkOrderTask workOrderTask = new WorkOrderTask();
         workOrderTask.setOrderId(workOrder.getId());
         workOrderTask.setOrderNo(workOrder.getOrderNo());
-        //新任务，默认状态为待接单
-        workOrderTask.setAcceptStatus(0L);
+        //新任务，默认状态为待处理
+        workOrderTask.setStatus(WorkTaskStatus.PENDING.getStatus());
         workOrderTask.setCreateTime(new Date());
         //当前节点id
         workOrderTask.setCurrentNode(node.getId());
@@ -681,7 +681,7 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
                 .orElse(null);
         if (currentNode == null) {
             // 当前任务改为已处理
-            taskDetail.setAcceptStatus(WorkTaskStatus.COMPLETED.getStatus());
+            taskDetail.setStatus(WorkTaskStatus.COMPLETED.getStatus());
             //查找不到当前节点，说明流程定义有问题,工单直接完结
             workOrder.setStatus(WorkOrderStatus.COMPLETED.getStatus());
             insertWorkOrderRecord(workOrder.getId(), workOrder.getOrderNo(), WorkOderOperationType.COMPLETE.name(),
@@ -694,14 +694,14 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
         boolean isEnterNextNode = false;
         if (CooperateType.isOrSign(nodeRatio)) {
             // 或签节点当前任务改为已处理
-            taskDetail.setAcceptStatus(WorkTaskStatus.COMPLETED.getStatus());
+            taskDetail.setStatus(WorkTaskStatus.COMPLETED.getStatus());
             isEnterNextNode=true;
         } else
         {
             // 会签或票签节点判断处理人比例是否大于等于签署比例
             if (getCurrentTaskRatio(taskDetail.getTaskId(),nodeRatio)) {
                 // 当前任务办理比例大于等于会签比例，当前任务改为已处理
-                taskDetail.setAcceptStatus(WorkTaskStatus.COMPLETED.getStatus());
+                taskDetail.setStatus(WorkTaskStatus.COMPLETED.getStatus());
                 isEnterNextNode=true;
             }
         }
@@ -718,8 +718,9 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
             //判断除当前任务外其他任务是否已办理
               allProcessed = parallelTasks.stream()
                     .filter(t -> !t.getTaskId().equals(taskDetail.getTaskId()))
-                    .allMatch(t -> WorkTaskStatus.COMPLETED.getStatus().equals(t.getAcceptStatus()));
+                    .allMatch(t -> WorkTaskStatus.COMPLETED.getStatus().equals(t.getStatus()));
         }
+
         if (allProcessed&&isEnterNextNode)
         {
             // 所有并行分支都已办理，并且当前节点也已经处理
@@ -727,6 +728,7 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
             // 获取下一个节点
             List<FlowNode> nextNodes = flowNodeService.getNextNodeList(currentNode,
                     null, null, pathWayData);
+            StringBuilder nodeIds = new StringBuilder();
             if (CollUtil.isNotEmpty(nextNodes)) {
                 //将当前节点下个节点id用逗号隔开组成字符串
                 String parallelNode = nextNodes.stream()
@@ -741,11 +743,12 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
                                 "流程结束,工单完结", userId, userName);
                         return workOrderMapper.updateWorkOrder(workOrder);
                     } else {
-                        insertWorkOrderTask(workOrder, node,parallelNode);
+                        long taskId= insertWorkOrderTask(workOrder, node,parallelNode);
                         // 流程中间节点，工单状态为待处理
                         workOrder.setStatus(WorkOrderStatus.PENDING_HANDING.getStatus());
-                        insertWorkOrderRecord(workOrder.getId(), workOrder.getOrderNo(), WorkOderOperationType.PROCESS.name(),
+                     insertWorkOrderRecord(workOrder.getId(), workOrder.getOrderNo(), WorkOderOperationType.PROCESS.name(),
                                 "工单进入待办任务", userId, userName);
+                        nodeIds.append(taskId).append(",");
                     }
                 }
             } else {
@@ -755,12 +758,11 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
                 insertWorkOrderRecord(workOrder.getId(), workOrder.getOrderNo(), WorkOderOperationType.COMPLETE.name(),
                         "未找到流程定义节点，请设置正确的流程定义，该工单直接完结", userId, userName);
             }
-        }
-        else
-        {
-            // 等待其他并行节点或当前节点处理完成
-
-
+            // 去掉最后一个逗号
+            if (nodeIds.length() > 0) {
+                nodeIds.setLength(nodeIds.length() - 1);
+                workOrder.setNodeId(nodeIds.toString());
+            }
         }
         //更新当前任务
         workOrderTaskMapper.updateWorkOrderTask(taskDetail);