求助

whepi-doc/mrsb.sql

@@ -5,7 +5,7 @@ DROP TABLE IF EXISTS ms_report;
 CREATE TABLE ms_report  (
   report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
   house_id          bigint(20) NOT NULL DEFAULT 0                           COMMENT '门牌ID',
-  safety_num        int(11) NOT NULL DEFAULT 0                              COMMENT '平安人数',
+  safety_num        int(11) NOT NULL DEFAULT 0                              COMMENT '今日居家人数',
   suspected_num     int(11) NOT NULL DEFAULT 0                              COMMENT '疑似人数',
   remarks           varchar(100)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
   report_date       date (0)                                                COMMENT '上报日期',

whepi-ui/templates/home/home.ftl

@@ -62,6 +62,11 @@
         ribao_cancel();
         ribao_commit();
         /*submit_back();*/
+        var msReport = ${msReport};
+        $('#ribao_safety_num').val(msReport.safetyNum);
+        ribaoInitialization(msReport.reportId);
+
+        submit_back();
         familyClick();
 
         $(function () {

whepi-ui/templates/home/ribao.ftl

@@ -17,7 +17,7 @@
                                 <label class="weui-label">今日居家</label>
                             </div>
                             <div class="weui-cell__bd">
-                                <input class="weui-input" type="number" pattern="[0-2]*" placeholder="请输入今日家庭成员数量">
+                                <input id="ribao_safety_num" class="weui-input" type="number" pattern="[0-2]*" placeholder="请输入今日家庭成员数量">
                             </div>
                             <div class="weui-cell__ft">
                                 <a id="btnAdd" href="javascript:"
@@ -25,38 +25,17 @@
                             </div>
                         </div>
                     </div>
-                    <div class="weui-cells__title">家人1：咳嗽、发烧、确诊</div>
-                    <div class="weui-cells weui-cells_form">
-                        <div class="weui-cell">
-                            <div class="weui-cell__bd">
-                                <textarea class="weui-textarea" placeholder="请输入文本" rows="3"></textarea>
-                                <div class="weui-textarea-counter"><span>0</span>/200</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="weui-cells__title">家人2：咳嗽、发烧、未确诊</div>
-                    <div class="weui-cells weui-cells_form">
-                        <div class="weui-cell">
-                            <div class="weui-cell__bd">
-                                <textarea class="weui-textarea" placeholder="请输入文本" rows="3"></textarea>
-                                <div class="weui-textarea-counter"><span>0</span>/200</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="weui-cells__title">家人3：咳嗽、发烧、确诊</div>
-                    <div class="weui-cells weui-cells_form">
-                        <div class="weui-cell">
-                            <div class="weui-cell__bd">
-                                <textarea class="weui-textarea" placeholder="请输入文本" rows="3"></textarea>
-                                <div class="weui-textarea-counter"><span>0</span>/200</div>
-                            </div>
-                        </div>
+                    <div id="rb_family">
+                        <#--<div class="weui-media-box weui-media-box_text">-->
+                            <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
+                            <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
+                        <#--</div>-->
                     </div>
                     <div class="weui-cells__tips"> <span style="color: red">
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！
                     </span></div>
                     <div class="weui-btn-area">
-                        <a class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips">全家报平安</a>
+                        <a class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" onclick="addReport()">全家报平安</a>
                     </div>
                 </div>
                 <div id="ribao" style="display: none">
@@ -110,14 +89,15 @@
                                 </div>
                                 <div class="weui-cell ">
                                     <div class="weui-cell__bd">
-                                        <textarea id="rb_remarks" class="weui-textarea" placeholder="请输入病情描述" rows="3"></textarea>
+                                        <textarea id="rb_remarks" class="weui-textarea" placeholder="请输入病情描述"
+                                                  rows="3"></textarea>
                                         <div class="weui-textarea-counter"><span>0</span>/200</div>
                                     </div>
                                 </div>
                                 <div class="weui-cell weui-cell_switch">
                                     <div class="weui-cell__bd">是否确诊</div>
                                     <div class="weui-cell__ft">
-                                        <input class="weui-switch" type="checkbox"/>
+                                        <input class="weui-switch" type="checkbox" name="medical"/>
                                     </div>
                                 </div>
                             </div>
@@ -128,7 +108,8 @@
                     </span></div>
                     <div class="button-sp-area">
                         <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default">取消</a>
-                        <a id="commit" href="javascript:;"  onclick="ribaoCommit();" class="weui-btn weui-btn_primary">提交</a>
+                        <a id="commit" href="javascript:;" onclick="ribaoCommit();"
+                           class="weui-btn weui-btn_primary">提交</a>
                     </div>
                 </div>
                 </br>
@@ -141,7 +122,7 @@
                             01
                         </p>
                     </a>
-                    <a href="javascript:;" class="weui-grid"  style="background-color: red">
+                    <a href="javascript:;" class="weui-grid" style="background-color: red">
                         <p class="weui-grid__label">
                             02
                         </p>
@@ -171,45 +152,8 @@
                     </div>
                 </div>
             </div>
-            <#--<div id="rb_nav3" class="weui-tab__bd-item ">-->
-                <#--<div class="weui-flex">-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">01</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">02</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">03</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">04</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">05</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">06</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">07</div></div>-->
-                <#--</div>-->
-                <#--<div class="weui-flex">-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">01</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">02</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">03</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">04</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">05</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">06</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">07</div></div>-->
-                <#--</div>-->
-                <#--<div class="weui-flex">-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">01</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">02</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">03</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">04</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">05</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">06</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">07</div></div>-->
-                <#--</div>-->
-                <#--<div class="weui-flex">-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">01</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">02</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">03</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">04</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">05</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">06</div></div>-->
-                    <#--<div class="weui-flex__item"><div class="placeholder">07</div></div>-->
-                <#--</div>-->
-            <#--</div>-->
         </div>
     </div>
 </div>
 
+

whepi-ui/templates/home/ribao.js

@@ -5,6 +5,53 @@ function ribao_init() {
 
 }
 
+//近日报告
+function ribaoInitialization(reportId) {
+  if (reportId == null)
+    return;
+  $.ajax({
+    url: '/home/home/queryRibao',
+    data: {
+      reportId: reportId
+    },
+    type: 'GET',
+    success: function (data) {
+      console.log(data);
+      if (data.data.length > 0) {
+        hasData = true;
+        data.data.forEach(function (v) {
+          helpValue(v);
+        });
+      } else {
+
+      }
+    },
+    error: function () {
+    }
+  });
+}
+
+function helpValue(v) {
+  var conditionStatusList = v.conditionStatus.split(',');
+  var conditionStatus = v.userName + "：";
+  if (conditionStatusList[0] > 0)
+    conditionStatus += "咳嗽"
+  if (conditionStatusList[1] > 0)
+    conditionStatus += "，发烧"
+  if (conditionStatusList[2] > 0)
+    conditionStatus += "，乏力"
+  if (conditionStatusList[3] > 0)
+    conditionStatus += "，其他"
+  if (v.medical > 0)
+    conditionStatus += "   确诊"
+  else
+    conditionStatus += "   未确诊"
+  $('#rb_family').append($('<div class="weui-media-box weui-media-box_text">\n' +
+    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a></h4>\n' +
+    '                                      <p class="weui-media-box__desc">' + v.remarks + '</p>\n' +
+    '                                    </div>\n' +
+    '                              '));
+}
 
 function ribao_add() {
   $('#btnAdd').on('click', function () {
@@ -47,19 +94,59 @@ function ribao_commit() {
 function ribaoCommit() {
   var user_name = $("#js_input_user_name").val();
   var remarks = $("#rb_remarks").val();
-  var medical = $('input:radio:checked').val();
-  console.log(user_name)
-  console.log(remarks)
-  console.log(medical)
+  var medical = "";
+  if ($("input[name='medical']:checked").val() == "on")
+    medical = "1";
+  else
+    medical = "0";
+  var conditionStatus = "";
+  if ($("input[name='checkbox1']:checked").val() == "on")
+    conditionStatus += "1";
+  else
+    conditionStatus += "0";
+  if ($("input[name='checkbox2']:checked").val() == "on")
+    conditionStatus += ",2";
+  else
+    conditionStatus += ",0";
+  if ($("input[name='checkbox3']:checked").val() == "on")
+    conditionStatus += ",3";
+  else
+    conditionStatus += ",0";
+  if ($("input[name='checkbox4']:checked").val() == "on")
+    conditionStatus += ",4";
+  else
+    conditionStatus += ",0";
 
   $.ajax({
     url: '/home/addRibao.json',
     type: "post",
     data: {
       "userName": user_name,
-      "conditionStatus": "",
+      "conditionStatus": conditionStatus,
       "medical": medical,
       "remarks": remarks,
     },
   });
 }
+
+function deleteSuspected(suspectedId) {
+  $.ajax({
+    url: '/home/deleteSuspected.json',
+    type: "post",
+    data: {
+      "suspectedId": suspectedId
+    },
+  });
+}
+
+
+function addReport() {
+  var safety_num = $("#ribao_safety_num").val();
+  $.ajax({
+    url: '/home/addReport.json',
+    type: "post",
+    data: {
+      "safetyNum": safety_num,
+    },
+  });
+}

whepi-ui/templates/yeweihui/home.ftl

@@ -45,7 +45,6 @@ var taskList = ${taskList!'[]'};
 var statisticsOrderList =${rbList!'[]'};
 
 (function ($) {
-
     $(function(){
         $('.weui-navbar__item').on('click', function () {
             $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -91,10 +91,11 @@ function makeList1(tasks) {
     $('#qz_list1').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
+    return;
   }
   for (var i = 0; i < tasks.length; i++) {
     var task = tasks[i];
-    $('#qz_list1').append($('<a onclick="javascript:itemSelect(' + task.taskId + ');" class="weui-media-box weui-media-box_appmsg">\n' +
+    $('#qz_list1').append($('<a onclick="javascript:itemSelect(' + "'" + task.taskId + "'" + ');" class="weui-media-box weui-media-box_appmsg">\n' +
         '                            <div class="weui-media-box__bd">\n' +
         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
         '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
@@ -105,6 +106,7 @@ function makeList1(tasks) {
         '                            </div>\n' +
         '                        </a>'));
   }
+  $('#qz_list1').append('<br>');
 }
 
 function makeList2(tasks) {
@@ -114,10 +116,11 @@ function makeList2(tasks) {
     $('#qz_list2').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
+    return;
   }
   for (var i = 0; i < tasks.length; i++) {
     var task = tasks[i];
-    $('#qz_list2').append($('<a onclick="javascript:itemSelect(' + task.taskId + ');" class="weui-media-box weui-media-box_appmsg">\n' +
+    $('#qz_list2').append($('<a onclick="javascript:itemSelect(' + "'" + task.taskId + "'" + ');" class="weui-media-box weui-media-box_appmsg">\n' +
         '                            <div class="weui-media-box__bd">\n' +
         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
         '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
@@ -128,6 +131,7 @@ function makeList2(tasks) {
         '                            </div>\n' +
         '                        </a>'));
   }
+  $('#qz_list2').append('<br>');
 }
 
 function makeList3(tasks) {
@@ -137,10 +141,12 @@ function makeList3(tasks) {
     $('#qz_list3').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
+    return;
   }
   for (var i = 0; i < tasks.length; i++) {
     var task = tasks[i];
-    $('#qz_list3').append($('<a onclick="javascript:itemSelect(' + task.taskId + ');" class="weui-media-box weui-media-box_appmsg">\n' +
+    let taskid = task.taskId + '';
+    $('#qz_list3').append($('<a onclick="javascript:itemSelect(' + "'" + task.taskId + "'" + ');" class="weui-media-box weui-media-box_appmsg">\n' +
         '                            <div class="weui-media-box__bd">\n' +
         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
         '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
@@ -151,6 +157,7 @@ function makeList3(tasks) {
         '                            </div>\n' +
         '                        </a>'));
   }
+  $('#qz_list3').append('<br>');
 }
 
 function itemSelect(taskId) {

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -20,14 +20,16 @@
             </div>
         </#if>
         <#if task.taskStatus == 2>
-            <div style="display: flex; justify-content: center;">
+            <div class="weui-btn_primary" style="display: flex; justify-content: center; height: 5vh; line-height: 5vh">
                 <h4 class="weui-media-box__title">处理中</h4>
             </div>
+            <div id="qz_doing_detail" style="margin-top: 3vh;"></div>
         </#if>
         <#if task.taskStatus == 3>
-            <div style="display: flex; justify-content: center;">
+            <div class="weui-btn_primary" style="display: flex; justify-content: center; height: 5vh; line-height: 5vh">
                 <h4 class="weui-media-box__title">已处理完成</h4>
             </div>
+            <div id="qz_done_detail"></div>
         </#if>
     </div>
 
@@ -54,6 +56,9 @@
     (function ($) {
 
         console.log('详情页' + task);
+        if (task.taskStatus == 2 || task.taskStatus == 3) {
+            getdealdetail();
+        }
 
     })(jQuery);
 
@@ -67,6 +72,8 @@
 
     function send() {
 
+        let userId = $('#userId').val() ? $('#userId').val() : "10000";
+
         let qzcontent = $('#qz_content').val();
         if (qzcontent.length <= 0){
             alert("请输入内容");
@@ -74,12 +81,14 @@
         }
 
         $.ajax({
-            url: '/yeweihui/qiuzhu/reply.json',
+            url: '/yeweihui/qiuzhu/reply/add.json',
             type: 'post',
             data: {
-                userId: task.userId,
+                userId: userId,
                 taskId: task.taskId,
-                replyContent: qzcontent
+                replyContent: qzcontent,
+                userCreate: userId,
+                userUpdate: userId,
             },
             success: function (data) {
                 $.closePopup();
@@ -89,4 +98,35 @@
             }
         });
     }
+
+    function getdealdetail() {
+        $.ajax({
+            url: '/yeweihui/qiuzhu/reply/querybytaskid.json',
+            type: 'post',
+            data: {
+                taskId: task.taskId,
+            },
+            success: function (data) {
+                console.log("---返回数据---",data);
+
+                if (task.taskStatus == 2) {
+                    for (let i = 0; i < data.data.length; i++) {
+                        let reply = data.data[i];
+                        $("#qz_doing_detail").append('<h4 class="weui-media-box__title">回复' + i + '</h4>\n' +
+                            '        <p class="weui-media-box__desc">' + reply.replyContent + '</p><br>');
+                    }
+                }
+                else if (task.taskStatus == 3) {
+                    for (let i = 0; i < data.data.length; i++) {
+                        let reply = data.data[i];
+                        $("#qz_done_detail").append('<h4 class="weui-media-box__title">回复' + i + '</h4>\n' +
+                            '        <p class="weui-media-box__desc">' + reply.replyContent + '</p><br>');
+                    }
+                }
+            },
+            error: function () {
+                $.alert("网络异常");
+            }
+        });
+    }
 </script>

whepi-ui/templates/yeweihui/ribao.ftl

@@ -42,7 +42,7 @@
     <br/>
 
     <div class="weui-btn-area"  style="display: grid;">
-        <p id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">一键通知</p>
+        <#--<p id="btnRB" class="weui-btn weui-btn_primary" href="javascript:" type="hidden">一键通知</p>-->
         <p id="return" class="weui-btn weui-btn_primary" href="javascript:">返&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;回</p>
     </div>
 </div>

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

@@ -14,4 +14,6 @@ public interface QzTaskReplyDao extends BaseMapper<QzTaskReply> {
 
   List<QzTaskReply> taskQuery(@Param("taskId")Long taskId);
 
+  List<QzTaskReply> queryQzTaskReplyByTaskId(@Param("taskId")Long taskId);
+
 }

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

@@ -19,8 +19,14 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
 
     @Select("select a.doorplate as doorplate,c.report_id as reportId,c.ms_status as msStatus,a.time_update as time from sys_uptown_house a " +
             "inner join sys_uptown_unit b on a.unit_id = b.unit_id " +
-            "left join ms_report c on c.house_id = a.house_id " +
+            "left join ms_report c on c.house_id = a.house_id and c.time_update = #{date} " +
             "where b.ridgepole = #{ridgepole} and b.unit = #{unit}")
-    List<SysUptownHouse> selectDY(@Param("ridgepole") String ridgepole,@Param("unit") String unit,@Param("date") Date date);
+    List<SysUptownHouse> selectMp(@Param("ridgepole") String ridgepole,@Param("unit") String unit,@Param("date") Date date);
     // and c.time_update = #{date}
+
+    @Select("select c.ridgepole as ridgepole,c.unit as unit from sys_user_role a " +
+            "inner join sys_owner b on b.owner_id = a.property_id and a.role_id = 2 " +
+            "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);
 }

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

@@ -1,13 +1,16 @@
 package com.bofeng.service;
 
 
+import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
 import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
 import com.bofeng.entity.NotifyOpen;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
@@ -27,7 +30,7 @@ public class MsReportService {
     @Autowired
     private MsReportMapper msReportMapper;
 
-    public List<MsSuspected> getByDateNow() {
+    public List<MsSuspected> getBySuspectedDateNow(Long userId) {
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
@@ -38,4 +41,52 @@ public class MsReportService {
         }
         return listSuspected;
     }
+
+    public List<MsSuspected> getByReportId(Long reportId) {
+        return msSuspectedMapper.selectByReportId(reportId);
+    }
+
+    public MsReport getReportByDateNow(Long userId) {
+        Date t = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String reportDate = df.format(t);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
+        MsReport msReport= new MsReport();
+        if (listReport != null && listReport.size() > 0) {
+            msReport = msReportMapper.selectById(Long.parseLong(listReport.get(0).getReportId().toString()));
+        }
+        return msReport;
+    }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void addReport(String safetyNum) {
+        //如果是当前日期 已经添加
+        Date t = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String reportDate = df.format(t);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
+        if (listReport == null || listReport.size() == 0) {
+            MsReport msReport = new MsReport();
+            msReport.setReportId(IdWorker.getId());
+            msReport.setHouseId(0L);
+            msReport.setSafetyNum(Integer.parseInt(safetyNum));
+            msReport.setSuspectedNum(0);
+            msReport.setRemarks("");
+            msReport.setReportDate(DateTime.now().toDate());
+            msReport.setMsStatus(0);
+            msReport.setUserCreate(0L);
+            msReport.setTimeCreate(DateTime.now());
+            msReport.setUserUpdate(0L);
+            msReport.setTimeUpdate(DateTime.now());
+            msReportMapper.insert(msReport);
+        } else{
+            //更新居家成员
+            for(MsReport msReport : listReport){
+                msReport.setSafetyNum(Integer.parseInt(safetyNum));
+                msReport.setUserUpdate(0L);
+                msReport.setTimeUpdate(DateTime.now());
+                msReportMapper.updateById(msReport);
+            }
+        }
+    }
 }

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

@@ -33,13 +33,13 @@ public class MsSuspectedService {
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void addSuspected(String userName, String conditionStatus, Integer medical, String remarks) {
-        Long reportId=0L;
+        Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        String reportDate=df.format(t);
+        String reportDate = df.format(t);
         List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
-        if (listReport == null|| listReport.size()==0) {
+        if (listReport == null || listReport.size() == 0) {
             MsReport msReport = new MsReport();
             msReport.setReportId(IdWorker.getId());
             msReport.setHouseId(0L);
@@ -53,10 +53,9 @@ public class MsSuspectedService {
             msReport.setUserUpdate(0L);
             msReport.setTimeUpdate(DateTime.now());
             msReportMapper.insert(msReport);
-            reportId=msReport.getReportId();
-        }
-        else
-            reportId=listReport.get(0).getReportId();
+            reportId = msReport.getReportId();
+        } else
+            reportId = listReport.get(0).getReportId();
 
         //添加家人
         MsSuspected msSuspected = new MsSuspected();
@@ -73,4 +72,9 @@ public class MsSuspectedService {
         msSuspected.setTimeUpdate(DateTime.now());
         msSuspectedMapper.insert(msSuspected);
     }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void deleteSuspected(Long suspectedId) {
+        msSuspectedMapper.deleteById(suspectedId);
+    }
 }

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

@@ -36,4 +36,8 @@ public class QzTaskReplyService {
         return qzTaskReplyDao.insert(qzTaskReply);
     }
 
+    public List<QzTaskReply> queryQzTaskReplyByTaskId(Long taskId) {
+        return qzTaskReplyDao.queryQzTaskReplyByTaskId(taskId);
+    }
+
 }

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

@@ -19,15 +19,15 @@ public class RbService {
     @Autowired
     private RbMapper rbMapper;
 
-    public List<sysUptownUnit> selectAll () {
-        List<sysUptownUnit> sysUptownHouses = rbMapper.selectList(new EntityWrapper<>());
+    public List<sysUptownUnit> selectAll (Long userId) {
+        List<sysUptownUnit> sysUptownHouses = rbMapper.selectDY(userId);
         return sysUptownHouses;
     }
 
     public List<SysUptownHouse> selectXq (String ridgepole,String unit) {
 //        List<SysUptownHouse> sysUptownHouses = rbMapper.selectList(new EntityWrapper<SysUptownHouse>().eq("ridgepole",ridgepole).eq("unit",unit));
         Date date = new Date();
-        List<SysUptownHouse> sysUptownHouses = rbMapper.selectDY(ridgepole,unit,date);
+        List<SysUptownHouse> sysUptownHouses = rbMapper.selectMp(ridgepole,unit,date);
         return sysUptownHouses;
     }
 }

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

@@ -6,6 +6,7 @@ import com.bofeng.JwtHelper;
 import com.bofeng.dao.UserOpenMapper;
 import com.bofeng.entity.*;
 import com.bofeng.service.*;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.Maps;
 import com.yvan.Model;
 import com.yvan.ModelOps;
@@ -77,4 +78,15 @@ public class HomeController {
     int i = qzTaskService.taskQueryTaskId(taskId);
     return ModelOps.newSuccess(i);
   }
+    //小区求助的查看
+    @GetMapping("/home/home/taskQuery")
+    public Model<List<QzTaskReply>> taskQuery(@Pd(name = "taskId") Long taskId) {
+        return Model.newSuccess(qzTaskReplyService.taskQuery(taskId));
+    }
+
+    @GetMapping("/home/home_new.html")
+    public ModelAndView hmoe_new(ModelMap model) {
+        model.put("user", new JsonWapper("{\"www\": \"er\"}"));
+        return new ModelAndView("/home/home_new.ftl", model);
+    }
 }

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

@@ -1,14 +1,23 @@
 package com.bofeng.wx.controller;
 
 
-import com.bofeng.service.HomeService;
+import com.bofeng.entity.*;
+import com.bofeng.service.MsReportService;
 import com.bofeng.service.MsSuspectedService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.yvan.Model;
+import com.yvan.mvc.Pd;
+import com.yvan.platform.JsonWapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: xielianghe
@@ -20,14 +29,39 @@ public class MsReportController {
 
     @Autowired
     private MsSuspectedService msSuspectedService;
+    @Autowired
+    private MsReportService msReportService;
 
+    //添加家人
     @PostMapping("/home/addRibao.json")
     public ModelAndView saveUser(HttpServletRequest request) {
         String userName = request.getParameter("userName");
         String conditionStatus = request.getParameter("conditionStatus");
-        Integer medical = request.getParameter("medical").equals("on") ? 1 : 0;
+        Integer medical =Integer.parseInt( request.getParameter("medical"));
         String remarks = request.getParameter("remarks");
         msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks);
         return new ModelAndView("/home/home.ftl");
     }
+
+    //删除家人
+    @PostMapping("/home/deleteSuspected.json")
+    public ModelAndView deleteSuspected(HttpServletRequest request) {
+        Long suspectedId =Long.parseLong( request.getParameter("suspectedId"));
+        msSuspectedService.deleteSuspected(suspectedId);
+        return new ModelAndView("/home/home.ftl");
+    }
+
+    //获取家人
+    @GetMapping("/home/home/queryRibao")
+    public Model<List<MsSuspected>> queryRibao(@Pd(name = "reportId") Long reportId) {
+        return Model.newSuccess(msReportService.getByReportId(reportId));
+    }
+
+    //全家报平安
+    @PostMapping("/home/addReport.json")
+    public ModelAndView addReport(HttpServletRequest request) {
+        String safetyNum = request.getParameter("safetyNum");
+        msReportService.addReport(safetyNum);
+        return new ModelAndView("/home/home.ftl");
+    }
 }

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

@@ -4,8 +4,8 @@ import com.bofeng.dao.*;
 import com.bofeng.entity.*;
 import com.bofeng.service.HomeService;
 import com.bofeng.service.QzTaskService;
+import com.bofeng.service.RbService;
 import com.bofeng.service.UserOpenService;
-import com.yvan.Model;
 import com.yvan.platform.YvanUtil;
 import com.yvan.springmvc.ResultModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,15 +41,17 @@ public class UserOpenController {
     private UptownUnitMapper uptownUnitMapper;
     @Autowired
     private QzTaskService qzTaskService;
+    @Autowired
+    private RbService rbService;
 
     @GetMapping("/user/home.html")
     public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-        /*    UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());*/
-            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1224239062748065800L);
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
         } else {
@@ -65,6 +67,8 @@ public class UserOpenController {
             } else if(list.get(0).getRoleId() == 2) {
                 List<QzTask> taskList = qzTaskService.selectAll();
                 model.put("taskList", YvanUtil.toJsonPretty(taskList));
+                List<sysUptownUnit> rbList = rbService.selectAll(userId);
+                model.put("rbList", YvanUtil.toJsonPretty(rbList));
                 return new ModelAndView("/yeweihui/home.ftl", model);
             }
         }

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

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -36,16 +37,16 @@ public class YeWeiHuiController {
     private QzTaskReplyService qzTaskReplyService;
 
     @GetMapping("/yeweihui/home.html")
-    public ModelAndView yeweihui(ModelMap model) {
+    public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
 
         Map<String, Object> queryParam = Maps.newLinkedHashMap();
         queryParam.put("userId", "12345677");
         queryParam.put("statistics", "M");
 
         List<QzTask> taskList = qzTaskService.selectAll();
-        List<sysUptownUnit> rbList = rbService.selectAll();
+//        List<sysUptownUnit> rbList = rbService.selectAll();
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
-        model.put("rbList", YvanUtil.toJsonPretty(rbList));
+//        model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
         return new ModelAndView("/yeweihui/home.ftl", model);
     }
@@ -92,8 +93,8 @@ public class YeWeiHuiController {
         return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
     }
 
-    @PostMapping("/yeweihui/qiuzhu/reply.json")
-    public ModelOps replyQiuzhu(QzTaskReply qzTaskReply) {
+    @PostMapping("/yeweihui/qiuzhu/reply/add.json")
+    public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
 
         Integer success = qzTaskReplyService.insertQzTaskReply(qzTaskReply);
 
@@ -105,6 +106,14 @@ public class YeWeiHuiController {
         }
     }
 
+    @PostMapping("/yeweihui/qiuzhu/reply/querybytaskid.json")
+    public Model replyQiuzhuQueryByTaskId(@Pd(name = "taskId") Long taskId) {
+
+        List<QzTaskReply> reply = qzTaskReplyService.queryQzTaskReplyByTaskId(taskId);
+
+        return Model.newSuccess(reply);
+    }
+
     @PostMapping("/yeweihui/qiuzhu/list.json")
     public Model queryByHouseNumber(@Pd(name = "houseNumber") String houseNumber, @Pd(name = "status") Integer status) {
         List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);
@@ -115,9 +124,9 @@ public class YeWeiHuiController {
     @GetMapping("/yeweihui/ribao.html")
     public ModelAndView yeweihuiRibao(ModelMap model) {
 
-        List<QzTask> taskList = qzTaskService.selectAll();
-
-        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+//        List<QzTask> taskList = qzTaskService.selectAll();
+//
+//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
 
         return new ModelAndView("/yeweihui/ribao.ftl", model);
     }

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

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bofeng.dao.MsSuspectedMapper">
     <select id="selectByReportId" resultType="com.bofeng.entity.MsSuspected">
-        select * from ms_report where report_id = #{reportId}
+        select * from ms_suspected where report_id = #{reportId}
     </select>
 </mapper>

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

@@ -10,4 +10,8 @@
      left JOIN sys_user_open c on c.user_id=b.user_id
      where a.task_id=#{taskId}
     </select>
+
+    <select id="queryQzTaskReplyByTaskId" resultType="com.bofeng.entity.QzTaskReply">
+        select * from qz_task_reply where task_id=#{taskId}
+    </select>
 </mapper>