tijiao

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

@@ -3,28 +3,9 @@ define(function (require) {
 
     var $dlg, $form;
 
-    var widgets = {
-      // 人员搜索
-      selectHrUserWidget: {
-        url: '/app/sys/widget/selectHrUser.js',
-        bind: {
-          userId: 'userId',
-          userName: 'name'
-        }
-      },
-      // 机构搜索
-      selectOrgWidget: {
-        url: '/app/hr/widget/selectOrg.js',
-        bind: {
-          deptId: 'orgId',
-          orgName: 'orgName'
-        }
-      }
-    };
-
     return {
       xtype: 'dialog',
-      dialogId: 'dialogAccount',
+      dialogId: 'dialogLiaodan',
       title: '用户名信息',
       width: 650,
       height: 350,
@@ -34,39 +15,62 @@ define(function (require) {
         if (context.isEdit) {
           $.yvan.ajax({
             type: 'GET',
-            url: api('/sys/account/getById'),
+            url: api('/home/getRibaoDetail'),
             data: {
-              accId: context.accId
+              reportId: context.reportId
             },
             success: function (data) {
-              $dlg.find('form');
-              $form.formSet(data.data);
+              // $dlg.find('form');
+              // $form.formSet(data.data);
             }
           });
         }
       },
       center: {
         items: {
-          xtype: 'formgroup',
-          subLabelWidth: '100',
-          subControlWidth: '200',
           onRender: function () {
-            $form = $(this);
+            $grid = $(this);
+            queryGrid1();
           },
-          items: [[
-            {name: 'accId', xtype: 'hidden'},
-            {label: '登录用户名', name: 'account', required: true, ff: 500},
+          xtype: 'grid',
+          idField: "reportId",
+          pagination: false,
+          toolbar: {
+            xtype: 'div',
+            items: [
+              // queryToolbar,
+              // queryForm,
+              // gridToolbar
+            ]
+          },
+          columns: [[
+            {title: '账号ID', field: 'reportId', hidden: true},
+            {title: '上报日期', field: 'reportDate'},
             {
-              label: '类型',
-              name: 'accType',
-              xtype: 'yvselect',
-              required: true,
-              data: [
-                {id: '', text: '全部'},
-                {id: '0', text: '未上报'},
-                {id: '1', text: '已上报'},
-              ],
+              title: '上报状态', field: 'reportStatus', formatter: function (value) {
+                if (value == 0)
+                  return "未上报";
+                else
+                  return "<span style='color:green'>已上报</span>";
+              }
+            },
+            {
+              title: '异常状态', field: 'msStatus', formatter: function (value) {
+                if (value == 1)
+                  return "<span style='color:green'>正常</span>";
+                if (value == 2)
+                  return "<span style='color:red'>异常</span>";
+              }
             },
+            {title: '居家人数', field: 'safetyNum'},
+            {title: '确诊人数', field: 'sureNum'},
+            {title: '疑似人数', field: 'suspectedNum'},
+            {title: '正常人数', field: 'normalNum'},
+            {title: '隔离人数', field: 'singleNum'},
+            {title: '新增人', field: 'userCreateName'},
+            {title: '新增时间', field: 'timeCreate', formatter: 'ts'},
+            {title: '更新人', field: 'userUpdateName'},
+            {title: '更新时间', field: 'timeUpdate', formatter: 'ts'}
           ]]
         }
       },

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

@@ -185,4 +185,10 @@ public class MsReportController {
         Long userCreate = 1231543603566841858L;
         return Model.newSuccess(msReportService.getByReportReportDateTest(userCreate, parser.getMap()));
     }
+
+    //获取上报明细
+    @GetMapping("/whepi/home/getRibaoDetail")
+    public Model<List<MsSuspected>> getRibaoDetail(@Pd(name = "reportId") Long reportId) {
+        return Model.newSuccess(msReportService.getByReportId(reportId));
+    }
 }