凌云集团更改公司

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

@@ -114,36 +114,36 @@ define(function (require) {
                 xtype: 'toolbar',
                 title: '用户列表',
                 items: [
-                  // {
-                  //   text: '生成健康及旅居申请表', iconCls: 'fa fa-cloud-upload', onClick: function () {
-                  //     var row = $grid1.checkedData();
-                  //     if (row.length == 0) {
-                  //       $.yvan.msg('请至少选择一行数据');
-                  //       return;
-                  //     }
-                  //     var ids = "";
-                  //     for (var i = 0; i < row.length; i++) {
-                  //       ids += row[i].userId + ","
-                  //     }
-                  //     ids=ids.substring(0,ids.length-1);
-                  //     window.open(api('/export/lyReports?userId=' + ids));
-                  //   }
-                  // },
-                  // {
-                  //   text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-cloud-upload', onClick: function () {
-                  //     var row = $grid1.checkedData();
-                  //     if (row.length == 0) {
-                  //       $.yvan.msg('请至少选择一行数据');
-                  //       return;
-                  //     }
-                  //     var ids = "";
-                  //     for (var i = 0; i < row.length; i++) {
-                  //       ids += row[i].userId + ","
-                  //     }
-                  //     ids=ids.substring(0,ids.length-1);
-                  //     window.open(api('/export/lyApproves?userId=' + ids));
-                  //   }
-                  // },
+                  {
+                    text: '生成健康及旅居申请表', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                      var row = $grid1.checkedData();
+                      if (row.length == 0) {
+                        $.yvan.msg('请至少选择一行数据');
+                        return;
+                      }
+                      var ids = "";
+                      for (var i = 0; i < row.length; i++) {
+                        ids += row[i].userId + ","
+                      }
+                      ids=ids.substring(0,ids.length-1);
+                      window.open(api('/export/lyReports?userId=' + ids));
+                    }
+                  },
+                  {
+                    text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                      var row = $grid1.checkedData();
+                      if (row.length == 0) {
+                        $.yvan.msg('请至少选择一行数据');
+                        return;
+                      }
+                      var ids = "";
+                      for (var i = 0; i < row.length; i++) {
+                        ids += row[i].userId + ","
+                      }
+                      ids=ids.substring(0,ids.length-1);
+                      window.open(api('/export/lyApproves?userId=' + ids));
+                    }
+                  },
                   {
                     text: '导出人员报表', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var queryProperties = $form.formGet().queryProperties;

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

@@ -96,36 +96,36 @@ define(function (require) {
                 xtype: 'toolbar',
                 title: '用户列表',
                 items: [
-                  // {
-                  //   text: '生成健康及旅居申请表', iconCls: 'fa fa-cloud-upload', onClick: function () {
-                  //     var row = $grid1.checkedData();
-                  //     if (row.length == 0) {
-                  //       $.yvan.msg('请至少选择一行数据');
-                  //       return;
-                  //     }
-                  //     var ids = "";
-                  //     for (var i = 0; i < row.length; i++) {
-                  //       ids += row[i].userId + ","
-                  //     }
-                  //     ids=ids.substring(0,ids.length-1);
-                  //     window.open(api('/export/lyReports?userId=' + ids));
-                  //   }
-                  // },
-                  // {
-                  //   text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-cloud-upload', onClick: function () {
-                  //     var row = $grid1.checkedData();
-                  //     if (row.length == 0) {
-                  //       $.yvan.msg('请至少选择一行数据');
-                  //       return;
-                  //     }
-                  //     var ids = "";
-                  //     for (var i = 0; i < row.length; i++) {
-                  //       ids += row[i].userId + ","
-                  //     }
-                  //     ids=ids.substring(0,ids.length-1);
-                  //     window.open(api('/export/lyApproves?userId=' + ids));
-                  //   }
-                  // },
+                  {
+                    text: '生成健康及旅居申请表', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                      var row = $grid1.checkedData();
+                      if (row.length == 0) {
+                        $.yvan.msg('请至少选择一行数据');
+                        return;
+                      }
+                      var ids = "";
+                      for (var i = 0; i < row.length; i++) {
+                        ids += row[i].userId + ","
+                      }
+                      ids=ids.substring(0,ids.length-1);
+                      window.open(api('/export/lyReports?userId=' + ids));
+                    }
+                  },
+                  {
+                    text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                      var row = $grid1.checkedData();
+                      if (row.length == 0) {
+                        $.yvan.msg('请至少选择一行数据');
+                        return;
+                      }
+                      var ids = "";
+                      for (var i = 0; i < row.length; i++) {
+                        ids += row[i].userId + ","
+                      }
+                      ids=ids.substring(0,ids.length-1);
+                      window.open(api('/export/lyApproves?userId=' + ids));
+                    }
+                  },
                   {
                     text: '导出人员报表', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var queryProperties = $form.formGet().queryProperties;

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLYBM4.java

@@ -41,6 +41,7 @@ public class ExcelRiBaoLYBM4 {
     private String todayLocalOther = "";
     private int isTrip = 0;
 
+    private Long userId;
 
     @ExcelProperty(value = "部门名称", index = 1)
     private String loudong = "";

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

@@ -26,13 +26,14 @@
         msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum,
         msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,
         mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,
-        tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other
+        tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other,ur.user_id as userId
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id
         INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}
         left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = curdate()
         left join ms_suspected mss on mss.report_id=msr.report_id
         left join ms_trip tr on mss.suspected_id=trip_id
+        INNER JOIN sys_user_role ur on ur.property_id = suho.house_id and ur.role_id = 1
         <where>
             <if test="unitId!=null and uptownId!='' and unitId!= '0'.toString()">
                 and suu.unit_id=#{unitId}
@@ -50,13 +51,14 @@
         msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum,
         msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,
         mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,
-        tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other
+        tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other,ur.user_id as userId
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id
         INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}
         left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = curdate()
         left join ms_suspected mss on mss.report_id=msr.report_id
         left join ms_trip tr on mss.suspected_id=trip_id
+        INNER JOIN sys_user_role ur on ur.property_id = suho.house_id and ur.role_id = 1
         <where>
             <if test="unitId!=null and uptownId!='' and unitId!= '0'.toString()">
                 and suu.unit_id=#{unitId}