凌云集团更改公司

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

@@ -237,15 +237,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);
                     }
-                    List<MsReport> msReports3 = msReportMapper.selectMsReportThirtyError(userOpen.getUserId());
-                    if (msReports3.size() > 0) {
-                        model.put("collor", "red");
-                        model.put("collor2", "red");
-                        model.put("into", "不许进入");
-                        model.put("errorMsg", "由于最近30天您健康评估存在问题，不许进入，如有疑问请联系直管领导。");
-                        scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
-                        return new ModelAndView("/user/scan.ftl", model);
-                    }
+//                    List<MsReport> msReports3 = msReportMapper.selectMsReportThirtyError(userOpen.getUserId());
+//                    if (msReports3.size() > 0) {
+//                        model.put("collor", "red");
+//                        model.put("collor2", "red");
+//                        model.put("into", "不许进入");
+//                        model.put("errorMsg", "由于最近30天您健康评估存在问题，不许进入，如有疑问请联系直管领导。");
+//                        scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+//                        return new ModelAndView("/user/scan.ftl", model);
+//                    }
                     String returnWork = msReportMapper.returnWork(userOpen.getUserId());
                     if (returnWork != null) {
                         if (sdf.parse(returnWork + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
@@ -649,14 +649,14 @@ public class ScanController {
                 model.put("errorMsg", "由于近期您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                 return new ModelAndView("/user/returnWork.ftl", model);
             }
-            List<MsReport> msReports3 = msReportMapper.selectMsReportThirtyError(userId);
-            if (msReports3.size() > 0) {
-                model.put("collor", "red");
-                model.put("collor2", "red");
-                model.put("into", "不可复工");
-                model.put("errorMsg", "由于最近30天您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
-                return new ModelAndView("/user/returnWork.ftl", model);
-            }
+//            List<MsReport> msReports3 = msReportMapper.selectMsReportThirtyError(userId);
+//            if (msReports3.size() > 0) {
+//                model.put("collor", "red");
+//                model.put("collor2", "red");
+//                model.put("into", "不可复工");
+//                model.put("errorMsg", "由于最近30天您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
+//                return new ModelAndView("/user/returnWork.ftl", model);
+//            }
             String returnWork = msReportMapper.returnWork(userId);
             if (returnWork != null) {
                 if (sdf.parse(returnWork + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {