修改

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

@@ -243,18 +243,13 @@ public class ScanService {
         if (msReport1 != null && !msReport1.getAutoLocal().equals(workAddr)) {
             return 0;
         }
-//        MsTripDet work = msReportMapper.returnWork(userId);
-//        if (work != null) {
-//            if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
-//                if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
-//                    return 0;
-//                }
-//            } else if (!ly2) {
-//                if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
-//                    return 0;
-//                }
-//            }
-//        }
+        // 最近三天是否出行
+        MsTripDet work = msReportMapper.returnWork(userId);
+        if (work != null && (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime())) {
+            if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 3 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+                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;

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

@@ -168,7 +168,7 @@ public class ScanController {
                         model.put("collor", "green");
                         model.put("collor2", "green");
                         model.put("into", "允许通行");
-                        model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生。原则上代表员工可复工，在厂门口扫描二维码生成绿色复工通行证，并接受检查后，可入厂。");
+                        model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生，原则上代表员工可复工可入厂。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -652,7 +652,7 @@ public class ScanController {
                 model.put("collor", "blue-ly");
                 model.put("collor2", "blue-ly");
                 model.put("into", "允许复工");
-                model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生。原则上代表员工可复工，可入厂。");
+                model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生，原则上代表员工可复工可入厂。");
                 return new ModelAndView("/user/returnWork.ftl", model);
             }
             String startDate = "";
@@ -723,7 +723,7 @@ public class ScanController {
             }
             // 最近三天是否出行
             MsTripDet work = msReportMapper.returnWork(userId);
-            if (outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
+            if (work != null && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
                 if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 3 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
                     model.put("collor", "red");
                     model.put("collor2", "red");
@@ -754,7 +754,7 @@ public class ScanController {
             model.put("collor", "blue-ly");
             model.put("collor2", "blue-ly");
             model.put("into", "允许复工");
-            model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生。原则上代表员工可以复工，在厂门口扫描二维码生成绿色复工通行证，并接受规定检查后，方可入厂。");
+            model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生，原则上代表员工可复工可入厂。");
             return new ModelAndView("/user/returnWork.ftl", model);
             //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
         } else {