凌云集团更改公司

whepi-ui/templates/user/scan.ftl

@@ -1,4 +1,4 @@
-<#assign title="${tittle!''}电子出入许可证"/>
+<#assign title="${tittle!''}证"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">

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

@@ -96,8 +96,9 @@ public class ScanController {
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
             model.put("uptownId", unit.getUptownId());
+            model.put("tittle", "电子出入许可");
             if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
-                model.put("tittle", "凌云集团");
+                model.put("tittle", "凌云集团电子通行");
                 ly = true;
             }
             if (ly) {
@@ -149,24 +150,12 @@ public class ScanController {
                             return new ModelAndView("/user/scan.ftl", model);
                         }
                     }
-                    String returnWork = msReportMapper.returnWork(userOpen.getUserId());
-                    if (returnWork != null) {
-                        List<MsReport> msReports2 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
-                        if (msReports2.size() < 15) {
-                            model.put("collor", "red");
-                            model.put("collor2", "red");
-                            model.put("into", "不许进入");
-                            model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2, returnWork)+"起方可进入！");
-                            scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
-                            return new ModelAndView("/user/scan.ftl", model);
-                        }
-                    }
                     List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                     if (msReports.size() < 3) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "您最近三日健康日报漏报，不许进入，请说明原因并及时填报，配合监测人员。");
+                        model.put("errorMsg", "由于您近3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -179,6 +168,18 @@ public class ScanController {
                         scanService.saveOutScan(userOpen.getUserId(), inType, 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) {
+                        List<MsReport> msReports3 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
+                        if (msReports3.size() < 15) {
+                            model.put("collor", "red");
+                            model.put("collor2", "red");
+                            model.put("into", "不许进入");
+                            model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2, returnWork)+"起方可进入！");
+                            scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+                            return new ModelAndView("/user/scan.ftl", model);
+                        }
+                    }
                     //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
                     model.put("collor", "green");
                     model.put("collor2", "green");
@@ -434,17 +435,6 @@ public class ScanController {
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
                 }
-                String returnWork = msReportMapper.returnWork(userOpen.getUserId());
-                if (returnWork != null) {
-                    List<MsReport> msReports2 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
-                    if (msReports2.size() < 15) {
-                        model.put("collor", "red");
-                        model.put("collor2", "red");
-                        model.put("into", "不可复工");
-                        model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。"+day15(msReports2, returnWork)+"起方可进入！");
-                        return new ModelAndView("/user/returnWork.ftl", model);
-                    }
-                }
                 List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                 if (msReports.size() < 3) {
                     model.put("collor", "red");
@@ -461,6 +451,17 @@ public class ScanController {
                     model.put("errorMsg", "由于近期您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                     return new ModelAndView("/user/returnWork.ftl", model);
                 }
+                String returnWork = msReportMapper.returnWork(userOpen.getUserId());
+                if (returnWork != null) {
+                    List<MsReport> msReports3 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
+                    if (msReports3.size() < 15) {
+                        model.put("collor", "red");
+                        model.put("collor2", "red");
+                        model.put("into", "不可复工");
+                        model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。"+day15(msReports2, returnWork)+"起方可进入！");
+                        return new ModelAndView("/user/returnWork.ftl", model);
+                    }
+                }
                 model.put("collor", "green");
                 model.put("collor2", "green");
                 model.put("into", "允许复工");