修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -336,7 +336,7 @@ public class WorkOrderManageController {
             @ApiParam(value = "页数", required = true)@RequestParam Integer pageNum,
             @ApiParam(value = "条数", required = true)@RequestParam Integer pageSize,
             @ApiParam(value = "状态(0:事件隐患;null:所有工单;1:执行中;2:完成)", required = false) @RequestParam(required = false) Integer orderStatus,
-            @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水)", required = false) @RequestParam(required = false) Integer orderTypeId,
+            @ApiParam(value = "工单类型(1表务、2停通水、3抢修、4漏点定位、5测漏、6违章跑水、10压力调度)", required = false) @RequestParam(required = false) Integer orderTypeId,
             @ApiParam(value = "事件类型(1:运维上报,2:用户上报,3:设备告警)", required = false) @RequestParam(required = false) Integer eventType,
             @ApiParam(value = "单号", required = false) @RequestParam(required = false) String taskNo,
             @ApiParam(value = "计划起始日期(yyyy-MM-dd)", required = false) @RequestParam(required = false) String startDate,

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -667,7 +667,7 @@
 
   <!--查询工单派单时的用户状态-->
    <select id="selectOrderUserStatus" parameterType="java.lang.String" resultType="map">
-      SELECT X, Y,
+      SELECT DISTINCT X, Y,
        CASE WHEN S IS NULL THEN '空闲' WHEN S='0' THEN '空闲' ELSE '执行中' END S ,
        CASE WHEN offlinetime IS NULL THEN '离线' WHEN offlinetime>10 THEN '离线' WHEN offlinetime &lt;= 10 THEN '在线' END L
        FROM
@@ -700,7 +700,7 @@
 
   <!--查询维修列表的用户状态-->
   <select id="selectMaintainUserStatus" parameterType="java.lang.String" resultType="map">
-    select X, Y,
+    select distinct X, Y,
     case when offlinetime is null then '离线' when offlinetime>10 then '离线' when offlinetime &lt;= 10 THEN '在线' END L
     from (
         select longtitude X, latitude Y, TIMESTAMPDIFF(second,upload_date, now()) offlinetime from sc_gps_data
@@ -708,7 +708,6 @@
     ) a
   </select>
 
-
   <!--待处理权限-->
   <select id="selectPendingPower" resultType="java.lang.Integer" parameterType="map">
     select count(1) from sc_work_order_manage