xielianghe

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

@@ -208,7 +208,7 @@ public class MsReportService {
                         //上一天的上报记录.3天内
                         List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
                         if (listSuspected1 != null && listSuspected1.size() == 1) {
-                            if (listSuspected1.get(0).getTodayLocal() != null && msSuspected.getTodayLocal() != null && listSuspected1.get(0).getTodayLocal() != 0 && msSuspected.getTodayLocal() != 0) {
+                            if (listSuspected1.get(0).getTodayLocal() != null && msSuspected.getTodayLocal() != null && msSuspected.getIsTrip() != null && listSuspected1.get(0).getTodayLocal() != 0 && msSuspected.getTodayLocal() != 0) {
                                 if (listSuspected1.get(0).getTodayLocalOther() != msSuspected.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msSuspected.getTodayLocal() && msSuspected.getIsTrip() == 0) {
                                     return 4;
                                 }
@@ -239,7 +239,7 @@ public class MsReportService {
             //上一天的上报记录.3天内
             List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
             if (listSuspected1 != null && listSuspected1.size() == 1) {
-                if (listSuspected1.get(0).getTodayLocal() != null && msTrip.getTodayLocal() != null && listSuspected1.get(0).getTodayLocal() != 0 && msTrip.getTodayLocal() != 0) {
+                if (listSuspected1.get(0).getTodayLocal() != null && msTrip.getTodayLocal() != null && msTrip.getIsTrip() != null && listSuspected1.get(0).getTodayLocal() != 0 && msTrip.getTodayLocal() != 0) {
                     if (listSuspected1.get(0).getTodayLocalOther() != msTrip.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msTrip.getTodayLocal() && msTrip.getIsTrip() == 0) {
                         return 4;
                     }