弱轨迹调整提交(标准)

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java

@@ -296,7 +296,8 @@ public class SkTrailController extends ApiController implements ExcelControllerI
                 listMapMd = new ArrayList<>(valueResult1.entrySet());
                 listMapMd = (ArrayList<Map.Entry<String,Object>>)listMapMd.stream().parallel()
                         .limit(1).collect(Collectors.toList());
-                String lastGj = "";// 日期为空 展示暂无数据
+                String lastGjCfd = "";// 日期为空 展示暂无数据
+                String lastGjMdd = "";// 日期为空 展示暂无数据
                 String lastCfd = "";// 数据为空 展示暂无数据
                 String lastMdd = "";// 数据为空 展示暂无数据
                 String lastCfdx = "";// 出发地经度
@@ -308,9 +309,11 @@ public class SkTrailController extends ApiController implements ExcelControllerI
                 String lastGjMddx = "";// 目的地经度
                 String lastGjMddy = "";// 目的地纬度
                 if((StringUtil.isEmpty(records.get(0).getDate())||StringUtil.isEmpty(records.get(1).getAddress()))&&"jdgj".equals(sktrailParam.getLikeField())){
-                    lastGj = "暂无数据";
+                    lastGjCfd = "暂无数据";
+                    lastGjMdd = "暂无数据";
                 }else{
-                    lastGj = records.get(0).getAddress()+"—>"+records.get(1).getAddress()+"("+records.get(0).getDate()+")";
+                    lastGjCfd = records.get(0).getAddress()+"("+records.get(0).getDate()+")";
+                    lastGjMdd = records.get(1).getAddress()+"("+records.get(1).getDate()+")";
                     lastGjCfdx = records.get(0).getX();
                     lastGjCfdy = records.get(0).getY();
                     lastGjMddx = records.get(1).getX();
@@ -338,7 +341,8 @@ public class SkTrailController extends ApiController implements ExcelControllerI
                         }
                     }
                 }
-                mapResult.put("zxgj",lastGj);// 最后两条数据即为  最新轨迹
+                mapResult.put("zxgjCfd",lastGjCfd);// 最后两条数据即为  最新轨迹
+                mapResult.put("zxgjMdd",lastGjMdd);
                 mapResult.put("sfdd",lastCfd);
                 mapResult.put("mddd",lastMdd);
                 mapResult.put("sfddx",lastCfdx);