扫码撤回"您本人不在工作驻地，不能入场复工。"

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()) {