任务关联

smart-steward-common/src/main/java/com/smartSteward/common/enums/work/WorkOrderButtonEnum.java

@@ -13,10 +13,6 @@ public enum WorkOrderButtonEnum {
      */
     HANDLE("handle", "处理"),
     /**
-     * 接单
-     */
-    ACCEPT("accept", "接单"),
-    /**
      * 延时
      */
     DELAY("delay", "延时"),

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

@@ -79,5 +79,9 @@ public class WorkOrderTask extends BaseEntity
     @ApiModelProperty("删除标识")
     private String delFlag;
 
+    /** 用户id */
+    @ApiModelProperty("用户id")
+    private String userId;
+
 
 }

smart-steward-mapper/src/main/java/com/smartSteward/mapper/work/WorkOrderTaskMapper.java

@@ -48,7 +48,7 @@ public interface WorkOrderTaskMapper
      * @param workOrderTask 工单待办任务
      * @return 工单待办任务集合
      */
-    public List<WorkOrderTask> selectWorkOrderMyTaskList(WorkOrderTask workOrderTask,@Param("userId") String userId);
+    public List<WorkOrderTask> selectWorkOrderMyTaskList( WorkOrderTask workOrderTask);
 
      /**
      * 查询用户已办工单任务列表
@@ -56,7 +56,7 @@ public interface WorkOrderTaskMapper
      * @param workOrderTask 工单待办任务
      * @return 工单待办任务集合
      */
-    public List<WorkOrderTask> selectWorkOrderMyOverTaskList(WorkOrderTask workOrderTask,@Param("userId") String userId);
+    public List<WorkOrderTask> selectWorkOrderMyOverTaskList(WorkOrderTask workOrderTask);
 
 
 

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

@@ -29,14 +29,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectWorkOrderMyTaskVo">
         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
+       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, 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
+       button,ticket_type,parallel_node from work_order_task t
         inner join  work_task_over_user u on t.task_id=u.task_id
     </sql>
 
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectWorkOrderCcTaskVo">
         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
+         button,ticket_type,parallel_node from work_order_task t
         inner join  work_task_cc_user u on t.task_id=u.task_id
     </sql>
 
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectWorkOrderMyTaskList" parameterType="WorkOrderTask" resultMap="WorkOrderTaskResult">
-        <include refid="selectWorkOrderTaskVo"/>
+        <include refid="selectWorkOrderMyTaskVo"/>
         <where>
             <if test="orderId != null "> and order_id = #{orderId}</if>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
@@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectWorkOrderMyOverTaskList" parameterType="WorkOrderTask" resultMap="WorkOrderTaskResult">
-        <include refid="selectWorkOrderMyOverTaskVo"/>
+        <include refid="selectWorkOrderMyTaskVo"/>
         <where>
             <if test="orderId != null "> and order_id = #{orderId}</if>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>

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

@@ -143,7 +143,8 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
      */
     @Override
     public List<WorkOrderTask> listPending(WorkOrderTask task) {
-        return workOrderTaskMapper.selectWorkOrderMyTaskList(task, SecurityUtils.getUserId().toString());
+        task.setUserId(SecurityUtils.getUserId().toString());
+        return workOrderTaskMapper.selectWorkOrderMyTaskList(task);
     }
 
     /**
@@ -154,7 +155,8 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
      */
     @Override
     public List<WorkOrderTask> listOver(WorkOrderTask task) {
-        return workOrderTaskMapper.selectWorkOrderMyOverTaskList(task, SecurityUtils.getUserId().toString());
+        task.setUserId(SecurityUtils.getUserId().toString());
+        return workOrderTaskMapper.selectWorkOrderMyOverTaskList(task);
     }
 
 
@@ -541,13 +543,14 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
                 if (StringUtils.isNotEmpty(buttonValues)) {
                     //判断按钮中是否有处理按钮
                     String [] buttons = buttonValues.split(StringUtils.SEPARATORSTR);
+                    if (Arrays.asList(buttons).contains(WorkOrderButtonEnum.CC.getButton())) {
+                        //去除抄送按钮
+                        buttons = Arrays.stream(buttons).filter(button ->
+                                !button.equals(WorkOrderButtonEnum.CC.getButton())).toArray(String[]::new);
+                    }
                     //合并去重
                    String button =CollUtil.strListToStr(Arrays.asList(Arrays.stream(buttons).distinct().toArray(String[]::new)),StringUtils.SEPARATORSTR);
-                    if (button.contains(WorkOrderButtonEnum.HANDLE.getButton())) {
-                        //将处理按钮改为接单按钮
-                        button = button.replace(WorkOrderButtonEnum.HANDLE.getButton(),
-                                WorkOrderButtonEnum.ACCEPT.getButton());
-                    }
+
                     workOrderTask.setButton(button);
                 }
             }