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

admin-ui/app/whepi/mock/menu.json

@@ -48,18 +48,18 @@
           "iconCls": "icon-blank fa fa-align-justify",
           "state": "close",
           "children": []
-        },
-        {
-          "id": "ENT100025",
-          "text": "凌云导出报表",
-          "href": "/app/whepi/lingyun/lingyunUser.js",
-          "iconCls": "icon-blank fa fa-align-justify",
-          "state": "close",
-          "children": []
         }
       ]
     },
     {
+      "id": "ENT100025",
+      "text": "凌云导出报表",
+      "href": "/app/whepi/lingyun/lingyunUser.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    },
+    {
       "id": "ENT10011",
       "text": "授权测试",
       "href": "/app/whepi/ceshi.js",

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

@@ -175,7 +175,7 @@ public class ScanController {
                     if (msReports2.size() > 0) {
                         model.put("collor", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "由于您健康或家人健康评估存在问题，禁止进入，如有疑问请联系直管领导。");
+                        model.put("errorMsg", "由于您健康评估存在问题，不许进入，如有疑问请联系直管领导。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -420,7 +420,7 @@ public class ScanController {
                 model.put("tittle", "凌云集团");
                 model.put("doorplate", unit.getRidgepole() + unit.getUnit());
                 model.put("name", uptownHomes.get(0).getLinkman());
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 model.put("now", sdf.format(new Date()));
                 List<MsReport> msReports1 = msReportMapper.queryMsReportIsXG(userOpen.getUserId());
                 if (msReports1.size() != 0) {
@@ -458,7 +458,7 @@ public class ScanController {
                 if (msReports2.size() > 0) {
                     model.put("collor", "red");
                     model.put("into", "不可复工");
-                    model.put("errorMsg", "由于您健康或家人健康评估存在问题，禁止进入，如有疑问请联系直管领导。");
+                    model.put("errorMsg", "由于您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                     return new ModelAndView("/user/returnWork.ftl", model);
                 }
                 model.put("collor", "green");