业委会每日异常详情

whepi-doc/mrsb.sql

@@ -27,10 +27,20 @@ CREATE TABLE ms_suspected  (
   suspected_id      bigint(20) NOT NULL DEFAULT 0                           COMMENT '疑似ID',
   report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
   user_name         varchar(50)  NOT NULL DEFAULT ''                        COMMENT '家人姓名',
-  family_relative   int(11)    NOT NULL DEFAULT 1                           COMMENT '是否家庭成员:1是,2暂住亲友',
-  medical           int(11)    NOT NULL DEFAULT 1                           COMMENT '是否就医:0否,1是',
-  condition_status  varchar(50)  NOT NULL DEFAULT ''                        COMMENT '疑似情况:1咳嗽,2发烧,3腹泻,4酸痛,5乏力,6其他 ',
-  remarks           varchar(200)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
+  grender            int(11)    NOT NULL DEFAULT 1                           COMMENT '性别:0未设置，1男,2女',
+  age               int(11)    NOT NULL DEFAULT 1                           COMMENT '年龄',
+  family_status     int(11)    NOT NULL DEFAULT 1                           COMMENT '基本状态:1心血管疾病（服用ARB）,2心血管疾病（未服用ARB）,3呼吸系统病史，4肿瘤病史，5糖尿病史，6服用过激素药物，7妊娠期',
+  status_desp       varchar(100)  NOT NULL DEFAULT ''                       COMMENT '状态描述',
+  medical           int(11)    NOT NULL DEFAULT 1                           COMMENT '是否确诊:0否,1是',
+  temperature       decimal(14,2) NOT NULL DEFAULT 0                        COMMENT '体温',
+  cough             int(11)    NOT NULL DEFAULT 0                           COMMENT '咳嗽:0无咳嗽,1偶尔短暂咳嗽，2频繁咳嗽轻重，3频繁咳嗽重度',
+  muscle            int(11)    NOT NULL DEFAULT 0                           COMMENT '肌肉酸痛:0无,1加重，2好转，3无变化',
+  dyspnea           int(11)    NOT NULL DEFAULT 0                           COMMENT '呼吸困难:0无,1加重，2好转，3无变化，4严重',
+  chest             int(11)    NOT NULL DEFAULT 0                           COMMENT '胸闷:0无,1端坐呼吸，2活动无，3无变化',
+  fatigue           int(11)    NOT NULL DEFAULT 0                           COMMENT '乏力:0无,1加重，2好转，3无变化',
+  diarrhea          int(11)    NOT NULL DEFAULT 0                           COMMENT '腹泻:0无,1有',
+  diarrhea_num      int(11)    NOT NULL DEFAULT 0                           COMMENT '每日腹泻次数',
+  others            varchar(600)  NOT NULL DEFAULT ''                       COMMENT '其他',
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',
   user_update       bigint(20) NOT NULL DEFAULT 0                           COMMENT '修改人',

whepi-doc/task.sql

@@ -12,6 +12,7 @@ create table qz_task (
     user_name       varchar(20)     NOT NULL DEFAULT ''         COMMENT '用户名称',
     house_number    varchar(20)     NOT NULL DEFAULT ''         COMMENT '门牌号',
     house_id        varchar(20)     NOT NULL DEFAULT ''         COMMENT '门牌号ID',
+    uptown_id       bigint(20)      NOT NULL DEFAULT 0          COMMENT '小区ID,下拉选ID',
 
     user_create     bigint(20)      NOT NULL DEFAULT 0          COMMENT '新增人',
     time_create     datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',

whepi-ui/templates/home/home.ftl

@@ -60,9 +60,8 @@
         family_init();
         ribao_add();
         ribao_cancel();
-        ribao_commit();
 
-        var msReport = ${msReport};
+        <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_safety_num').val(msReport.safetyNum);
         ribaoInitialization(msReport.reportId);
         /*submit_back();*/
@@ -90,7 +89,7 @@
         $('#notitle').empty();//清除节点
         $.ajax({
             url: '/home/home/queryQzTask',
-            data: {},
+            data: {userId: $('#userId').val()},
             type: 'GET',
             async: false,
             success: function (data) {
@@ -118,7 +117,7 @@
                 '                            </div>\n' +
                 '                        </div>\n' +
                 '                        <div class="weui-cell__ft">' + conversion(v.taskStatus) + '</div>\n' +
-                '                    </a>\n<br />'));
+                '                    </a>\n<br/>'));
 
     }
 

whepi-ui/templates/home/qiuzhu.ftl

@@ -47,6 +47,8 @@
                         <div class="weui-cell__ft"></div>
                     </a>-->
                 </div>
+                <br/>
+                <br/>
                 <div id="titlteZs" style="display: none">
                     <div class="page__bd">
                         <div class="weui-panel weui-panel_access" id="qzHS">
@@ -86,6 +88,8 @@
                     <div id="family">
                         <div class="weui-panel__bd" id="valueQz">
                         </div>
+                        <br>
+                        <br>
                     </div>
                 </div>
                 <div id="play" style="display: none" class="weui-panel__bd"><#--发起求助的展示界面-->
@@ -121,7 +125,7 @@
                                 <label class="weui-cell weui-cell_active weui-check__label" for="qzf2">
                                     <div class="weui-cell__hd">
                                         <input type="checkbox" name="checkbox2" class="weui-check" id="qzf2"
-                                               value="业委会">
+                                               value="A" checked="checked">
                                         <i class="weui-icon-checked"></i>
                                     </div>
                                     <div class="weui-cell__bd">
@@ -191,6 +195,9 @@
                             <div class="weui-btn-area">
                                 <a class="weui-btn weui-btn_primary" onclick="HomeStatus();" id="isHiddenStyle12"
                                    style="display: none">完成</a>
+                                <br>
+                                <br>
+                                <br>
                             </div>
                         </div>
                     </div>
@@ -305,7 +312,7 @@
                 '                                    </div>\n' +
                 '                                </div>\n' +
                 '                                <div class="weui-cell__ft">' + conversion(v.taskStatus) + '</div>\n' +
-                '                            </a><br />'));
+                '                            </a><br/>'));
     }
 
     var aid;
@@ -408,7 +415,7 @@
         /*展示*/
         $('#play')[0].style.display = '';
         $('#Qzinput').val("")
-        $("#qzf2").removeAttr('checked', false)
+       // $("#qzf2").removeAttr('checked', false)
         $('#remarks').val("")
     }
 

whepi-ui/templates/home/ribao.ftl

@@ -136,6 +136,7 @@
             <div id="rb_nav2" class="weui-tab__bd-item ">
                 <div id="my-input-ribao"></div>
                 <div class="weui-panel weui-panel_access">
+                    <div class="weui-panel__hd" style="color: #0bb20c; font-size: large" >我的家人</div>
                     <div class="weui-panel__bd" id="ribao_famliy">
                         <#--<div class="weui-media-box weui-media-box_text">-->
                             <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊</h4>-->

whepi-ui/templates/home/ribao.js

@@ -33,9 +33,12 @@ function ribaoInitialization(reportId) {
 
 //刷新今日日报
 function ribao_refrash() {
+  var userId = $("#userId").val();
   $.ajax({
     url: '/home/home/queryRibao',
-    data: {},
+    data: {
+      userCreate: userId
+    },
     type: 'GET',
     success: function (data) {
       console.log(data);
@@ -74,7 +77,7 @@ function ribao_cell(v) {
   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' +
+    '                                      <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' +
     '                              '));
@@ -104,34 +107,23 @@ function ribao_cancel() {
   });
 }
 
-function ribao_commit() {
-  $('#commit').on('click', function () {
-
-    if ($('#ribao')[0].style.display == 'none') {
-      $('#notOpenRibao').toggle();
-      $('#ribao')[0].style.display = '';
-    } else {
-      $('#notOpenRibao')[0].style.display = '';
-      $('#ribao')[0].style.display = 'none';
-    }
-  });
-}
-
-
 function ribaoCommit() {
+  var userId = $("#userId").val();
   var user_name = $("#js_input_user_name").val();
-  if(user_name==""){
+  if (user_name == "") {
     alert("请填写家人姓名");
     return;
-  }if(user_name.length>25){
+  }
+  if (user_name.length > 25) {
     alert("请填写正确格式家人姓名");
     return;
   }
   var remarks = $("#rb_remarks").val();
-  if(remarks==""){
+  if (remarks == "") {
     alert("请填写病情描述");
     return;
-  }if(remarks.length>100){
+  }
+  if (remarks.length > 100) {
     alert("病情描述内容太长");
     return;
   }
@@ -167,15 +159,23 @@ function ribaoCommit() {
     conditionStatus += ",6";
 
   $.ajax({
-    url: '/home/addRibao.json',
+    url: '/home/addRibao',
     type: "post",
     data: {
+      "userCreate": userId,
       "userName": user_name,
       "conditionStatus": conditionStatus,
       "medical": medical,
       "remarks": remarks,
     },
     success: function (data) {
+      if ($('#ribao')[0].style.display == 'none') {
+        $('#notOpenRibao').toggle();
+        $('#ribao')[0].style.display = '';
+      } else {
+        $('#notOpenRibao')[0].style.display = '';
+        $('#ribao')[0].style.display = 'none';
+      }
       ribao_refrash();
     },
   });
@@ -183,7 +183,7 @@ function ribaoCommit() {
 
 function deleteSuspected(suspectedId) {
   $.ajax({
-    url: '/home/deleteSuspected.json',
+    url: '/home/deleteSuspected',
     type: "post",
     data: {
       "suspectedId": suspectedId
@@ -196,17 +196,22 @@ function deleteSuspected(suspectedId) {
 
 
 function addReport() {
+  var userId = $("#userId").val();
   var safety_num = $("#ribao_safety_num").val();
-  if(safety_num==""){
+  if (safety_num == "") {
     alert("请填写居家人数");
     return;
   }
   $.ajax({
-    url: '/home/addReport.json',
+    url: '/home/addReport',
     type: "post",
     data: {
+      "userCreate": userId,
       "safetyNum": safety_num,
     },
+    success: function (data) {
+      $.toast("操作成功");
+    },
   });
 }
 
@@ -215,14 +220,16 @@ $("#my-input-ribao").calendar({
   inputReadOnly: false,
   onChange: function (p, values, displayValues) {
     var reportDate = values.toString();
+    var userId = $("#userId").val();
     $.ajax({
       url: '/home/home/queryRibaoReportDate',
       data: {
+        "userCreate": userId,
         "reportDate": reportDate,
       },
       type: 'GET',
       success: function (data) {
-        if(data.data==undefined){
+        if (data.data == undefined) {
           $('#ribao_famliy').empty();
         }
         else {
@@ -249,13 +256,13 @@ function helpValue1(v) {
   if (conditionStatusList[0] > 0)
     conditionStatus += "&nbsp;&nbsp;&nbsp;咳嗽"
   if (conditionStatusList[1] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
   }
   if (conditionStatusList[2] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;腹泻"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;腹泻"
   }
   if (conditionStatusList[3] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;酸痛"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;酸痛"
   }
   if (conditionStatusList[4] > 0) {
     conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"

whepi-ui/templates/shop/home.ftl

@@ -86,7 +86,7 @@
         $.ajax({
             url: '/home/home/queryQzTask',
             // data: {},
-            data: {taskStatus: 1},
+            data: {taskStatus: 1,userId: $('#userId').val()},
             type: 'GET',
             success: function (data) {
                 console.log(data);

whepi-ui/templates/shop/qiuzhu.ftl

@@ -235,7 +235,7 @@
         $('#valueQz').empty();//清除节点
         $.ajax({
             url: '/home/home/queryQzTask',
-            data: {taskStatus: status},
+            data: {userId: $('#userId').val(),taskStatus: status},
             type: 'GET',
             success: function (data) {
                 console.log(data);

whepi-ui/templates/user/changeRole.ftl

@@ -0,0 +1,65 @@
+<#assign title="选择角色"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="weui-tab">
+    <div class="weui-tab__bd">
+        <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
+            <div class="weui-tab__bd-item weui-tab__bd-item--active">
+                <div class="page__bd">
+                    <header class="user-header">
+                        <br/>
+                        <br/>
+                        <br/>
+                        <br/>
+                        <h1 class="user-title">家园抗击疫情公共服务平台</h1>
+                        <br/>
+                        <h1 class="user-title"><#if user ??>${user.nickName!''}</#if>登陆</h1>
+                        <br/>
+                        <br/>
+                        <br/>
+                        <br/>
+                    </header>
+                    <div class="weui-form" id="fromMsg">
+                        <div class="weui-cells weui-cells_checkbox">
+                            <label class="weui-cell weui-cell_active weui-check__label" for="s11">
+                                <div class="weui-cell__hd">
+                                    <input type="radio" name="radio" value="1" class="weui-check" id="s11">
+                                    <i class="weui-icon-checked"></i>
+                                </div>
+                                <div class="weui-cell__bd">
+                                    <p>家庭用户</p>
+                                </div>
+                            </label>
+                            <label class="weui-cell weui-cell_active weui-check__label" for="s12">
+                                <div class="weui-cell__hd">
+                                    <input type="radio" name="radio" value="2" class="weui-check" id="s12">
+                                    <i class="weui-icon-checked"></i>
+                                </div>
+                                <div class="weui-cell__bd">
+                                    <p>业委会人员</p>
+                                </div>
+                            </label>
+                        </div>
+                        <br/>
+                        <div class="weui-form__opr-area">
+                            <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="login();"
+                               id="login">登陆</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+    </div>
+</div>
+</div>
+</body>
+<#include "/home/frag.foot.ftl" />
+<script>
+    function login() {
+        var userType = $('input:radio:checked').val();
+        if (!userType) {
+            alert("请选择用户角色！")
+            return false;
+        }
+        window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;
+    }
+</script>

whepi-ui/templates/user/home.ftl

@@ -266,72 +266,50 @@
         }
         var unitId = $("#unitId").val();
         var doorplate = $("#doorplate").val().trim();
-        if(userType == 1) {
-            if (!unitId) {
-                alert("栋/单元！")
-                return false;
-            }
-            if (!doorplate) {
-                alert("请选择门牌信息！")
-                return false;
-            }
+        if (!unitId) {
+            alert("栋/单元！")
+            return false;
+        }
+        if (!doorplate) {
+            alert("请选择门牌信息！")
+            return false;
         }
         console.log(city)
         console.log(area)
         console.log(uptownId)
         console.log(unitId)
         console.log(doorplate)
-        if (userType == 1) {
-            $.ajax({
-                url: '/home/checkHouseId.json',
-                type: "post",
-                data: {
-                    "unitId": unitId,
-                    "doorplate": doorplate,
-                },success: function (data) {
-                    if (!data.success) {
-                        alert(data.msg);
-                        return false;
-                    } else {
-                        $.ajax({
-                            url: '/home/saveUser.json',
-                            type: "post",
-                            data: {
-                                "userId": userId,
-                                "userType": $('input:radio:checked').val(),
-                                "linkman": $("#linkman").val(),
-                                "phone": $("#phone").val(),
-                                "city": city,
-                                "area": area,
-                                "unitId": unitId,
-                                "uptownId": uptownId,
-                                "doorplate": doorplate,
-                            },success: function (date) {
-                                window.location.href = "/user/home.html?userId=" + userId;
-                            }
-                        });
-                    }
-                }
-            });
-        } else {
-            $.ajax({
-                url: '/home/saveUser.json',
-                type: "post",
-                data: {
-                    "userId": userId,
-                    "userType": $('input:radio:checked').val(),
-                    "linkman": $("#linkman").val(),
-                    "phone": $("#phone").val(),
-                    "city": city,
-                    "area": area,
-                    "unitId": unitId,
-                    "uptownId": uptownId,
-                    "doorplate": doorplate,
-                },success: function (date) {
-                    window.location.href = "/user/home.html?userId=" + userId;
+        $.ajax({
+            url: '/home/checkHouseId.json',
+            type: "post",
+            data: {
+                "unitId": unitId,
+                "doorplate": doorplate,
+            },success: function (data) {
+                if (!data.success) {
+                    alert(data.msg);
+                    return false;
+                } else {
+                    $.ajax({
+                        url: '/home/saveUser.json',
+                        type: "post",
+                        data: {
+                            "userId": userId,
+                            "userType": $('input:radio:checked').val(),
+                            "linkman": $("#linkman").val(),
+                            "phone": $("#phone").val(),
+                            "city": city,
+                            "area": area,
+                            "unitId": unitId,
+                            "uptownId": uptownId,
+                            "doorplate": doorplate,
+                        },success: function (date) {
+                            window.location.href = "/user/home.html?userId=" + userId + "&userType=" + $('input:radio:checked').val();
+                        }
+                    });
                 }
-            });
-        }
+            }
+        });
     }
 
     function goOn() {
@@ -367,10 +345,6 @@
         console.log(userType)
         console.log(linkman)
         console.log(phone)
-        if (userType == 2) {
-            $("#unitMsg").hide();
-            $("#doorplateMsg").hide();
-        }
     }
 
     function back() {

whepi-ui/templates/wuye/home.ftl

@@ -28,38 +28,18 @@
 <script>
     <#include "/wuye/fabu.js" />
     <#include "/wuye/qiuzhu.js" />
-    (function ($) {
-        // $(function () {
-        //     $('.weui-navbar__item').on('click', function () {
-        //         $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
-        //         //内容切换
-        //         var moduleClass = jQuery(this).attr("module");
-        //         var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
-        //         $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
-        //         var data_toggle = jQuery(this).attr("target");
-        //         $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
-        //     });
-        // });
-        //
-        // $(function () {
-        //     $("#ground").bind("click", function () {
-        //         if ($("#Gj").val() == "off") {
-        //             $("#Gj").val("on");
-        //             console.log("关闭查看所有");
-        //             qzMy_help(1);
-        //         } else {
-        //             $("#Gj").val("off");
-        //             console.log("查看已解决的");
-        //             qzMy_help(2);
-        //         }
-        //     });
-        // });
-    })(jQuery);
 
+    (function ($) {
+        $(function () {
 
-    //小区求助信息的展示
-    function familyClick() {
+        });
+        var userId = $("#userId").val;
 
-    }
+    <#--console.log('ssssss');-->
+    <#--var tasks = ${taskList!'[]'};-->
+        // console.log('ssssss', tasks);
+        // console.log('asdsfdgfhjghfgdf');
+        qiuzhu_init();
+    })(jQuery);
 
 </script>

whepi-ui/templates/wuye/qiuzhu.ftl

@@ -39,65 +39,4 @@
             </div>
         </div>
     </div>
-</div>
-
-<script>
-    (function ($) {
-        familyClick();
-    })(jQuery);
-
-    //用户求助信息统计
-    function familyClick() {
-        $('#userHelpAnaly').empty();//清除节点
-        $.ajax({
-            url: '/wuye/userHelpAnaly',
-            data: {queryDate: '2020-02-05'},
-            type: 'GET',
-            success: function (data) {
-                console.log(data);
-                if (data.data.length > 0) {
-                    hasData = true;
-                    getHelpData(data);
-                } else {
-
-                }
-            },
-            error: function () {
-            }
-        });
-    }
-
-    function getHelpData(data) {
-        $('#userHelpAnaly').append($('<div class="weui-flex"> \n' +
-                '                   <div class="weui-flex__item">\n' +
-                '                       <div class="placeholder">今日新增</div>\n' +
-                '                       <div>' + data.todayAdd + '</div>\n' +
-                '                   </div>\n' +
-                '                   <div class="weui-flex__item">\n' +
-                '                       <div class="placeholder">今日已处理</div>\n' +
-                '                       <div>\' + data.todayDo + \'</div>\n' +
-                '                   </div>\n' +
-                '                   <div class="weui-flex__item">\n' +
-                '                   <div class="placeholder">今日未处理</div>\n' +
-                '                       <div>\' + data.todayDonot + \'</div>\n' +
-                '                   </div>\n' +
-                '               <div>'));
-    }
-
-    //我的求助的页面展示
-    function dateSelect() {
-        weui.datePicker({
-            start: 1990,
-            end: 2000,
-            defaultValue: [1991, 6, 9],
-            onChange: function (result) {
-                console.log(result);
-            },
-            onConfirm: function (result) {
-                console.log(result);
-            },
-            id: 'datePicker'
-        });
-    }
-</script>
-
+</div>

whepi-ui/templates/wuye/qiuzhu.js

@@ -1,58 +1,58 @@
 function qiuzhu_init() {
-
-}
-
-function shValue(v) {
-  $('#qzHS').append($('<a href="javascript:void(0);" 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">业主1号</p>\n' +
-    '                        <p class="weui-media-box__desc">' + timestampToTime(v.timeUpdate) + '</p>\n' +
-    '                    </div>\n' +
-    '                    <div class="weui-cell ">\n' +
-    '                        <div class="weui-cell__bd">\n' +
-    '                            <textarea class="weui-textarea" rows="1" readonly >' + v.replyContent + '</textarea>\n' +
-    '                            <div class="weui-textarea-counter"></div>\n' +
-    '                        </div>\n' +
-    '                    </div>\n' +
-    '                </div>\n' +
-    '            </a>\n<br />'));
+  //统计求助及处理数据
+  analyData();
+  //求组信息列表
 }
 
-function timestampToTime(timestamp) {
-  var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-  var Y = date.getFullYear() + '/';
-  var M = ((date.getMonth() + 1) < 10) ? ('0' + (date.getMonth() + 1) + '/') : ((date.getMonth() + 1) + '/');
-  var D = (date.getDate() < 10) ? ('0' + date.getDate() + ' ') : (date.getDate() + ' ');
-  var h = (date.getHours() < 10) ? ('0' + date.getHours() + ':') : (date.getHours() + ':');
-  var m = (date.getMinutes() < 10) ? ('0' + date.getMinutes() + ':') : (date.getMinutes() + ':');
-  var s = (date.getSeconds() < 10) ? ('0' + date.getSeconds()) : (date.getSeconds());
-  return Y + M + D + h + m + s;
-}
-
-function family_init() {
-  /*$('#family').on('click',function () {
-    $('#familyDisplay')[0].style.display == '';
-    alert($('#familyDisplay')[0].style.display == 'none')
-    if($('#familyDisplay')[0].style.display == 'none'){
-      $('#notPlay').toggle();
-
-    }else{
-      $('#familyDisplay')[0].style.display == '';
-      $('#notPlay')[0].style.display == 'none';
+function analyData() {
+  $('#userHelpAnaly').empty();//清除节点
+  $.ajax({
+    url: '/wuye/userHelpAnaly',
+    data: {queryDate: '2020-02-05', userId: 0},
+    type: 'GET',
+    success: function (data) {
+      console.log(data);
+      if (data.data != null && data.data != undefined) {
+        hasData = true;
+        getHelpData(data.data);
+      } else {
+
+      }
+    },
+    error: function () {
     }
-
-
-  })*/
+  });
 }
 
-function submit_back() {
-  $('#back').on('click', function () {
-    if ($('#notPlay')[0].style.display = 'none') {
-      $('#notPlay')[0].style.display = '';
-      $('#play').toggle();
-
-    }
+function getHelpData(data) {
+  $('#userHelpAnaly').append($('<div class="weui-flex"> \n' +
+    '                   <div class="weui-flex__item">\n' +
+    '                       <div class="placeholder">已解决总数</div>\n' +
+    '                       <div>' + data.totalDo + '</div>\n' +
+    '                   </div>\n' +
+    '                   <div class="weui-flex__item">\n' +
+    '                       <div class="placeholder">已处理总数</div>\n' +
+    '                       <div>' + data.totalDoing + '</div>\n' +
+    '                   </div>\n' +
+    '                   <div class="weui-flex__item">\n' +
+    '                   <div class="placeholder">未处理总数</div>\n' +
+    '                       <div>' + data.totalDonot + '</div>\n' +
+    '                   </div>\n' +
+    '               </div>'));
+}
 
-  })
+//我的求助的页面展示
+function dateSelect() {
+  weui.datePicker({
+    start: 1990,
+    end: 2000,
+    defaultValue: [1991, 6, 9],
+    onChange: function (result) {
+      console.log(result);
+    },
+    onConfirm: function (result) {
+      console.log(result);
+    },
+    id: 'datePicker'
+  });
 }

whepi-ui/templates/yeweihui/home.ftl

@@ -15,11 +15,11 @@
     </div>
     <div class="weui-tabbar">
         <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_button.png" alt=""> </div>
+            <div class="weui-tabbar__icon"> <img src="/static/images/wx/order.png" alt=""> </div>
             <p class="weui-tabbar__label">每日上报</p>
         </a>
         <a href="#tab2" class="weui-tabbar__item">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_msg.png" alt=""> </div>
+            <div class="weui-tabbar__icon"> <img src="/static/images/wx/customer_service.png" alt=""> </div>
             <p class="weui-tabbar__label">求助</p>
         </a>
         <#--<a href="#tab3" class="weui-tabbar__item">-->

whepi-ui/templates/yeweihui/qiuzhu.ftl

@@ -1,4 +1,18 @@
 <div class="page__bd">
+    <header class="demos-header">
+        <h1 class="demos-title">社区求助</h1>
+    </header>
+<#--    <div style="width: 100vw; height: 30vw;display: flex; flex-direction: row;">-->
+<#--        <div style="width: 30%;">-->
+<#--            <img src="/static/images/yeweihui/love.jpeg" alt="" style="height: 100%; width: 100%;" />-->
+<#--        </div>-->
+<#--        <div style="width: 70%;">-->
+<#--            <div style="text-align: center; height: 20%;">2020-02-02</div>-->
+<#--            <div style="background-color: #2D93CA; height: ">-->
+<#--                竖式是是-->
+<#--            </div>-->
+<#--        </div>-->
+<#--    </div>-->
     <div class="weui-tab">
         <div class="weui-navbar">
             <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1" module="qiu_zhu">
@@ -11,7 +25,7 @@
                 已处理
             </a>
         </div>
-        <div class="weui-tab__panel">
+        <div class="weui-tab__panel content">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
 
                 <div class="weui-btn-area"  style="display: flex; flex-direction: row; justify-content: space-between;">

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -3,7 +3,6 @@ function qiuzhu_init() {
   makeUI(taskList);
 
   $('#qz_btnQZ1').on('click', function () {
-
     $.ajax({
       url: '/yeweihui/qiuzhu/list.json',
       type: 'post',
@@ -22,7 +21,6 @@ function qiuzhu_init() {
   });
 
   $('#qz_btnQZ2').on('click', function () {
-
     $.ajax({
       url: '/yeweihui/qiuzhu/list.json',
       type: 'post',
@@ -87,7 +85,7 @@ function makeUI(tasks) {
 function makeList1(tasks) {
 
   $('#qz_list1').empty();
-  if (tasks.length <= 0) {
+  if (tasks == undefined || tasks.length <= 0) {
     $('#qz_list1').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
@@ -111,7 +109,7 @@ function makeList1(tasks) {
 function makeList2(tasks) {
 
   $('#qz_list2').empty();
-  if (tasks.length <= 0) {
+  if (tasks == undefined || tasks.length <= 0) {
     $('#qz_list2').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
@@ -135,7 +133,7 @@ function makeList2(tasks) {
 function makeList3(tasks) {
 
   $('#qz_list3').empty();
-  if (tasks.length <= 0) {
+  if (tasks == undefined || tasks.length <= 0) {
     $('#qz_list3').append('<div class="weui-loadmore weui-loadmore_line">\n' +
         '    <span class="weui-loadmore__tips">暂无数据</span>\n' +
         '</div>');
@@ -158,5 +156,5 @@ function makeList3(tasks) {
 }
 
 function itemSelect(taskId) {
-  window.location.href = "/yeweihui/qiuzhuDetail.html?taskId=" + taskId;
+  window.location.href = "/yeweihui/qiuzhuDetail.html?taskId=" + taskId + "&userId=" + $('#userId').val();
 }

whepi-ui/templates/yeweihui/qiuzhuDetail.ftl

@@ -5,14 +5,14 @@
 
     <div class="weui-btn-area">
 
-        <h4 class="weui-media-box__title">求助标题</h4>
-        <p class="weui-media-box__desc">${ task.taskTitle }</p>
+        <p class="weui-media-box__desc">求助标题</p>
+        <h4 class="weui-media-box__title">${ task.taskTitle }</h4>
         <br>
-        <h4 class="weui-media-box__title">求助对象</h4>
-        <p class="weui-media-box__desc">${ task.taskTarget }</p>
+        <p class="weui-media-box__desc">求助对象</p>
+        <h4 class="weui-media-box__title">${ task.taskTarget }</h4>
         <br>
-        <h4 class="weui-media-box__title">求助内容</h4>
-        <p class="weui-media-box__desc">${ task.remark }</p>
+        <p class="weui-media-box__desc">求助内容</p>
+        <h4 class="weui-media-box__title">${ task.remark }</h4>
         <br>
         <#if task.taskStatus == 1>
             <div class="weui-btn-area">
@@ -20,13 +20,13 @@
             </div>
         </#if>
         <#if task.taskStatus == 2>
-            <div class="weui-btn_primary" style="display: flex; justify-content: center; height: 5vh; line-height: 5vh">
+            <div class="weui-btn_primary" style="margin-bottom: 3vh; 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 class="weui-btn_primary" style="display: flex; justify-content: center; height: 5vh; line-height: 5vh">
+            <div class="weui-btn_primary" style="margin-bottom: 3vh; display: flex; justify-content: center; height: 5vh; line-height: 5vh">
                 <h4 class="weui-media-box__title">已处理完成</h4>
             </div>
             <div id="qz_done_detail"></div>
@@ -52,10 +52,9 @@
 
 <script>
     var task = ${taskJson};
-
+    var userId = ${userId};
     (function ($) {
 
-        console.log('详情页' + task);
         if (task.taskStatus == 2 || task.taskStatus == 3) {
             getdealdetail();
         }
@@ -72,8 +71,6 @@
 
     function send() {
 
-        let userId = $('#userId').val() ? $('#userId').val() : "10000";
-
         let qzcontent = $('#qz_content').val();
         if (qzcontent.length <= 0){
             alert("请输入内容");
@@ -92,6 +89,7 @@
             },
             success: function (data) {
                 $.closePopup();
+                history.back();
             },
             error: function () {
                 $.alert("网络异常");
@@ -112,15 +110,15 @@
                 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>');
+                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">回复' + i + '</p>\n' +
+                            '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><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>');
+                        $("#qz_done_detail").append('<p class="weui-media-box__desc">回复' + i + '</p>\n' +
+                            '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
                     }
                 }
             },

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

@@ -19,7 +19,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
 
     List<MsReport> selectByReportDate(@Param("reportDate") String reportDate,@Param("userCreate") Long userCreate);
 
-    @Select("select property_id from sys_user_role where user_id=#{userId}")
+    @Select("select property_id from sys_user_role where user_id=#{userId} and role_id=1")
     long selectHouseIdByUserId(@Param("userId") Long userId);
 
     //

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

@@ -8,12 +8,13 @@ import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 @Repository
 public interface QzTaskDao extends BaseMapper<QzTask> {
 
-    List<QzTask> selectAll();
+    List<QzTask> selectAll(Long uptownId);
 
     QzTask queryByTaskId(Long taskId);
 
@@ -31,13 +32,15 @@ public interface QzTaskDao extends BaseMapper<QzTask> {
     //当前用户门牌id 门牌号
     QzTask selectHome(@Param("userId") Long userId);
 
-    @Select("select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate}\n" +
-            "union all select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate} and task_status=3\n" +
-            "union all select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate} and task_status in (1,2)\n" +
-            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day)\n" +
-            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day) and task_status=3\n" +
-            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day) and task_status in (1,2);\n" +
-            "")
-    List<Long> queryUserHelpAnaly(@Param("queryDate") String queryDate);
+    // todo 当用户是物业角色时的role_id尚未确认
+    @Select("SELECT task_status,count(1) as num from qz_task a \n" +
+            "inner join sys_uptown_house b on b.house_id=a.house_id\n" +
+            "inner join sys_uptown_unit c on c.unit_id=b.unit_id\n" +
+            "inner join sys_uptown d on d.uptown_id=c.uptown_id\n" +
+            //"where d.uptown_id=#{uptownId} and DATE_FORMAT(a.time_create,'%Y-%m-%d')=#{queryDate}\n" +
+            //"where \n" +
+            //"d.uptown_id in (select property_id from sys_user_role where role_id=4 and user_id=#{userId})\n" +
+            "group by task_status")
+    List<Map> queryUserHelpAnaly(@Param("userId") Long userId, @Param("queryDate") String queryDate);
 
 }

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

@@ -8,6 +8,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
 
+import java.math.BigDecimal;
+
 /**
  * @Author: xielianghe
  * @Date: 2020/2/4 14:54
@@ -27,17 +29,47 @@ public class MsSuspected {
     @TableField("user_name")
     private String userName;
 
-    @TableField("family_relative")
-    private Integer familyRelative;
+    @TableField("grender")
+    private Integer grender;
+
+    @TableField("age")
+    private Integer age;
+
+    @TableField("family_status")
+    private Integer familyStatus;
+
+    @TableField("status_desp")
+    private String statusDesp;
 
     @TableField("medical")
     private Integer medical;
 
-    @TableField("condition_status")
-    private String conditionStatus;
+    @TableField("temperature")
+    private BigDecimal temperature;
+
+    @TableField("cough")
+    private Integer cough;
+
+    @TableField("muscle")
+    private Integer muscle;
+
+    @TableField("dyspnea")
+    private Integer dyspnea;
+
+    @TableField("chest")
+    private Integer chest;
+
+    @TableField("fatigue")
+    private Integer fatigue;
+
+    @TableField("diarrhea")
+    private Integer diarrhea;
+
+    @TableField("diarrhea_num")
+    private Integer diarrheaNum;
 
-    @TableField("remarks")
-    private String remarks;
+    @TableField("others")
+    private String others;
 
     @TableField("user_create")
     private Long userCreate;

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

@@ -57,6 +57,11 @@ public class QzTask implements Serializable {
     private Long houseId;
 
     /**
+     * 小区id
+     */
+    private Long uptownId;
+
+    /**
      * 新增人
      */
     private Long userCreate;

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

@@ -41,4 +41,19 @@ public class UserHelpAnaly implements Serializable {
      */
     private Long monthDonot;
 
+    /**
+     * 已解决总数
+     */
+    private Long totalDo = 0L;
+
+    /**
+     * 已处理总数
+     */
+    private Long totalDoing = 0L;
+
+    /**
+     * 未处理总数
+     */
+    private Long totalDonot = 0L;
+
 }

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

@@ -6,7 +6,6 @@ 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;

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -32,7 +33,9 @@ public class MsSuspectedService {
 
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addSuspected(String userName, String conditionStatus, Integer medical, String remarks, Long userCreate) {
+    public void addSuspected(String userName, Integer grender, Integer age, Integer familyStatus,
+                             String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
+                             Integer dyspnea, Integer chest, Integer fatigue, Integer diarrhea, Integer diarrheaNum, String others, Long userCreate) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
@@ -64,10 +67,19 @@ public class MsSuspectedService {
         msSuspected.setSuspectedId(IdWorker.getId());
         msSuspected.setReportId(reportId);
         msSuspected.setUserName(userName);
-        msSuspected.setFamilyRelative(1);//默认为家人
-        msSuspected.setConditionStatus(conditionStatus);
-        msSuspected.setMedical(medical);
-        msSuspected.setRemarks(remarks);
+        msSuspected.setGrender(grender);//默认为家人
+        msSuspected.setAge(age);
+        msSuspected.setFamilyStatus(familyStatus);
+        msSuspected.setStatusDesp(statusDesp);
+        msSuspected.setTemperature(temperature);
+        msSuspected.setCough(cough);
+        msSuspected.setMuscle(muscle);
+        msSuspected.setDiarrhea(dyspnea);
+        msSuspected.setChest(chest);
+        msSuspected.setFatigue(fatigue);
+        msSuspected.setDiarrhea(diarrhea);
+        msSuspected.setDiarrheaNum(diarrheaNum);
+        msSuspected.setOthers(others);
         msSuspected.setUserCreate(userCreate);
         msSuspected.setTimeCreate(DateTime.now());
         msSuspected.setUserUpdate(userCreate);
@@ -92,7 +104,6 @@ public class MsSuspectedService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void deleteSuspected(Long suspectedId) {
 
-
         MsSuspected msSuspected = msSuspectedMapper.selectById(suspectedId);
         if (msSuspected != null) {
             msSuspectedMapper.deleteById(suspectedId);

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

@@ -19,8 +19,8 @@ public class QzTaskService {
   @Autowired
   private QzTaskDao qzTaskDao;
 
-  public List<QzTask> selectAll() {
-    return qzTaskDao.selectAll();
+  public List<QzTask> selectAll(Long uptownId) {
+    return qzTaskDao.selectAll(uptownId);
   }
 
   public List<QzTask> queryByHouseNumber(String houseNumber, Integer status) {
@@ -46,12 +46,14 @@ public class QzTaskService {
     //当前用户的门牌id  门牌号
     QzTask qzTask1 = qzTaskDao.selectHome(userId);
     qzTak.setHouseId(qzTask1.getHouseId());
+    //获取当前小区id
+    qzTak.setUptownId(qzTask1.getUptownId());
     qzTak.setHouseNumber(qzTask1.getHouseNumber());
     qzTak.setUserCreate(userId);
     qzTak.setTimeCreate(new DateTime());
     qzTak.setUserUpdate(userId);
     qzTak.setTimeUpdate(new DateTime());
-    return 1;
+    return qzTaskDao.insert(qzTak);
   }
 
   public List<QzTask> queryQzTaskByStatus(Integer taskStatus) {

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

@@ -62,28 +62,27 @@ public class UserOpenService {
         UserRole userRole = new UserRole();
         userRole.setUrId(IdWorker.getId());
         userRole.setUserId(userId);
-        userRole.setRoleId(userType);
+        userRole.setRoleId(1);
         userRole.setUserCreate(userId);
         userRole.setUserUpdate(userId);
-        if (userType == 1) {
-            UptownHouse uptownHouse = new UptownHouse();
-            uptownHouse.setHouseId(IdWorker.getId());
-            uptownHouse.setUnitId(unitId);
-            uptownHouse.setDoorplate(doorplate);
-            uptownHouse.setStatus(1);
-            uptownHouseMapper.insert(uptownHouse);
-            UptownHome uptownHome = new UptownHome();
-            uptownHome.setHouseId(uptownHouse.getHouseId());
-            uptownHome.setLinkman(linkman);
-            uptownHome.setPhone(phone);
-            uptownHome.setYoung(0);
-            uptownHome.setMiddle(0);
-            uptownHome.setOld(0);
-            uptownHome.setRemark("");
-            uptownHome.setStatus(1);
-            uptownHomeMapper.insert(uptownHome);
-            userRole.setPropertyId(uptownHome.getHouseId());
-        } else if (userType == 2) {
+        UptownHouse uptownHouse = new UptownHouse();
+        uptownHouse.setHouseId(IdWorker.getId());
+        uptownHouse.setUnitId(unitId);
+        uptownHouse.setDoorplate(doorplate);
+        uptownHouse.setStatus(1);
+        uptownHouseMapper.insert(uptownHouse);
+        UptownHome uptownHome = new UptownHome();
+        uptownHome.setHouseId(uptownHouse.getHouseId());
+        uptownHome.setLinkman(linkman);
+        uptownHome.setPhone(phone);
+        uptownHome.setYoung(0);
+        uptownHome.setMiddle(0);
+        uptownHome.setOld(0);
+        uptownHome.setRemark("");
+        uptownHome.setStatus(1);
+        uptownHomeMapper.insert(uptownHome);
+        userRole.setPropertyId(uptownHome.getHouseId());
+        if (userType == 2) {
             Owner owner = new Owner();
             owner.setOwnerId(IdWorker.getId());
             owner.setUptownId(uptownId);
@@ -92,7 +91,14 @@ public class UserOpenService {
             owner.setUserCreate(userId);
             owner.setUserUpdate(userId);
             ownerMapper.insert(owner);
-            userRole.setPropertyId(owner.getOwnerId());
+            UserRole userRole1 = new UserRole();
+            userRole1.setUrId(IdWorker.getId());
+            userRole1.setUserId(userId);
+            userRole1.setRoleId(userType);
+            userRole1.setUserCreate(userId);
+            userRole1.setUserUpdate(userId);
+            userRole1.setPropertyId(owner.getOwnerId());
+            userRoleMapper.insert(userRole1);
         }
         userRoleMapper.insert(userRole);
     }

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

@@ -2,11 +2,13 @@ package com.bofeng.service;
 
 import com.bofeng.dao.QzTaskDao;
 import com.bofeng.entity.UserHelpAnaly;
+import com.yvan.platform.Conv;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional(readOnly = true)
@@ -15,16 +17,26 @@ public class WuYeService {
     @Autowired
     private QzTaskDao qzTaskDao;
 
-    public UserHelpAnaly queryUserHelpAnaly(String queryDate) {
+    public UserHelpAnaly queryUserHelpAnaly(Long userId, String queryDate) {
         UserHelpAnaly userHelpAnaly = new UserHelpAnaly();
-        List<Long> lstAnaly = qzTaskDao.queryUserHelpAnaly(queryDate);
-        if (lstAnaly != null && lstAnaly.size() == 6) {
-            userHelpAnaly.setTodayAdd(lstAnaly.get(0));
-            userHelpAnaly.setTodayDo(lstAnaly.get(1));
-            userHelpAnaly.setTodayDonot(lstAnaly.get(2));
-            userHelpAnaly.setMonthAdd(lstAnaly.get(3));
-            userHelpAnaly.setMonthDo(lstAnaly.get(4));
-            userHelpAnaly.setMonthDonot(lstAnaly.get(5));
+        List<Map> lstAnaly = qzTaskDao.queryUserHelpAnaly(userId, queryDate);
+        String status = "";
+        if (lstAnaly != null && lstAnaly.size() > 0) {
+            for (Map map : lstAnaly) {
+                status = map.get("task_status").toString();
+                if (status.equals("3")) {
+                    userHelpAnaly.setTotalDo(Conv.NL(map.get("num")));
+                    continue;
+                }
+                if (status.equals("2")) {
+                    userHelpAnaly.setTotalDoing(Conv.NL(map.get("num")));
+                    continue;
+                }
+                if (status.equals("1")) {
+                    userHelpAnaly.setTotalDonot(Conv.NL(map.get("num")));
+                    continue;
+                }
+            }
         }
         return userHelpAnaly;
     }

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

@@ -49,8 +49,9 @@ public class HomeController {
     public ModelAndView home(ModelMap model) throws JsonProcessingException {
         model.put("user", new JsonWapper("{\"www\": \"er\"}"));
         //初始化今日日报
-        //UserOpen userOpen = homeService.getUserOpen();
-        Long userId = 1224706869998772226L;
+        UserOpen userOpen = homeService.getUserOpen();
+        Long userId = userOpen.getUserId();
+        //Long userId = 1224706869998772226L;
         MsReport msReport = msReportService.getReportByDateNow(userId);
         model.put("msReport", new JsonWapper(msReport));
         return new ModelAndView("/home/home.ftl", model);

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

@@ -2,7 +2,6 @@ package com.bofeng.wx.controller;
 
 
 import com.bofeng.entity.*;
-import com.bofeng.service.HomeService;
 import com.bofeng.service.MsReportService;
 import com.bofeng.service.MsSuspectedService;
 import com.yvan.Model;
@@ -11,9 +10,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 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.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -26,66 +25,69 @@ import java.util.List;
 public class MsReportController {
 
     @Autowired
-    private HomeService homeService;
-
-    @Autowired
     private MsSuspectedService msSuspectedService;
     @Autowired
     private MsReportService msReportService;
 
     //添加家人
-    @PostMapping("/home/addRibao.json")
-    public ModelAndView saveUser(HttpServletRequest request) {
-        //UserOpen userOpen = homeService.getUserOpen();
-        long userId = 1224706869998772226L;
+    @PostMapping("/home/addRibao")
+    public Integer saveUser(HttpServletRequest request) {
+        //初始化今日日报
+        Long userCreate = Long.parseLong(request.getParameter("userCreate"));
         String userName = request.getParameter("userName");
-        String conditionStatus = request.getParameter("conditionStatus");
+        Integer grender = Integer.parseInt(request.getParameter("grender"));
+        Integer age = Integer.parseInt(request.getParameter("age"));
+        Integer familyStatus = Integer.parseInt(request.getParameter("familyStatus"));
+        String statusDesp = request.getParameter("statusDesp");
         Integer medical = Integer.parseInt(request.getParameter("medical"));
-        String remarks = request.getParameter("remarks");
-        msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks, userId);
-        return new ModelAndView("/home/home.ftl");
+        BigDecimal temperature = new BigDecimal(request.getParameter("temperature"));
+        Integer cough = Integer.parseInt(request.getParameter("cough"));
+        Integer muscle = Integer.parseInt(request.getParameter("muscle"));
+        Integer dyspnea = Integer.parseInt(request.getParameter("dyspnea"));
+        Integer chest = Integer.parseInt(request.getParameter("chest"));
+        Integer fatigue = Integer.parseInt(request.getParameter("fatigue"));
+        Integer diarrhea = Integer.parseInt(request.getParameter("diarrhea"));
+        Integer diarrheaNum = Integer.parseInt(request.getParameter("diarrheaNum"));
+        String others = request.getParameter("others");
+        msSuspectedService.addSuspected(userName, grender, age, familyStatus,statusDesp,medical,temperature,cough,muscle,dyspnea,chest,fatigue,diarrhea,diarrheaNum, others, userCreate);
+        return 1;
     }
 
-    //删除家人
-    @PostMapping("/home/deleteSuspected.json")
-    public ModelAndView deleteSuspected(HttpServletRequest request) {
+    //删除家人病例
+    @PostMapping("/home/deleteSuspected")
+    public Integer deleteSuspected(HttpServletRequest request) {
         Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
         msSuspectedService.deleteSuspected(suspectedId);
-        return new ModelAndView("/home/home.ftl");
+        return 1;
     }
 
-    //获取家人
+    //根据登录人获取家人
     @GetMapping("/home/home/queryRibao")
-    public Model<List<MsSuspected>> queryRibao() {
-        //UserOpen userOpen = homeService.getUserOpen();
-        long userId = 1224706869998772226L;
+    public Model<List<MsSuspected>> queryRibao(@Pd(name = "userCreate") Long userCreate) {
         Date t = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         String reportDate = df.format(t);
-        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userId));
+        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userCreate));
     }
 
-    //获取家人
+    //根据日报获取家人
     @GetMapping("/home/home/queryRibaoRefresh")
-    public Model<List<MsSuspected>> queryRibao(@Pd(name = "reportId") Long reportId) {
+    public Model<List<MsSuspected>> queryRibaoRefresh(@Pd(name = "reportId") Long reportId) {
         return Model.newSuccess(msReportService.getByReportId(reportId));
     }
 
     //全家报平安
-    @PostMapping("/home/addReport.json")
-    public ModelAndView addReport(HttpServletRequest request) {
-        //UserOpen userOpen = homeService.getUserOpen();
-        long userId = 1224706869998772226L;
+    @PostMapping("/home/addReport")
+    public Integer addReport(HttpServletRequest request) {
+        Long userCreate = Long.parseLong(request.getParameter("userCreate"));
         String safetyNum = request.getParameter("safetyNum");
-        msReportService.addReport(safetyNum, userId);
-        return new ModelAndView("/home/home.ftl");
+        msReportService.addReport(safetyNum, userCreate);
+        return 1;
     }
 
-    //获取家人
+    //根据日期获取家人
     @GetMapping("/home/home/queryRibaoReportDate")
-    public Model<List<MsSuspected>> queryRibaoReportDate(@Pd(name = "reportDate") String reportDate) {
-        //UserOpen userOpen = homeService.getUserOpen();
-        long userId = 1224706869998772226L;
-        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userId));
+    public Model<List<MsSuspected>> queryRibaoReportDate(@Pd(name = "reportDate") String reportDate, @Pd(name = "userCreate") Long userCreate) {
+        return Model.newSuccess(msReportService.getByReportReportDate(reportDate, userCreate));
     }
 }

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

@@ -46,30 +46,53 @@ public class UserOpenController {
     private MsReportService msReportService;
 
     @GetMapping("/user/home.html")
-    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) throws JsonProcessingException {
+    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId,
+                             @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
         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(1225325493987995649L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1225325493987995649L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
+            if (list.size() == 0) {
+                return new ModelAndView("/user/home.ftl", model);
+            }
+            if (list.size() == 1) {
+                MsReport msReport =msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
+                return new ModelAndView("/home/home.ftl", model);
+            }
+            if (list.size() == 2) {
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
         } else {
             model.put("user", userOpenMapper.selectByUserId(userId));
-            list = userRoleMapper.getUserRoleByUserId(userId);
             model.put("user_id", "\""+userId+"\"");
-        }
-        if (list.size() == 0) {
-            return new ModelAndView("/user/home.ftl", model);
-        } else if (list.size()>0) {
-            if (list.get(0).getRoleId() == 1) {
+            if (userType == 1) {
                 MsReport msReport =msReportService.getReportByDateNow(userId);
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
-            } else if(list.get(0).getRoleId() == 2) {
-                List<QzTask> taskList = qzTaskService.selectAll();
+            } else if (userType == 2) {
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        }
+        return null;
+    }
+
+    @GetMapping("/user/homeIndex.html")
+    public ModelAndView homeIndex(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId,
+                             @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
+        if (userId != 0 && userType != 0) {
+            model.put("user_id", "\"" + userId + "\"");
+            if (userType == 1) {
+                MsReport msReport = msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
+                return new ModelAndView("/home/home.ftl", model);
+            } else if (userType == 2) {
+                List<QzTask> taskList = qzTaskService.selectAll(2L);
                 model.put("taskList", YvanUtil.toJsonPretty(taskList));
                 List<sysUptownUnit> rbList = rbService.selectAll(userId);
                 model.put("rbList", YvanUtil.toJsonPretty(rbList));
@@ -113,24 +136,8 @@ public class UserOpenController {
         String phone = request.getParameter("phone");
         Integer area = Integer.parseInt(request.getParameter("area"));
         Long uptownId = Long.parseLong(request.getParameter("uptownId"));
-        Long unitId = 0L;
-        String doorplate = "";
-        if (userType == 1) {
-            unitId = Long.parseLong(request.getParameter("unitId"));
-            doorplate = request.getParameter("doorplate");
-        }
+        Long unitId = Long.parseLong(request.getParameter("unitId"));
+        String doorplate = request.getParameter("doorplate");
         userOpenService.saveUserInfo(userId,userType,linkman,phone,area,uptownId,unitId,doorplate);
-//        UserOpen userOpen = userOpenMapper.selectByUserId(userId);
-//        model.put("user", userOpen);
-//        if (userType == 1) {
-//            return new ModelAndView("redirect:/home/home.html");
-//        } else if (userType == 2) {
-//            List<QzTask> taskList = qzTaskService.selectAll();
-//            model.put("taskList", YvanUtil.toJsonPretty(taskList));
-//            return new ModelAndView("redirect:/yeweihui/home.html");
-//        } else {
-//            return null;
-//        }
-
     }
 }

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

@@ -37,7 +37,7 @@ public class WuYeController {
         queryParam.put("userId", "12345677");
         queryParam.put("statistics", "M");
 
-        List<QzTask> taskList = qzTaskService.selectAll();
+        List<QzTask> taskList = qzTaskService.selectAll(2L);
 //        List<sysUptownUnit> rbList = rbService.selectAll();
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
 //        model.put("rbList", YvanUtil.toJsonPretty(rbList));
@@ -67,8 +67,8 @@ public class WuYeController {
 
     //小区求助的查看
     @GetMapping("/wuye/userHelpAnaly")
-    public Model<UserHelpAnaly> taskQuery(@Pd(name = "queryDate") String queryDate) {
-        return Model.newSuccess(wuYeService.queryUserHelpAnaly(queryDate));
+    public Model<UserHelpAnaly> taskQuery(@Pd(name = "queryDate") String queryDate, @Pd(name = "userId") Long userId) {
+        return Model.newSuccess(wuYeService.queryUserHelpAnaly(userId, queryDate));
     }
 
 }

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

@@ -1,5 +1,10 @@
 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.service.HomeService;
 import com.bofeng.entity.*;
 import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
@@ -34,6 +39,9 @@ public class YeWeiHuiController {
     @Autowired
     private QzTaskReplyService qzTaskReplyService;
 
+    @Autowired
+    private HomeService homeService;
+
     @GetMapping("/yeweihui/home.html")
     public ModelAndView yeweihui(ModelMap model,@RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
 
@@ -41,7 +49,7 @@ public class YeWeiHuiController {
         queryParam.put("userId", "12345677");
         queryParam.put("statistics", "M");
 
-        List<QzTask> taskList = qzTaskService.selectAll();
+        List<QzTask> taskList = qzTaskService.selectAll(2L);
         List<sysUptownUnit> rbList = rbService.selectAll(1224706869998772226L);
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));
@@ -50,7 +58,7 @@ public class YeWeiHuiController {
     }
 
     @GetMapping("/yeweihui/qiuzhuDetail.html")
-    public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId, ModelMap model) throws JsonProcessingException {
+    public ModelAndView qiuzhudetail(@Pd(name = "taskId") Long taskId,@Pd(name = "userId") Long userId, ModelMap model) throws JsonProcessingException {
 
         QzTask task = qzTaskService.queryByTaskId(taskId);
 //        A业委会，B居委会，C物业，D志愿者
@@ -87,6 +95,7 @@ public class YeWeiHuiController {
 
         model.put("taskJson", new JsonWapper(task));
         model.put("task", task);
+        model.put("userId", "\""+userId+"\"");
 
         return new ModelAndView("/yeweihui/qiuzhuDetail.ftl", model);
     }
@@ -94,12 +103,12 @@ public class YeWeiHuiController {
     @PostMapping("/yeweihui/qiuzhu/queryTasksByStatus.json")
     public Model queryTasksByStatus(@Pd(name = "status") Integer status) {
 
-       // List<QzTask> taskList = qzTaskService.queryQzTask(status);
+        List<QzTask> taskList = qzTaskService.queryQzTaskByStatus(status);
 
-        return Model.newSuccess(null);
+        return Model.newSuccess(taskList);
     }
 
-        @PostMapping("/yeweihui/qiuzhu/reply/add.json")
+    @PostMapping("/yeweihui/qiuzhu/reply/add.json")
     public ModelOps replyQiuzhuInsert(QzTaskReply qzTaskReply) {
 
         Integer success = qzTaskReplyService.insertQzTaskReply(qzTaskReply);
@@ -121,7 +130,12 @@ public class YeWeiHuiController {
     }
 
     @PostMapping("/yeweihui/qiuzhu/list.json")
-    public Model queryByHouseNumber(@Pd(name = "houseNumber") String houseNumber, @Pd(name = "status") Integer status) {
+    public Model queryByHouseNumber(String houseNumber, @Pd(name = "status") Integer status) {
+
+        if (houseNumber.length() <= 0) {
+            return Model.newSuccess(qzTaskService.queryQzTaskByStatus(status));
+        }
+
         List<QzTask> list = qzTaskService.queryByHouseNumber(houseNumber, status);
 
         return Model.newSuccess(list);
@@ -130,6 +144,10 @@ 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);
     }
 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bofeng.dao.QzTaskDao">
     <select id="selectAll" resultType="com.bofeng.entity.QzTask">
-    select * from qz_task
+    select * from qz_task where uptown_id=#{uptownId}
   </select>
 
     <select id="queryByTaskId" resultType="com.bofeng.entity.QzTask">
@@ -42,10 +42,11 @@
     </select>
 
     <select id="selectHome" resultType="com.bofeng.entity.QzTask">
-        SELECT b.house_id ,b.doorplate as houseNumber
-        from sys_user_role a
+        select b.house_id ,b.doorplate as houseNumber,c.uptown_id
+        FROM sys_user_role a
         INNER JOIN sys_uptown_house b on a.property_id=b.house_id
-        where a.user_id=#{userId}
+        INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
+        where a.user_id=#{userId} limit 1
     </select>
 
 </mapper>