凌云集团更改公司

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

@@ -286,7 +286,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/scanHC.ftl", model);
                     }
@@ -311,6 +311,15 @@ public class ScanController {
                             return new ModelAndView("/user/scanHC.ftl", model);
                         }
                     }
+                    List<MsReport> msReportList = msReportMapper.queryMsReportIsXGHome(userOpen.getUserId());
+                    if (msReportList.size() > 0) {
+                        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/scanHC.ftl", model);
+                    }
                     List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                     if (msReports.size() < 4) {
                         model.put("collor", "red");
@@ -684,7 +693,7 @@ public class ScanController {
                 model.put("collor", "green");
                 model.put("collor2", "green");
                 model.put("into", "允许复工");
-                model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合凌云集团复工条件自动产生。原则上代表员工可复工，在厂门口扫描二维码生成绿色复工通行证，并接受检查后，可入厂。");
+                model.put("errorMsg", "特殊人员允许通行，请保证生产同时注意自身安全。");
                 return new ModelAndView("/user/returnWorkHC.ftl", model);
             }
             MsReport msReport = msReportMapper.queryMsReportIsXG(userId);
@@ -698,6 +707,14 @@ public class ScanController {
                     return new ModelAndView("/user/returnWorkHC.ftl", model);
                 }
             }
+            List<MsReport> msReportList = msReportMapper.queryMsReportIsXGHome(userId);
+            if (msReportList.size() > 0) {
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不许进入");
+                model.put("errorMsg", "由于您的家庭成员有新冠确诊或密切接触史人员，不许进入，如有疑问请联系直管领导。");
+                return new ModelAndView("/user/returnWorkHC.ftl", model);
+            }
             List<MsReport> msReports = msReportMapper.selectMsReportLate(userId);
             if (msReports.size() < 4) {
                 model.put("collor", "red");