打卡上报增加经纬度

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -258,4 +258,8 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     @Select("SELECT * FROM ms_report where user_create = #{userId} and report_date > date_sub(curdate(),interval 2 day) " +
             "and longitude != \"\" and latitude !=\"\" order by report_date desc")
     List<MsReport> selectLatelyLocal(@Param("userId") Long userId);
+
+    @Select("SELECT * FROM ms_report where user_create = #{userId} and report_date > date_sub(#{time},interval 2 day) and report_date <= #{time}" +
+            "and longitude != \"\" and latitude !=\"\" order by report_date desc")
+    List<MsReport> selectLatelyLocalDetails(@Param("time") String time, @Param("userId") Long userId);
 }

whepi-web/src/main/java/com/bofeng/service/SweepCodeService.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -209,7 +210,8 @@ public class SweepCodeService {
                     excelRiBaoLYBM4.setTripDetDesc(tripDet.substring(0, tripDet.length() - 1));
                 }
                 // 昨天定位和今天定位是否2公里
-                List<MsReport> msReports = msReportMapper.selectLatelyLocal(excelRiBaoLYBM4.getUserId());
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                List<MsReport> msReports = msReportMapper.selectLatelyLocalDetails(sdf.format(excelRiBaoLYBM4.getReportDate()), excelRiBaoLYBM4.getUserId());
                 if (msReports.size() == 2) {
                     Double dis = scanService.getDistance(Double.parseDouble(msReports.get(1).getLongitude()),Double.parseDouble(msReports.get(1).getLatitude()),Double.parseDouble(msReports.get(0).getLongitude()), Double.parseDouble(msReports.get(0).getLatitude()));
                     if (dis <= 2000) {