修改记录上报日志

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

@@ -163,19 +163,6 @@ public class MsTripService {
             msSuspected.setTimeUpdate(DateTime.now());
             msSuspectedMapper.insert(msSuspected);
 
-            // 记录打卡日志
-            MsReportLog msReportLog = new MsReportLog();
-            msReportLog.setLogId(IdWorker.getId());
-            msReportLog.setReportId(reportId);
-            msReportLog.setUserId(userCreate);
-            msReportLog.setReportDate(data.toDate());
-            msReportLog.setLongitude(longitude);
-            msReportLog.setLatitude(latitude);
-            msReportLog.setCity(autoLocal);
-            msReportLog.setAddr(autoAddr);
-            msReportLog.setTimeCreate(data);
-            msReportLogMapper.insert(msReportLog);
-
             //添加出行
             if (todayLocal >= 0 && workLocal >= 0) {
                 MsTrip msTrip = new MsTrip();
@@ -321,6 +308,19 @@ public class MsTripService {
             //修改上报状态
             msReportService.editReportLy(reportId, userCreate);
         }
+
+        // 记录上报日志
+        MsReportLog msReportLog = new MsReportLog();
+        msReportLog.setLogId(IdWorker.getId());
+        msReportLog.setReportId(reportId);
+        msReportLog.setUserId(userCreate);
+        msReportLog.setReportDate(data.toDate());
+        msReportLog.setLongitude(longitude);
+        msReportLog.setLatitude(latitude);
+        msReportLog.setCity(autoLocal);
+        msReportLog.setAddr(autoAddr);
+        msReportLog.setTimeCreate(data);
+        msReportLogMapper.insert(msReportLog);
         return reportId;
     }