|
@@ -89,7 +89,7 @@ public class SweepCodeService {
|
|
|
// 复工
|
|
|
excelRiBaoLYBM4.setReturnWork(scanService.returnWorkLYlist(excelRiBaoLYBM4.getUserId(), excelRiBaoLYBM4.getLinkman(), excelRiBaoLYBM4.getPhone()));
|
|
|
// 昨天定位和今天定位是否2公里
|
|
|
- List<MsReport> msReports = msReportMapper.selectLatelyLocal(userId);
|
|
|
+ List<MsReport> msReports = msReportMapper.selectLatelyLocal(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) {
|
|
@@ -209,7 +209,7 @@ public class SweepCodeService {
|
|
|
excelRiBaoLYBM4.setTripDetDesc(tripDet.substring(0, tripDet.length() - 1));
|
|
|
}
|
|
|
// 昨天定位和今天定位是否2公里
|
|
|
- List<MsReport> msReports = msReportMapper.selectLatelyLocal(userId);
|
|
|
+ List<MsReport> msReports = msReportMapper.selectLatelyLocal(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) {
|
|
@@ -277,7 +277,7 @@ public class SweepCodeService {
|
|
|
}
|
|
|
}
|
|
|
// 昨天定位和今天定位是否2公里
|
|
|
- List<MsReport> msReports = msReportMapper.selectLatelyLocal(userId);
|
|
|
+ List<MsReport> msReports = msReportMapper.selectLatelyLocal(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) {
|