凌云集团更改公司

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

@@ -169,10 +169,10 @@ public class ScanService {
 //                            }
 //                        }
 //                    }
-                    MsReport msReport1 = msReportMapper.msAddr(opens.get(i).getUserId());
-                    if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
-                        continue;
-                    }
+//                    MsReport msReport1 = msReportMapper.msAddr(opens.get(i).getUserId());
+//                    if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
+//                        continue;
+//                    }
                     r.setRwId(IdWorker.getId());
                     r.setUserId(opens.get(i).getUserId());
                     r.setTimeCreate(new DateTime());
@@ -247,10 +247,10 @@ public class ScanService {
 //                }
 //            }
 //        }
-        MsReport msReport1 = msReportMapper.msAddr(userId);
-        if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
-            return 0;
-        }
+//        MsReport msReport1 = msReportMapper.msAddr(userId);
+//        if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
+//            return 0;
+//        }
         return 1;
     }
 

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

@@ -272,15 +272,15 @@ 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);
 //                    }
-                    MsReport msReport1 = msReportMapper.msAddr(userOpen.getUserId());
-                    if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
-                        model.put("collor", "red");
-                        model.put("collor2", "red");
-                        model.put("into", "不许进入");
-                        model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
-                        scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
-                        return new ModelAndView("/user/scan.ftl", model);
-                    }
+//                    MsReport msReport1 = msReportMapper.msAddr(userOpen.getUserId());
+//                    if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
+//                        model.put("collor", "red");
+//                        model.put("collor2", "red");
+//                        model.put("into", "不许进入");
+//                        model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
+//                        scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+//                        return new ModelAndView("/user/scan.ftl", model);
+//                    }
 //                    MsTripDet work = msReportMapper.returnWork(userOpen.getUserId());
 //                    if (work != null) {
 //                        if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
@@ -737,14 +737,14 @@ public class ScanController {
 //                model.put("errorMsg", "由于最近30天您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
 //                return new ModelAndView("/user/returnWork.ftl", model);
 //            }
-            MsReport msReport1 = msReportMapper.msAddr(userId);
-            if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
-                model.put("collor", "red");
-                model.put("collor2", "red");
-                model.put("into", "不可复工");
-                model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
-                return new ModelAndView("/user/returnWork.ftl", model);
-            }
+//            MsReport msReport1 = msReportMapper.msAddr(userId);
+//            if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
+//                model.put("collor", "red");
+//                model.put("collor2", "red");
+//                model.put("into", "不可复工");
+//                model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
+//                return new ModelAndView("/user/returnWork.ftl", model);
+//            }
 //            MsTripDet work = msReportMapper.returnWork(userId);
 //            if (work != null) {
 //                if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {