业委会每日异常详情完成2

whepi-ui/templates/yeweihui/ribao.ftl

@@ -78,7 +78,7 @@
                     }
                     var td;
                     if(v.msStatus == 2 && v.reportStatus == 2){//异常
-                        td = '<button value="'+v.houseId+'" onclick="ribao_ycxq(this.value)"><td style="background-color: yellow" align="center" value="'+v.houseId+'">'+v.doorplate+'</td></button>';
+                        td = '<td style="background-color: yellow" align="center" value="'+v.houseId+'"><button style="height: 100%;width: 100%;background-color: yellow" value="'+v.houseId+'" onclick="ribao_ycxq(this.value)">'+v.doorplate+'</button></td>';
                     }else if(v.msStatus != 2 && v.reportStatus == 2 && v.msStatus != null && v.reportStatus !=null){//已报
                         td = '<td style="background-color: #0bb20c" align="center">'+v.doorplate+'</td>';
                     }else if(v.reportStatus == 1 || v.reportStatus == 0){//待报
@@ -102,7 +102,8 @@
     }
 
     $('#return').on('click', function () {
-        window.location.href = "/user/home.html#tab2"
+        window.history.back()
+        // window.location.href = "/user/home.html#tab2"
     });
 </script>
 

whepi-ui/templates/yeweihui/ribaoXq.ftl

@@ -3,7 +3,7 @@
 <div class="page__bd">
 
     <div class="weui-tab">
-        <div class="weui-tab__panel">
+        <div class="weui-tab__panel" style="height: 570px">
             <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>-->
@@ -11,8 +11,8 @@
                     <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>
+                                <h3 style="text-align: center" id="msh3"></h3>
+                                <h5 style="text-align: center" id="msh5"></h5>
                             </div>
                         </div>
                     </div>
@@ -53,12 +53,21 @@
                     </div>
             </div>
         </div>
+        <div class="weui-btn-area"  style="display: grid;">
+        <#--<p id="btnRB" class="weui-btn weui-btn_primary" href="javascript:" type="hidden">一键通知</p>-->
+            <p id="returnycxq" class="weui-btn weui-btn_primary" href="javascript:">返&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;回</p>
+        </div>
     </div>
 </div>
 <#include "/home/frag.foot.ftl" />
 <script>
     (function ($) {
         $(function(){
+            var date2 = new Date();
+            date2.setTime(date2.getTime());
+            var month = date2.getMonth()+1;
+            var day = date2.getDate();
+            $("#msh5").text('('+month+'/'+day+')健康日报')
         var search = location.search;
         var houseId;
         if(search.indexOf("?")!=-1){
@@ -74,6 +83,7 @@
                 for (var i = 0; i < data.data.length; i++) {
                     var v = data.data[i];
                     if(i==0){
+                        $("#msh3").text(v.ridgepole+"栋"+v.unit+"单元"+v.doorplate+"室");
                         var t1 = $('<td align="center">'+v.safetyNum+'</td>');
                         var t2 = $('<td align="center">'+v.sureNum+'</td>');
                         var t3 = $('<td align="center">'+v.suspectedNum+'</td>');
@@ -99,4 +109,8 @@
         });
         });
     })(jQuery);
+    $('#returnycxq').on('click', function () {
+        window.history.back()
+        // window.location.href = "/user/home.html#tab2"
+    });
 </script>

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

@@ -31,11 +31,12 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     List<sysUptownUnit> selectDY(@Param("userId") Long userId);
 
 
-    @Select("select a.safety_num as safetyNum,a.sure_num as sureNum,a.suspected_num as suspectedNum," +
+    @Select("select e.ridgepole as ridgepole,e.unit as unit,b.doorplate as doorplate,a.safety_num as safetyNum,a.sure_num as sureNum,a.suspected_num as suspectedNum," +
             "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 " +
+            "inner join sys_uptown_unit e on e.unit_id = b.unit_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/entity/MsSuspected.java

@@ -115,4 +115,13 @@ public class MsSuspected {
 
     @TableField(exist = false)
     private Integer qz;
+
+    @TableField(exist = false)
+    private String ridgepole;
+
+    @TableField(exist = false)
+    private String unit;
+
+    @TableField(exist = false)
+    private String doorplate;
 }

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

@@ -49,9 +49,9 @@ public class YeWeiHuiController {
         queryParam.put("userId", "12345677");
         queryParam.put("statistics", "M");
 
-        List<QzTask> taskList = qzTaskService.selectAll(2L);
+//        List<QzTask> taskList = qzTaskService.selectAll(2L);
         List<sysUptownUnit> rbList = rbService.selectAll(1225331049509187586L);
-        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
         return new ModelAndView("/yeweihui/home.ftl", model);