凌云集团更改公司

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -276,7 +276,7 @@ public class ScanController {
 //                    }
                     MsTripDet work = msReportMapper.returnWork(userOpen.getUserId());
                     if (work != null) {
-                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime() && !compareWhere(work)) {
+                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime() && !compareWhere(work.getStartMsg(), work.getEndMsg())) {
                             if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                                 model.put("collor", "red");
                                 model.put("collor2", "red");
@@ -285,7 +285,7 @@ public class ScanController {
                                 scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                                 return new ModelAndView("/user/scan.ftl", model);
                             }
-                        } else if (!ly2 && !compareWhere(work))  {
+                        } else if (!ly2 && !compareWhere(work.getStartMsg(), work.getEndMsg()))  {
                             if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                                 model.put("collor", "red");
                                 model.put("collor2", "red");
@@ -297,7 +297,7 @@ public class ScanController {
                         }
                     }
                     MsReport msReport1 = msReportMapper.msAddr(userOpen.getUserId());
-                    if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg())) {
+                    if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不许进入");
@@ -724,7 +724,7 @@ public class ScanController {
 //            }
             MsTripDet work = msReportMapper.returnWork(userId);
             if (work != null) {
-                if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime() && !compareWhere(work)) {
+                if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime() && !compareWhere(work.getStartMsg(), work.getEndMsg())) {
                     if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
@@ -732,7 +732,7 @@ public class ScanController {
                         model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。" + day15(s.parse(work.getReturnWork())) + "起方可进入！");
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
-                } else if (!ly2 && !compareWhere(work))  {
+                } else if (!ly2 && !compareWhere(work.getStartMsg(), work.getEndMsg()))  {
                     if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
@@ -743,7 +743,7 @@ public class ScanController {
                 }
             }
             MsReport msReport1 = msReportMapper.msAddr(userId);
-            if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg())) {
+            if (msReport1 != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
                 model.put("collor", "red");
                 model.put("collor2", "red");
                 model.put("into", "不可复工");
@@ -892,13 +892,11 @@ public class ScanController {
     }
 
     /**
-     * 比较出发地和目地地是否一样
-     * @param m
-     * @return
+     * 比较出发地和目地地是否一样, 一样返回true,不一样返回false
      */
-    public Boolean compareWhere(MsTripDet m) {
+    public Boolean compareWhere(String str1, String str2) {
         Boolean type = false;
-        if ((m.getStartMsg().equals("2") || m.getStartMsg().equals("3")) && (m.getEndMsg().equals("2") || m.getEndMsg().equals("3"))) {
+        if ((str1.equals("2") || str1.equals("3")) && (str2.equals("2") || str2.equals("3"))) {
             type = true;
         }
         return type;