凌云集团更改公司

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

@@ -117,12 +117,14 @@ public class ScanController {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             model.put("now", sdf.format(new Date()));
             model.put("inType", inType);
-            if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
-                model.put("into", "禁止" + getMsg(inType));
-                model.put("collor", "red");
-                model.put("errorMsg", "非本小区居民，禁止" + getMsg(inType) + "。");
-                scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
-                return new ModelAndView("/user/scan.ftl", model);
+            if (!ly && !hc) {
+                if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
+                    model.put("into", "禁止" + getMsg(inType));
+                    model.put("collor", "red");
+                    model.put("errorMsg", "非本小区居民，禁止" + getMsg(inType) + "。");
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+                    return new ModelAndView("/user/scan.ftl", model);
+                }
             }
             OutScan o = outScanMapper.getOutScanLately(userOpen.getUserId(), inType);
             if (o != null && compareTime(o.getDate(), 1)) {
@@ -134,7 +136,7 @@ public class ScanController {
             if (inType == 1) {
                 OutScan outScan = outScanMapper.getOutScanByUserlimit(userOpen.getUserId());
                 if (outScan != null && new Date(outScan.getDate().getMillis() + 3600L * 1000 * 24).compareTo(new Date()) == -1) {
-                    if (!ly) {
+                    if (!ly && !hc) {
                         model.put("collor", "orange");
                         model.put("into", "允许进入");
                         model.put("errorMsg", "您在外驻留时间超过1日，请尽快上报您的健康状况，防止在外长时间逗留。");
@@ -148,8 +150,8 @@ public class ScanController {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "声明：凌云集团复工条件设置的六类人员不可复工。");
-                        scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
+                        model.put("errorMsg", "声明：根据凌云集团防疫指挥部复工条件，您属于不可复工六类人员之一，如有疑问请与上级管理部门联系。");
+                        scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
                     OutUser outUser = outUserMapper.getOutUserByPhone(1, uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
@@ -521,7 +523,7 @@ public class ScanController {
                 model.put("collor", "red");
                 model.put("collor2", "red");
                 model.put("into", "不可复工");
-                model.put("errorMsg", "声明：凌云集团复工条件设置的六类人员不可复工。");
+                model.put("errorMsg", "声明：根据凌云集团防疫指挥部复工条件，您属于不可复工六类人员之一，如有疑问请与上级管理部门联系。");
                 return new ModelAndView("/user/returnWork.ftl", model);
             }
             OutUser outUser = outUserMapper.getOutUserByPhone(1, uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));