Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

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

@@ -171,14 +171,7 @@ public class ScanController {
                     }
                     String returnWork = msReportMapper.returnWork(userOpen.getUserId());
                     if (returnWork != null) {
-                        List<MsReport> msReports3 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
-                        Date date = null;
-                        if (msReports3.size() != 0) {
-                            date = msReports3.get(0).getReportDate();
-                        } else {
-                            date = s.parse(returnWork);
-                        }
-                        if (s.parse(returnWork).getTime() + 1000L * 3600 * 15 > date.getTime()) {
+                        if (sdf.parse(returnWork + " 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");
                             model.put("into", "不许进入");
@@ -481,14 +474,7 @@ public class ScanController {
             }
             String returnWork = msReportMapper.returnWork(userId);
             if (returnWork != null) {
-                List<MsReport> msReports3 = msReportMapper.returnWorkTime(returnWork, userId);
-                Date date = null;
-                if (msReports3.size() != 0) {
-                    date = msReports3.get(0).getReportDate();
-                } else {
-                    date = s.parse(returnWork);
-                }
-                if (s.parse(returnWork).getTime() + 1000L * 3600 * 15 > date.getTime()) {
+                if (sdf.parse(returnWork + " 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");
                     model.put("into", "不可复工");