全景看看

src/main/java/com/fdkankan/manage/controller/OverallController.java

@@ -135,13 +135,14 @@ public class OverallController {
                     obj.put("addressComponent",commonService.getAddressComponent(ext.getGps()));
                     obj.put("shootCount",ext.getShootCount());
                     obj.put("computeTime",ext.getComputeTime());
+                    obj.put("calcStatus",scenePlus.getSceneStatus() == -2 ? 1 : scenePlus.getSceneStatus());
                 }
             }
             obj.put("statusString", SceneStatusUtil.getOverallStatusString(obj.getInteger("payStatus"),obj.getInteger("calcStatus")));
 
             if(mqSendLogMap!=null){
                 MqSendLog mqSendLog = mqSendLogMap.get(num);
-                if(mqSendLog != null && obj.getInteger("calcStatus") != 1){
+                if(mqSendLog != null && obj.getInteger("calcStatus") == 0){
                     obj.put("statusString","排队中");
                     obj.put("calcStatus",-4);
                 }