凌云集团更改公司

admin-ui/app/whepi/home/home.js

@@ -49,10 +49,6 @@ define(function (require) {
         //检查查询
         function queryGrid3() {
             var obj = $form2.formGet();
-            if (obj.unitId == "") {
-                $.yvan.msg('请选择部门');
-                return false;
-            }
             if (obj.date1 == "") {
                 $.yvan.msg('请选择导出时间');
                 return false;

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

@@ -115,7 +115,7 @@ define(function (require) {
                 title: '用户列表',
                 items: [
                   {
-                    text: '生成健康及旅居申请表', iconCls: 'fa fa-plus-circle fa-lg', onClick: function () {
+                    text: '生成健康及旅居申请表', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var row = $grid1.checkedData();
                       if (row.length == 0) {
                         $.yvan.msg('请至少选择一行数据');
@@ -130,7 +130,7 @@ define(function (require) {
                     }
                   },
                   {
-                    text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-plus-circle fa-lg', onClick: function () {
+                    text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var row = $grid1.checkedData();
                       if (row.length == 0) {
                         $.yvan.msg('请至少选择一行数据');
@@ -143,8 +143,12 @@ define(function (require) {
                       ids=ids.substring(0,ids.length-1);
                       window.open(api('/export/lyApproves?userId=' + ids));
                     }
-                  }
-
+                  },
+                  {
+                    text: '导出所有凌云上报', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                      window.open(api('/lun/exportRiBao?date=' + date + "&unitId=" + unitId));
+                    }
+                  },
                 ]
               },
               multiselect: true, /// 表格多选

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

@@ -97,7 +97,7 @@ define(function (require) {
                 title: '用户列表',
                 items: [
                   {
-                    text: '生成健康及旅居申请表', iconCls: 'fa fa-plus-circle fa-lg', onClick: function () {
+                    text: '生成健康及旅居申请表', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var row = $grid1.checkedData();
                       if (row.length == 0) {
                         $.yvan.msg('请至少选择一行数据');
@@ -112,7 +112,7 @@ define(function (require) {
                     }
                   },
                   {
-                    text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-plus-circle fa-lg', onClick: function () {
+                    text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var row = $grid1.checkedData();
                       if (row.length == 0) {
                         $.yvan.msg('请至少选择一行数据');
@@ -125,8 +125,12 @@ define(function (require) {
                       ids=ids.substring(0,ids.length-1);
                       window.open(api('/export/lyApproves?userId=' + ids));
                     }
-                  }
-
+                  },
+                  {
+                    text: '导出所有凌云上报', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                      window.open(api('/lun/exportRiBao?date=' + date + "&unitId=" + unitId));
+                    }
+                  },
                 ]
               },
               multiselect: true, /// 表格多选

whepi-web/src/main/resources/mapper/RbMapper.xml

@@ -14,7 +14,7 @@
         left join ms_suspected mss on mss.report_id=msr.report_id
         left join ms_trip tr on mss.suspected_id=trip_id
         <where>
-            <if test="unitId!=null and uptownId!=''">
+            <if test="unitId!=null and uptownId!='' and unitId!= '0'.toString()">
                 and suu.unit_id=#{unitId}
             </if>
         </where>