Merge remote-tracking branch 'origin/master'

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

@@ -204,21 +204,21 @@ public class MsReportService {
                     return 2;
 
                 //如果是凌云，判断出行是否填写异常
-                // UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
-                // if (unit != null) {
-                //     if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
-                //         //上一天的上报记录.3天内
-                //         List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
-                //         if (listSuspected1 != null && listSuspected1.size() == 1) {
-                //             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;
-                //                 }
-                //             }
-                //         }
-                //
-                //     }
-                // }
+                UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
+                if (unit != null) {
+                    if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+                        //上一天的上报记录.3天内
+                        List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
+                        if (listSuspected1 != null && listSuspected1.size() == 1) {
+                            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,14 +239,14 @@ public class MsReportService {
         MsTrip msTrip = msTripMapper.selectById(suspectedId);
         if (msTrip != null) {
             //上一天的上报记录.3天内
-            // List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
-            // if (listSuspected1 != null && listSuspected1.size() == 1) {
-            //     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;
-            //         }
-            //     }
-            // }
+            List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
+            if (listSuspected1 != null && listSuspected1.size() == 1) {
+                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;
+                    }
+                }
+            }
             MsReport msReport = msReportMapper.selectById(reportId);
             if (msReport != null) {
                 msReport.setReportStatus(1);