业委会每日上报异常详情

whepi-ui/templates/yeweihui/ribao.ftl

@@ -78,7 +78,7 @@
                     }
                     var td;
                     if(v.msStatus == 2){//异常
-                        td = '<td style="background-color: yellow" align="center">'+v.doorplate+'</td>';
+                        td = '<td style="background-color: yellow" align="center" value="'+v.houseId+'" onclick="ribao_ycxq(this.value)">'+v.doorplate+'</td>';
                     }else if(v.msStatus != 2 && v.reportId != 0 && v.msStatus != null && v.reportId !=null){//已报
                         td = '<td style="background-color: #0bb20c" align="center">'+v.doorplate+'</td>';
                     }else if(v.reportId == null){//待报
@@ -94,9 +94,12 @@
         });
     })(jQuery);
 
+    function ribao_ycxq(houseId) {
+        window.location.href = "/yeweihui/ribaoXq.html?"+houseId
+    }
+
     $('#return').on('click', function () {
         window.location.href = "/user/home.html#tab2"
-        // alert("日报");
     });
 </script>
 

whepi-ui/templates/yeweihui/ribao.js

@@ -5,3 +5,4 @@ function ribao_init(tt) {
       window.location.href = "/yeweihui/ribao.html?"+tt
   });
 }
+

whepi-ui/templates/yeweihui/ribaoXq.ftl

@@ -1,29 +1,89 @@
+<#assign title="业委会"/>
+<#include "/home/frag.head.ftl" />
 <div class="page__bd">
+
     <div class="weui-tab">
         <div class="weui-tab__panel">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
-                <div class="weui-btn-area">
-                    <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">查询</a>
-                </div>
-                <div class="weui-panel weui-panel_access">
-                    <div class="weui-panel__bd">
-                            <div class="weui-media-box__bd">
-                                <div style="display: flex; flex-direction: row; justify-content: space-between;">
-                                    <p class="weui-media-box__desc">&nbsp;&nbsp; 7-2-202</p>
-                                    <p class="weui-media-box__desc">2020-02-02 14:30</p>
-                                </div>
-                                <h4 class="weui-media-box__title">异常情况:</h4>
-                                <p class="weui-media-box__desc">确诊入院1人,居家隔离2人</p>
+                <#--<div class="weui-btn-area">-->
+                    <#--<a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">查询</a>-->
+                <#--</div>-->
+                    <div class="weui-tab">
+                        <div class="weui-navbar">
+                            <div class="weui-bar__item_on" style="text-align: center">
+                                <h3 style="text-align: center">1栋3单元503室</h3>
+                                <h5 style="text-align: center">02/06 健康日报</h5>
                             </div>
-                        <#--<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">-->
-                            <#--<div class="weui-media-box__bd">-->
-                                <#--<h4 class="weui-media-box__title">医药求助</h4>-->
-                                <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
-                            <#--</div>-->
-                        <#--</a>-->
+                        </div>
+                    </div>
+                    <br/>
+                    <br/>
+                    <div>
+                        <table cellspacing="0" cellpadding="0" style="width: 100%">
+                            <tbody><#--border="1" cellspacing="0" cellpadding="0"-->
+                            <tr>
+                                <td style="background-color: lightgrey" align="center">今日居家</td>
+                                <td style="background-color: lightgrey" align="center">确诊入院</td>
+                                <td style="background-color: lightgrey" align="center">居家隔离</td>
+                                <td style="background-color: lightgrey" align="center">异常观察</td>
+                                <td style="background-color: lightgrey" align="center">身体正常</td>
+                            </tr>
+                            <tr>
+                                <td align="center">8</td>
+                                <td align="center">0</td>
+                                <td align="center">0</td>
+                                <td align="center">0</td>
+                                <td align="center">8</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div><br/>
+                    <div>
+                        <table border="1" cellspacing="0" cellpadding="0" style="width: 100%">
+                            <tbody id="tableIdycxq">
+                            <tr>
+                                <td colspan="3" align="center" style="background-color: lightgrey">病情描述</td>
+                            </tr>
+                            <tr>
+                                <td align="center">家人</td>
+                                <td align="center">症状</td>
+                                <td align="center">病情描述</td>
+                            </tr>
+                            </tbody>
+                        </table>
                     </div>
-                </div>
             </div>
         </div>
     </div>
 </div>
+<#include "/home/frag.foot.ftl" />
+<script>
+    (function ($) {
+        var search = location.search;
+        var houseId;
+        if(search.indexOf("?")!=-1){
+            houseId = search.substr(1);
+        }
+        $.ajax({
+            url: '/yeweihui/ribaoDyYcXq',
+            type: "get",
+            data: {
+                houseId:houseId
+            },success: function(data){
+                console.log(data.data);
+                for (var i = 0; i < data.data.length; i++) {
+                    var v = data.data[i];
+                    var tr = $("<tr></tr>");
+                    var td;
+                    td = '<td style="background-color: yellow" align="center"">'+v.userName+'</td>';
+                    td = '<td style="background-color: yellow" align="center"">'+v.conditionStatus+'</td>';
+                    td = '<td style="background-color: yellow" align="center"">'+v.remarks+'</td>';
+                    tr.append(td);
+                    $("#tableIdycxq").append(tr);
+
+                }
+
+            }
+        });
+    })(jQuery);
+</script>

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

@@ -2,9 +2,7 @@ package com.bofeng.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.bofeng.entity.QzTask;
-import com.bofeng.entity.SysUptownHouse;
-import com.bofeng.entity.sysUptownUnit;
+import com.bofeng.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -17,7 +15,7 @@ import java.util.List;
 @Repository
 public interface RbMapper extends BaseMapper<sysUptownUnit> {
 
-    @Select("select a.doorplate as doorplate,c.report_id as reportId,c.ms_status as msStatus,b.unit_id as unitId from sys_uptown_house a " +
+    @Select("select DISTINCT a.house_id as houseId,a.doorplate as doorplate,c.report_id as reportId,c.ms_status as msStatus,b.unit_id as unitId from sys_uptown_house a " +
             "inner join sys_uptown_unit b on a.unit_id = b.unit_id " +
             "inner join sys_owner d on d.uptown_id = b.uptown_id " +
             "inner join sys_user_role e on e.property_id = d.owner_id and e.role_id = 2 " +
@@ -31,4 +29,11 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
             "inner join sys_uptown_unit c on c.uptown_id = b.uptown_id " +
             "where a.user_id = #{userId}")
     List<sysUptownUnit> selectDY(@Param("userId") Long userId);
+
+
+    @Select("select c.user_name as userName,c.cough as cough,c.muscle as muscle,c.dyspnea as dyspnea,c.chest as chest,c.fatigue as fatigue,c.diarrhea as diarrhea,c.others as others from ms_report a " +
+            "inner join sys_uptown_house b on b.house_id = a.house_id " +
+            "left join ms_suspected c on c.report_id = a.report_id " +
+            "where b.house_id = #{houseId}")
+    List<MsSuspected> selectYcXq(@Param("houseId") Long houseId, @Param("dateStr") String dateStr);
 }

whepi-web/src/main/java/com/bofeng/service/RbService.java

@@ -3,9 +3,7 @@ package com.bofeng.service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.bofeng.dao.QzTaskDao;
 import com.bofeng.dao.RbMapper;
-import com.bofeng.entity.QzTask;
-import com.bofeng.entity.SysUptownHouse;
-import com.bofeng.entity.sysUptownUnit;
+import com.bofeng.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,4 +32,12 @@ public class RbService {
         List<SysUptownHouse> sysUptownHouses = rbMapper.selectMp(str,dateStr);
         return sysUptownHouses;
     }
+
+    public List<MsSuspected> selectYcXq (Long houseId) {
+        Date date = new Date();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String dateStr = simpleDateFormat.format(date);
+        List<MsSuspected> sysUptownHouses = rbMapper.selectYcXq(houseId,dateStr);
+        return sysUptownHouses;
+    }
 }

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

@@ -1,9 +1,6 @@
 package com.bofeng.wx.controller;
 
-import com.bofeng.entity.QzTask;
-import com.bofeng.entity.QzTaskReply;
-import com.bofeng.entity.SysUptownHouse;
-import com.bofeng.entity.sysUptownUnit;
+import com.bofeng.entity.*;
 import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
 import com.bofeng.service.RbService;
@@ -133,10 +130,6 @@ public class YeWeiHuiController {
     @GetMapping("/yeweihui/ribao.html")
     public ModelAndView yeweihuiRibao(ModelMap model) {
 
-//        List<QzTask> taskList = qzTaskService.selectAll();
-//
-//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
-
         return new ModelAndView("/yeweihui/ribao.ftl", model);
     }
 
@@ -147,4 +140,19 @@ public class YeWeiHuiController {
 
         return Model.newSuccess(rbList);
     }
+
+    @GetMapping("/yeweihui/ribaoXq.html")
+    public ModelAndView yeweihuiRibaoYcXq(ModelMap model) {
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+        queryParam.put("userId", "12345677");
+        queryParam.put("statistics", "M");
+        return new ModelAndView("/yeweihui/ribaoXq.ftl", model);
+    }
+
+    @GetMapping("/yeweihui/ribaoDyYcXq")
+    public Model<List<MsSuspected>> yeweihuiRibaoYcXq(Long houseId) {
+        List<MsSuspected> rbList = rbService.selectYcXq(houseId);
+
+        return Model.newSuccess(rbList);
+    }
 }

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: lll
+  profiles.active: maoyunfeng
 
   application:
     name: whepi-web