Browse Source

合并代码

wangbo 4 years ago
parent
commit
cc6e561143

+ 20 - 0
operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -531,6 +531,26 @@ public class WorkOrderManageController {
         }
         return new AjaxMessage<>(ResultStatus.OK,result);
     }
+
+
+    @GetMapping("/pending/power")
+    @ApiOperation(value = "待处理权限")
+    public AjaxMessage<Boolean> selectPendingPower(
+            @ApiParam(value = "工单ID", required = true) @RequestParam(required = true) Integer id){
+        String currentUsers = null;
+        LoginUser loginUser = UserUtil.getCurrentUser();
+        if(loginUser.getId() != null) {
+            currentUsers = String.format("%s,", loginUser.getId());
+        }
+        Map<String,Object> map = new HashMap<String,Object>();
+        map.put("id",id);
+        map.put("currentUsers",currentUsers);
+        int rows = workOrderManageService.selectPendingPower(map);
+        if(rows>0){
+            return new AjaxMessage<Boolean>(ResultStatus.OK, true);
+        }
+        return new AjaxMessage<Boolean>(ResultStatus.OK, false);
+    }
     /**
      * 获取并设置用户、任务工单类型名称
      * @param result

+ 5 - 0
operation_manager/src/main/java/com/huaxu/order/dao/WorkOrderManageMapper.java

@@ -40,4 +40,9 @@ public interface WorkOrderManageMapper {
     List<WorkOrderManage> selectByPId(Map<String,Object> map);
 
     Map<String,Object> selectOrderUserStatus(@Param("userId") String userId);
+
+    /**
+     * 待处理权限
+     */
+    int selectPendingPower(Map<String,Object> map);
 }

+ 5 - 0
operation_manager/src/main/java/com/huaxu/order/service/WorkOrderManageService.java

@@ -71,4 +71,9 @@ public interface WorkOrderManageService {
      *查询派单时的用户状态
      */
     Map<String,Object> selectOrderUserStatus(@Param("userId") String userId);
+
+    /**
+     * 待处理权限
+     */
+    int selectPendingPower(Map<String,Object> map);
 }

+ 5 - 0
operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -113,4 +113,9 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
         return workOrderManageMapper.selectOrderUserStatus(userId);
     }
 
+    @Override
+    public int selectPendingPower(Map<String, Object> map) {
+        return workOrderManageMapper.selectPendingPower(map);
+    }
+
 }

+ 0 - 1
operation_manager/src/main/resources/mapper/order/WorkFlowDetailMapper.xml

@@ -147,5 +147,4 @@
     from sc_work_flow_detail
     where flow_id= #{flowId} and flow_type=#{flowType}
   </select>
-
 </mapper>

+ 6 - 0
operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -613,4 +613,10 @@
       on a.order_user_id=b.order_user_id
       where a.order_user_id= #{userId,jdbcType=INTEGER}
   </select>
+
+  <!--待处理权限-->
+  <select id="selectPendingPower" resultType="java.lang.Integer" parameterType="map">
+    select count(1) from sc_work_order_manage
+    where id = #{id,jdbcType=INTEGER} and INSTR(current_users,#{currentUsers,jdbcType=VARCHAR})
+  </select>
 </mapper>