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