BASE

gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java

@@ -259,10 +259,17 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
     public PageInfo<TWorkOrder> selectWaitingWorkOrder(String userId,Integer type,String searchStr,Integer waitingtype){
         List<TWorkOrder> workOrderList = tWorkOrderMapper.selectWaitingWorkOrder(userId,type,searchStr,waitingtype);
         for(TWorkOrder t :workOrderList){
-            if(t.getOrderType().equals('3')){
+            if(t.getOrderType().equals("3")){
                 String address = tDeviceAlarmMapper.selectAddressByOrderId(t.getOrderId());
                 t.setAddress(address);
             }
+            if(t.getOrderType().equals("1")){
+                t.setLatitude(tInspectionDataMapper.selectFinishTInspectionData(t.getResourceId())+"");
+                TInspectionPlan plan = tInspectionPlanMapper.selectTInspectionPlanById(t.getResourceId());
+                if(plan!=null){
+                    t.setLongitude((plan.getDeviceIds().split(",").length/2)+"");
+                }
+            }
         }
         PageInfo<TWorkOrder> pageInfo = new PageInfo<>(workOrderList);
         return pageInfo;