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

admin-ui/app/whepi/index.js

@@ -113,6 +113,27 @@ $(function () {
         onLoadSuccess: function (node, data) {
         }
       });
+    } else if (userRole == "7") {//凌云集团管理员
+      $('#menutree').tree({
+        url: '/app/whepi/mock/menu7.json',
+        onDblClick: function (node) {
+          var $this = $(this);
+          if (!$this.tree('isLeaf', node.target)) {
+            $this.tree(node.state === 'closed' ? 'expand' : 'collapse', node.target);
+          }
+        },
+        onSelect: function () {
+          return false;
+        },
+        onClick: function (node) {
+          var href = node.href;
+          if ($.trim(href)) {
+            App.addTab({title: node.text, url: node.href, id: node.id, iconCls: node.iconCls});
+          }
+        },
+        onLoadSuccess: function (node, data) {
+        }
+      });
     }
 
 

admin-ui/app/whepi/lingyun/lingyunUser.js

@@ -94,7 +94,6 @@ define(function (require) {
             xtype: 'datebox',
             labelWidth: 'auto',
             width: 250,
-            required: true
           },
         ]]
       };

admin-ui/app/whepi/lingyun/lingyunUser2.js

@@ -76,7 +76,6 @@ define(function (require) {
             xtype: 'datebox',
             labelWidth: 'auto',
             width: 250,
-            required: true
           },
         ]]
       };

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

@@ -0,0 +1,22 @@
+{
+  "success": true,
+  "msg": "",
+  "data": [
+    {
+      "id": "ENT10001",
+      "text": "凌云导出报表",
+      "href": "/app/whepi/lingyun/lingyunUser2.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    },
+    {
+      "id": "ENT10002",
+      "text": "特殊人员管理",
+      "href": "/app/whepi/scan/specialPersonnel.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    }
+  ]
+}

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -147,7 +147,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
 
     @Select("select * from (select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 1 day) and user_create=#{userId}\n" +
             "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 2 day) and user_create=#{userId}\n" +
-            "union select * from ms_report where report_status=1 and date_sub(curdate(),interval 3 day) and user_create=#{userId}) aa where aa.ms_status = 2")
+            "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 3 day) and user_create=#{userId}) aa where aa.ms_status = 2")
     List<MsReport> selectMsReportThereError(@Param("userId") Long userId);
 
     /**