Merge remote-tracking branch 'origin/master'

whepi-doc/login.sql

@@ -122,7 +122,7 @@ CREATE TABLE sys_uptown  (
   uptown_addr       varchar(100)  NOT NULL DEFAULT '' COMMENT '小区地址',
   longitude         varchar(20)  NOT NULL DEFAULT '' COMMENT '经度',
   latitude          varchar(20)  NOT NULL DEFAULT '' COMMENT '纬度',
-  area              varchar(20)  NOT NULL DEFAULT '' COMMENT '区',
+  area              int(11)  NOT NULL DEFAULT '0' COMMENT '区',
   status            int(11) NOT NULL DEFAULT 0 COMMENT '状态:1正常,0草稿,-1删除',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',

whepi-ui/templates/home/home.ftl

@@ -19,7 +19,7 @@
         </a>
         <a href="#tab2" class="weui-tabbar__item">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
-            <p class="weui-tabbar__label">家庭求助</p>
+            <p class="weui-tabbar__label" onclick="familyClick()">家庭求助</p>
         </a>
     <#--<a href="#tab3" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
@@ -65,4 +65,41 @@
         ribao_commit();
         submit_back();
     })(jQuery);
+
+
+    //小区求助信息的展示
+    function familyClick() {
+        $.ajax({
+            url: '/home/home/queryQzTask',
+            data: {},
+            type: 'GET',
+            success: function (data) {
+                console.log(data);
+                if (data.data.length > 0) {
+                    hasData = true;
+                    data.data.forEach(function (v) {
+                        familyValue(v);
+                    });
+                } else {
+
+                }
+            },
+            error: function () {
+            }
+        });
+    }
+
+    function familyValue(v) {
+        $('#notitle').append($('<a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form" href="javascript:;">\n' +
+                '                        <div class="weui-cell__bd" taskId="1212>\n' +
+                '                            <div class="weui-media-box weui-media-box_text" id="title">\n' +
+                '                                <p class="weui-media-box__desc" >' + v.taskTitle + '</p>\n' +
+                '                            </div>\n' +
+                '                        </div>\n' +
+                '                        <div class="weui-cell__ft"></div>\n' +
+                '                    </a>\n<br />'));
+
+    }
+
+
 </script>

whepi-ui/templates/home/qiuzhu.ftl

@@ -1,17 +1,17 @@
 <div class="page__bd">
     <div class="weui-tab">
         <div class="weui-navbar">
-            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1" module="qiu_zhu">
+            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1" module="qiu_zhu" onclick="familyClick()">
                 小区求助
             </a>
-            <a class="weui-navbar__item" target="#qz_nav2" module="qiu_zhu">
+            <a class="weui-navbar__item" target="#qz_nav2" module="qiu_zhu" id="qzMy_help" onclick="qzMy_help()">
                 我的求助
             </a>
         </div>
         <div class="weui-tab__panel">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
                 <div id="notitle">
-                    <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form" href="javascript:;">
+                    <#--<a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form" href="javascript:;">
                         <div class="weui-cell__bd">
                             <div class="weui-media-box weui-media-box_text" id="title">
                                 <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
@@ -42,7 +42,7 @@
                             </div>
                         </div>
                         <div class="weui-cell__ft"></div>
-                    </a>
+                    </a>-->
                 </div>
                 <div id="titlteZs" style="display: none">
                       <#include "/home/help.ftl" />
@@ -60,7 +60,7 @@
                     <div class="weui-cell weui-cell_active weui-cell_switch">
                         <div class="weui-cell">
                             <div class="weui-cell__bd">
-                                <input type="text" placeholder="搜素关键字"/>
+                                <input type="text" class="weui-input" placeholder="搜素关键字"/>
                             </div>
                         </div>
                         <div class="weui-cell__ft">
@@ -69,16 +69,12 @@
                         <div class="weui-cell__bd">只显示未解决</div>
                     </div>
                     <div id="family">
-                        <div class="weui-panel__bd">
-                        <#--<div>
-                            <div style="float: left">laug</div>
-                            <div style="float: right">——2018/01/03 16:20发出</div>
-                        </div>-->
-                            <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"
+                        <div class="weui-panel__bd" id="valueQz">
+                            <#--<a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"
                                href="javascript:;">
                                 <div class="weui-cell__bd">
                                     <div class="weui-media-box weui-media-box_text" id="title">
-                                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。......</p>
+                                        <p class="weui-media-box__desc">fgdfgg</p>
                                     </div>
                                 </div>
                                 <div class="weui-cell__ft"></div>
@@ -127,7 +123,7 @@
                                     </div>
                                 </div>
                                 <div class="weui-cell__ft"></div>
-                            </a>
+                            </a>-->
                         </div>
                     </div>
                 </div>
@@ -137,11 +133,13 @@
                             <div class="weui-cell weui-cell_active" id="js_cell">
                                 <div class="weui-cell__hd"><label class="weui-label">标题</label></div>
                                 <div class="weui-cell__bd weui-flex">
-                                    <input id="js_input" class="weui-input" autofocus="" type="text"
-                                           placeholder="输入求助标题" maxlength="20">
-                                <#-- <button id="js_input_clear" class="weui-btn_reset weui-btn_icon weui-btn_input-clear">
-                                     <i class="weui-icon-clear"></i>
-                                 </button>-->
+                                    <input id="Qzinput" class="weui-input" type="text"
+                                           placeholder="输入求助标题" maxlength="20" bindinput='formName' name="name"
+                                    >
+                                <#--<button id="js_input_clear" onclick="inputClick()"
+                                        class="weui-btn_reset weui-btn_icon weui-btn_input-clear">
+                                    <i class="weui-icon-clear"></i>
+                                </button>-->
                                 </div>
                             </div>
                         </div>
@@ -149,36 +147,39 @@
                     <div class="weui-form__control-area">
                         <div class="weui-cells__group weui-cells__group_form">
                             <div class="weui-cells weui-cells_checkbox">
-                                <label class="weui-cell weui-cell_active weui-check__label" for="s11">
+                                <label class="weui-cell weui-cell_active weui-check__label" for="qzf1">
                                     <div class="weui-cell__hd">
-                                        <input type="checkbox" class="weui-check" name="checkbox1" id="s11">
+                                        <input type="checkbox" class="weui-check" name="checkbox1" id="qzf1"
+                                               value="居委会">
                                         <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">
+                                <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="s12">
+                                        <input type="checkbox" name="checkbox2" class="weui-check" id="qzf2"
+                                               value="业委会">
                                         <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="s13">
+                                <label class="weui-cell weui-cell_active weui-check__label" for="qzf3">
                                     <div class="weui-cell__hd">
-                                        <input type="checkbox" name="checkbox3" class="weui-check" id="s13">
+                                        <input type="checkbox" name="checkbox3" class="weui-check" id="qzf3" value="物业">
                                         <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="s14">
+                                <label class="weui-cell weui-cell_active weui-check__label" for="qzf4">
                                     <div class="weui-cell__hd">
-                                        <input type="checkbox" name="checkbox4" class="weui-check" id="s14">
+                                        <input type="checkbox" name="checkbox4" class="weui-check" id="qzf4"
+                                               value="志愿者">
                                         <i class="weui-icon-checked"></i>
                                     </div>
                                     <div class="weui-cell__bd">
@@ -193,12 +194,14 @@
                         <div class="weui-cells weui-cells_form">
                             <div class="weui-cell ">
                                 <div class="weui-cell__bd">
-                                    <textarea class="weui-textarea" placeholder="请输入求助内容" rows="3"></textarea>
+                                    <textarea class="weui-textarea" placeholder="请输入求助内容" rows="3"
+                                              id="remarks"></textarea>
                                     <div class="weui-textarea-counter"><span>0</span>/200</div>
                                 </div>
                             </div>
                             <div class="weui-cell">
-                                <a class="weui-btn weui-btn_primary" href="javascript:" id="back">发起求助</a>
+                                <a class="weui-btn weui-btn_primary" href="javascript:" id="back"
+                                   onclick="back()">发起求助</a>
                             </div>
                             <div class="weui-cell ">
                                 <br>
@@ -206,6 +209,7 @@
                         </div>
                     </div>
                 </div>
+
                 <div id="familyDisplay" style="display: none">
                      <#include "/home/help.ftl" />
                 </div>
@@ -214,3 +218,65 @@
     </div>
 </div>
 
+<script>
+    function back() {
+        /*     $("#qzf1").val()
+             $("#qzf2").val()
+             $("#qzf3").val()
+             $("#qzf4").val()*/
+        var data = {}
+        var tep = JSON.stringify(data);
+        console.log(tep)
+        $.ajax({
+            url: '/home/home/addFimaly',
+            data: {
+                taskTitle: $("#Qzinput").val(),
+                taskTarget: $("#qzf2").val(),
+                remark: $("#remarks").val()
+            },
+            type: 'GET',
+            success: function (data) {
+
+            },
+            error: function () {
+
+            }
+        });
+    }
+
+    //我的求助的页面展示
+    function qzMy_help() {
+        $.ajax({
+            url: '/home/home/queryQzTask',
+            data: {},
+            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) {
+        $('#valueQz').append($(' <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"\n' +
+                '                               href="javascript:;">\n' +
+                '                                <div class="weui-cell__bd">\n' +
+                '                                    <div class="weui-media-box weui-media-box_text" id="title">\n' +
+                '                                        <p class="weui-media-box__desc">'+v.taskTitle+'</p>\n' +
+                '                                    </div>\n' +
+                '                                </div>\n' +
+                '                                <div class="weui-cell__ft"></div>\n' +
+                '                            </a><br />'));
+    }
+
+</script>
+

whepi-ui/templates/home/qiuzhu.js

@@ -16,7 +16,9 @@ function help() {
       $('#notitle')[0].style.display = '';
       $('#titlteZs')[0].style.display = 'none';
     }
+
   })
+
 }
 
 function family_init() {
@@ -40,6 +42,7 @@ function submit_back() {
     if ($('#notPlay')[0].style.display = 'none') {
       $('#notPlay')[0].style.display = '';
       $('#play').toggle();
+
     }
   })
 }

whepi-ui/templates/home/ribao.ftl

@@ -21,7 +21,7 @@
                             </div>
                             <div class="weui-cell__ft">
                                 <a id="btnAdd" href="javascript:"
-                                   class="weui-btn weui-btn_mini weui-btn_primary">病情描述</a>
+                                   class="weui-btn weui-btn_mini weui-btn_primary">添加家人</a>
                             </div>
                         </div>
                     </div>
@@ -66,7 +66,7 @@
                                 <div class="weui-cell weui-cell_active" id="js_cell">
                                     <div class="weui-cell__hd"><label class="weui-label">家人</label></div>
                                     <div class="weui-cell__bd weui-flex">
-                                        <input id="js_input" class="weui-input" autofocus="" type="text"
+                                        <input id="js_input_xingming" class="weui-input" autofocus="" type="text"
                                                placeholder="请输入姓名" maxlength="20">
                                     </div>
                                 </div>
@@ -128,7 +128,7 @@
                     </span></div>
                     <div class="button-sp-area">
                         <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default">取消</a>
-                        <a id="commit" href="javascript:;" class="weui-btn weui-btn_primary">提交</a>
+                        <a id="commit" href="javascript:;"  onclick="ribaoCommit();" class="weui-btn weui-btn_primary">提交</a>
                     </div>
                 </div>
                 </br>
@@ -171,6 +171,44 @@
                     </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

@@ -32,6 +32,7 @@ function ribao_cancel() {
 
 function ribao_commit() {
   $('#commit').on('click', function () {
+
     if ($('#ribao')[0].style.display == 'none') {
       $('#notOpenRibao').toggle();
       $('#ribao')[0].style.display = '';
@@ -41,3 +42,24 @@ function ribao_commit() {
     }
   });
 }
+
+
+function ribaoCommit() {
+  var userType = $('input:radio:checked').val();
+  var linkman = $("#linkman").val();
+  var phone = $("#phone").val();
+  console.log(userType)
+  console.log(linkman)
+  console.log(phone)
+
+  $.ajax({
+    url: '/home/addRibao.json',
+    type: "post",
+    data: {
+      "userId": 123,
+      "userType": userType,
+      "linkman": '',
+      "phone": '',
+    },
+  });
+}

whepi-ui/templates/user/home.ftl

@@ -3,106 +3,220 @@
 
 <div class="weui-tab">
     <div class="weui-tab__bd">
-        <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
-            <div class="page__bd">
-                <header class="user-header">
+        <div id="first">
+            <div class="weui-tab__bd-item weui-tab__bd-item--active">
+                <div class="page__bd">
+                    <header class="user-header">
+                        <br/>
+                        <br/>
+                        <h1 class="user-title">家园抗击疫情公共服务平台</h1>
+                        <br/>
+                        <h1 class="user-title">用户登陆</h1>
+                    </header>
                     <br/>
                     <br/>
-                    <h1 class="user-title">家园抗击疫情公共服务平台</h1>
                     <br/>
-                    <h1 class="user-title">用户登陆</h1>
-                </header>
-
-                <br/>
-                <br/>
-                <br/>
-                <br/>
-                <div class="weui-form" id="fromMsg">
-                    <div class="weui-cells_radio user-font">
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;我是&nbsp;&nbsp;
-                        <input name="Fruit" type="radio" value="1"/>家庭用户
-                        <input name="Fruit" type="radio" value="2"/>业委会人员
-                    </div>
-                    <hr class="user-hr">
-                    <div class="maindiv">
-                        <div class="leftdiv">
-                            <br/>
-                            <div class="weui-cells__title"><#if user ??>value="${user.username!''}"</#if></div>
-                            <div class="weui-cells__title">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;登陆</div>
-                            <br/>
-                        </div>
-                        <div class="centerdiv"></div>
-                        <div class="rightdiv">
-                            <div class="weui-cells__title">联系人输入</div>
-                            <div class="weui-cells">
-                                <div class="weui-cell">
-                                    <div class="weui-cell__bd">
-                                        <input class="weui-input" type="text" id="linkman" placeholder="请输入文本"/>
+                    <br/>
+                    <div class="weui-form" id="fromMsg">
+                        <div class="weui-cells_radio user-font">
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;我是&nbsp;&nbsp;
+                            <input name="Fruit" type="radio" value="1"/>家庭用户
+                            <input name="Fruit" type="radio" value="2"/>业委会人员
+                        </div>
+                        <hr class="user-hr">
+                        <div class="maindiv">
+                            <div class="leftdiv">
+                                <br/>
+                                <div class="weui-cells__title" style="font-weight: 300;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<#if user ??>${user.nickName!''}</#if></div>
+                                <div class="weui-cells__title">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;登陆</div>
+                                <br/>
+                            </div>
+                            <div class="centerdiv"></div>
+                            <div class="rightdiv">
+                                <div class="weui-cells__title">联系人输入</div>
+                                <div class="weui-cells">
+                                    <div class="weui-cell">
+                                        <div class="weui-cell__bd">
+                                            <input class="weui-input" type="text" id="linkman" placeholder="请输入文本"/>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="weui-cells__title">手机号输入</div>
-                            <div class="weui-cells">
-                                <div class="weui-cell">
-                                    <div class="weui-cell__bd">
-                                        <input class="weui-input" type="text" id="phone" placeholder="请输入文本"/>
+                                <div class="weui-cells__title">手机号输入</div>
+                                <div class="weui-cells">
+                                    <div class="weui-cell">
+                                        <div class="weui-cell__bd">
+                                            <input class="weui-input" type="text" id="phone" placeholder="请输入文本"/>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
+                        <br/>
+                        <div class="weui-form__opr-area">
+                            <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="goOn();" id="goOn">下一步</a>
+                        </div>
+                    </div>
+                    <div class="page" id="tpl_msg_warn_userType" hidden="hidden">
+                        <div class="weui-msg">
+                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
+                            <div class="weui-msg__text-area">
+                                <h2 class="weui-msg__title">操作失败</h2>
+                                <p class="weui-msg__desc" id="errorMsg">用户类型不能为空</p>
+                            </div>
+                            <div class="weui-msg__opr-area">
+                                <p class="weui-btn-area">
+                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="page" id="tpl_msg_warn_linkman" hidden="hidden">
+                        <div class="weui-msg">
+                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
+                            <div class="weui-msg__text-area">
+                                <h2 class="weui-msg__title">操作失败</h2>
+                                <p class="weui-msg__desc" id="errorMsg">联系人不能为空</p>
+                            </div>
+                            <div class="weui-msg__opr-area">
+                                <p class="weui-btn-area">
+                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="page" id="tpl_msg_warn_phone" hidden="hidden">
+                        <div class="weui-msg">
+                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
+                            <div class="weui-msg__text-area">
+                                <h2 class="weui-msg__title">操作失败</h2>
+                                <p class="weui-msg__desc" id="errorMsg">电话号码校验失败</p>
+                            </div>
+                            <div class="weui-msg__opr-area">
+                                <p class="weui-btn-area">
+                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div id="second" hidden="hidden">
+            <div class="weui-tab__bd-item weui-tab__bd-item--active">
+                <div class="page__bd">
+                    <header class="user-header">
+                        <br/>
+                        <h1 class="user-title"><#if user ??>${user.nickName!''}</#if>，请完善住址信息</h1>
+                        <br/>
+                    </header>
+                    <br/>
+                    <br/>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">城市</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="city" name="select1">
+                                <option value="1">武汉</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">区/县</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="area" name="select2">
+                                <option value="420102">江岸区</option>
+                                <option value="420103">江汉区</option>
+                                <option value="420104">硚口区</option>
+                                <option value="420105">汉阳区</option>
+                                <option value="420106">武昌区</option>
+                                <option value="420107">青山区</option>
+                                <option value="420111">洪山区</option>
+                                <option value="420112">东西湖区</option>
+                                <option value="420113">汉南区</option>
+                                <option value="420114">蔡甸区</option>
+                                <option value="420115">江夏区</option>
+                                <option value="420116">黄陂区</option>
+                                <option value="420117">新洲区</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">小区</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="uptownId" name="select3">
+                            </select>
+                        </div>
                     </div>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label">栋/单元/门牌</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="houseId" name="select4">
+                            </select>
+                        </div>
+                    </div>
+                    <br/>
+                    <br/>
+                    <br/>
                     <br/>
                     <div class="weui-form__opr-area">
-                        <a class="weui-btn weui-btn_primary "  href="javascript:;" onclick="save();" id="save">确定</a>
+                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="save();" id="save">确定</a>
                     </div>
-                </div>
 
 
-                <div class="page" id="tpl_msg_warn_userType" hidden="hidden">
-                    <div class="weui-msg">
-                        <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
-                        <div class="weui-msg__text-area">
-                            <h2 class="weui-msg__title">操作失败</h2>
-                            <p class="weui-msg__desc" id="errorMsg">用户类型不能为空</p>
-                        </div>
-                        <div class="weui-msg__opr-area">
-                            <p class="weui-btn-area">
-                                <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
-                            </p>
+                    <div class="page" id="tpl_msg_warn_userType" hidden="hidden">
+                        <div class="weui-msg">
+                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
+                            <div class="weui-msg__text-area">
+                                <h2 class="weui-msg__title">操作失败</h2>
+                                <p class="weui-msg__desc" id="errorMsg">用户类型不能为空</p>
+                            </div>
+                            <div class="weui-msg__opr-area">
+                                <p class="weui-btn-area">
+                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
+                                </p>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="page" id="tpl_msg_warn_linkman" hidden="hidden">
-                    <div class="weui-msg">
-                        <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
-                        <div class="weui-msg__text-area">
-                            <h2 class="weui-msg__title">操作失败</h2>
-                            <p class="weui-msg__desc" id="errorMsg">联系人不能为空</p>
-                        </div>
-                        <div class="weui-msg__opr-area">
-                            <p class="weui-btn-area">
-                                <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
-                            </p>
+                    <div class="page" id="tpl_msg_warn_linkman" hidden="hidden">
+                        <div class="weui-msg">
+                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
+                            <div class="weui-msg__text-area">
+                                <h2 class="weui-msg__title">操作失败</h2>
+                                <p class="weui-msg__desc" id="errorMsg">联系人不能为空</p>
+                            </div>
+                            <div class="weui-msg__opr-area">
+                                <p class="weui-btn-area">
+                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
+                                </p>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="page" id="tpl_msg_warn_phone" hidden="hidden">
-                    <div class="weui-msg">
-                        <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
-                        <div class="weui-msg__text-area">
-                            <h2 class="weui-msg__title">操作失败</h2>
-                            <p class="weui-msg__desc" id="errorMsg">电话号码校验失败</p>
-                        </div>
-                        <div class="weui-msg__opr-area">
-                            <p class="weui-btn-area">
-                                <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
-                            </p>
+                    <div class="page" id="tpl_msg_warn_phone" hidden="hidden">
+                        <div class="weui-msg">
+                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
+                            <div class="weui-msg__text-area">
+                                <h2 class="weui-msg__title">操作失败</h2>
+                                <p class="weui-msg__desc" id="errorMsg">电话号码校验失败</p>
+                            </div>
+                            <div class="weui-msg__opr-area">
+                                <p class="weui-btn-area">
+                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
+                                </p>
+                            </div>
                         </div>
                     </div>
                 </div>
-
             </div>
         </div>
+
     </div>
 </div>
 </div>
@@ -110,9 +224,118 @@
 <#include "/home/frag.foot.ftl" />
 <script>
 
-    var userId = <#if user ??>value="${user.userId!''}"</#if>
+    $(document).ready(function () {
+        $("#area").on("change", function () {
+            var area = $("#area").val();
+            $("#uptownId").empty();
+            $("#houseId").empty();
+            getUptownData(area);
+        });
+        $("#uptownId").on("change", function () {
+            getUptownHouseData();
+            $("#houseId").empty();
+        })
+    })
+
+    function getUptownData(area) {
+        $.ajax({
+            type: "GET",
+            url: "/home/getUptownData.json?area=" + area,
+            dataType: "json",
+            success: function (data) {
+                if (data.length > 0) {
+                    $("#uptownId").empty();
+                    var html = "";
+                    for (var i = 0; i < data.length; i++) {
+                        html += '<option value="' + data[i].uptownId + '">' + data[i].uptownName + '</option>';
+                    }
+                    $('#uptownId').append(html);
+                    $("#uptownId").val(data[0].uptownId);
+                    getUptownHouseData();
+                }
+            }
+        });
+    }
+
+    function getUptownHouseData() {
+        $.ajax({
+            type: "GET",
+            url: "/home/getUptownHouseData.json?uptownId=" + $("#uptownId").val(),
+            data: {},
+            dataType: "json",
+            success: function (data) {
+                if (data.length > 0) {
+                    $("#houseId").empty();
+                    var html = "";
+                    for (var i = 0; i < data.length; i++) {
+                        html += '<option value="' + data[i].houseId + '">'+data[i].ridgepole+'栋'+data[i].unit+'单元'+data[i].doorplate+'号' + '</option>';
+                    }
+                    $('#houseId').append(html);
+                }
+            }
+        });
+    }
+
+        <#if user ??>var userId = ${user.userId!''}</#if>;
 
     function save() {
+        var city = $("#city").val();
+        if (!city) {
+            alert("请选择城市！")
+            return false;
+        }
+        var area = $("#area").val();
+        if (!area) {
+            alert("请选择区/县！")
+            return false;
+        }
+        var uptownId = $("#uptownId").val();
+        if (!uptownId) {
+            alert("请选择小区！")
+            return false;
+        }
+        var houseId = $("#houseId").val();
+        if (!houseId) {
+            alert("请选择门牌信息！")
+            return false;
+        }
+        console.log(city)
+        console.log(area)
+        console.log(uptownId)
+        console.log(houseId)
+
+
+
+        $.ajax({
+            url: '/home/checkHouseId.json',
+            type: "post",
+            data: {
+                "houseId": houseId,
+            },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,
+                            "uptownId": uptownId,
+                            "houseId": houseId,
+                        },
+                    });
+                }
+            }
+        });
+    }
+
+    function goOn() {
         var userType = $('input:radio:checked').val();
         if (!userType) {
             $("#tpl_msg_warn_userType").show();
@@ -130,7 +353,7 @@
             return false;
         }
         var phone = $("#phone").val();
-        if(!(/^1[3456789]\d{9}$/.test(phone))){
+        if (!(/^1[3456789]\d{9}$/.test(phone))) {
             $("#tpl_msg_warn_userType").hide();
             $("#tpl_msg_warn_linkman").hide();
             $("#tpl_msg_warn_phone").show();
@@ -140,33 +363,15 @@
         $("#tpl_msg_warn_userType").hide();
         $("#tpl_msg_warn_linkman").hide();
         $("#tpl_msg_warn_phone").hide();
+        $("#first").hide();
+        $("#second").show();
         console.log(userType)
         console.log(linkman)
         console.log(phone)
 
-        $.ajax({
-            url: '/admin/supplier/createOrderauditMain.json',
-            type: "post",
-            data: {
-                "userId": userId,
-                "userType": userType,
-                "linkman": linkman,
-                "phone": phone,
-            },
-            beforeSend: function () {
-            },
-            success: function (result) {
-                if (result.success) {
-                    layer.msg('添加成功');
-                } else {
-                    layer.msg(result.message);
-                }
-                closePageTwo();
-            }
-        });
     }
 
-    function back(){
+    function back() {
         $("#tpl_msg_warn_userType").hide();
         $("#tpl_msg_warn_linkman").hide();
         $("#tpl_msg_warn_phone").hide();

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -28,9 +28,9 @@ function makeUI(tasks) {
   $('#qz_list2').empty();
   $('#qz_list3').empty();
 
-  for (let i = 0; i < tasks.length; i++) {
+  for (var i = 0; i < tasks.length; i++) {
 
-    let task = tasks[i];
+    var task = tasks[i];
     if (task.taskStatus == 1) {
 
       $('#qz_list1').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +

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

@@ -0,0 +1,11 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.MsReport;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:45
+ */
+public interface MsReportMapper extends BaseMapper<MsReport> {
+}

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

@@ -0,0 +1,16 @@
+package com.bofeng.dao;
+
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.MsSuspected;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:39
+ */
+@Mapper
+@Repository
+public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
+}

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

@@ -3,6 +3,7 @@ package com.bofeng.dao;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.QzTask;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
 @Repository
 public interface QzTaskDao extends BaseMapper<QzTask> {
 
-    List<QzTask> selectAll();
+  List<QzTask> selectAll();
 
+  List<QzTask> queryQzTask();
 }

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

@@ -0,0 +1,16 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.QzTask;
+import com.bofeng.entity.QzTaskReply;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface QzTaskReplyDao extends BaseMapper<QzTask> {
+
+  List<QzTaskReply> taskQuery();
+}

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

@@ -0,0 +1,18 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.UptownHome;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface UptownHomeMapper extends BaseMapper<UptownHome> {
+
+    @Select("select * from sys_uptown_home where house_id = #{houseId} and status = 1")
+    List<UptownHome> getUptownHomeBy(@Param("houseId")Long houseId);
+}

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

@@ -3,9 +3,16 @@ package com.bofeng.dao;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.UptownHouse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface UptownHouseMapper extends BaseMapper<UptownHouse> {
+
+    @Select("select * from sys_uptown_house where status = 1 and uptown_id = #{uptownId}")
+    List<UptownHouse> getAllUptownHouse(@Param("uptownId") Long uptownId);
 }

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

@@ -0,0 +1,18 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.Uptown;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface UptownMapper extends BaseMapper<Uptown> {
+
+    @Select("select * from sys_uptown where status = 1 and area = #{area}")
+    List<Uptown> getAllUptown(@Param("area") Integer area);
+}

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

@@ -3,9 +3,16 @@ package com.bofeng.dao;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.UserRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface UserRoleMapper extends BaseMapper<UserRole> {
+
+    @Select("select * from sys_user_role where user_id = #{userId}")
+    List<UserRole> getUserRoleByUserId(@Param("userId") Long userId);
 }

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

@@ -0,0 +1,50 @@
+package com.bofeng.entity;
+
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.models.auth.In;
+import lombok.Getter;
+import lombok.Setter;
+import org.joda.time.DateTime;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 14:54
+ */
+@Getter
+@Setter
+@TableName("ms_report")
+public class MsReport {
+
+    @TableId("report_id")
+    private Long reportId;
+
+    @TableField("house_id")
+    private Long houseId;
+
+    @TableField("safety_num")
+    private Integer safetyNum;
+
+    @TableField("suspected_num")
+    private Integer suspectedNum;
+
+    @TableField("remarks")
+    private String remarks;
+
+    @TableField("ms_status")
+    private Integer msStatus;
+
+    @TableField("user_create")
+    private Long userCreate;
+
+    @TableField("time_create")
+    private DateTime timeCreate;
+
+    @TableField("user_update")
+    private Long userUpdate;
+
+    @TableField("time_update")
+    private DateTime timeUpdate;
+}

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

@@ -0,0 +1,50 @@
+package com.bofeng.entity;
+
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import org.joda.time.DateTime;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 14:54
+ */
+@Getter
+@Setter
+@TableName("ms_suspected")
+public class MsSuspected {
+
+
+    @TableId("suspected_id")
+    private Long suspectedId;
+
+    @TableField("report_id")
+    private Long reportId;
+
+    @TableField("family_relative")
+    private Integer familyRelative;
+
+    @TableField("medical")
+    private Integer medical;
+
+    @TableField("condition_status")
+    private Integer conditionStatus;
+
+    @TableField("remarks")
+    private String remarks;
+
+    @TableField("user_create")
+    private Long userCreate;
+
+    @TableField("time_create")
+    private DateTime timeCreate;
+
+    @TableField("user_update")
+    private Long userUpdate;
+
+    @TableField("time_update")
+    private DateTime timeUpdate;
+}

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

@@ -3,6 +3,7 @@ package com.bofeng.entity;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
+import org.joda.time.DateTime;
 
 /**
  * qz_task
@@ -63,7 +64,7 @@ public class QzTask implements Serializable {
     /**
      * 新增时间
      */
-    private Date timeCreate;
+    private DateTime timeCreate;
 
     /**
      * 修改人
@@ -73,7 +74,7 @@ public class QzTask implements Serializable {
     /**
      * 修改时间
      */
-    private Date timeUpdate;
+    private DateTime timeUpdate;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -0,0 +1,39 @@
+package com.bofeng.entity;
+
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+
+public class QzTaskReply implements Serializable {
+
+  /**
+   * 回复ID
+   */
+  private Long replyId;
+
+  private Long taskId;
+
+  private Long userId;
+
+  private String replyContent;
+
+  /**
+   * 新增人
+   */
+  private Long userCreate;
+
+  /**
+   * 新增时间
+   */
+  private DateTime timeCreate;
+
+  /**
+   * 修改人
+   */
+  private Long userUpdate;
+
+  /**
+   * 修改时间
+   */
+  private DateTime timeUpdate;
+}

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

@@ -0,0 +1,52 @@
+package com.bofeng.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import org.joda.time.DateTime;
+
+/**
+ * 小区表
+ */
+@Getter
+@Setter
+@TableName("sys_uptown")
+public class Uptown {
+
+    @TableField("uptown_id")
+    private Long uptownId;
+
+    @TableField("uptown_name")
+    private String uptownName;
+
+    @TableField("uptown_addr")
+    private String uptownAddr;
+
+    @TableField("longitude")
+    private String longitude;
+
+    @TableField("latitude")
+    private String latitude;
+
+    @TableField("area")
+    private Integer area;
+
+    /**
+     * 状态:1正常,0草稿,-1删除
+     */
+    @TableField("status")
+    private Integer status;
+
+    @TableField("user_create")
+    private Long userCreate;
+
+    @TableField(exist = false)
+    private DateTime timeCreate;
+
+    @TableField("user_update")
+    private Long userUpdate;
+
+    @TableField(exist = false)
+    private DateTime timeUpdate;
+}

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

@@ -0,0 +1,51 @@
+package com.bofeng.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import org.joda.time.DateTime;
+
+import java.util.Date;
+
+/**
+ * 小区家庭表
+ */
+@Getter
+@Setter
+@TableName("sys_uptown_home")
+public class UptownHome {
+
+    @TableField("house_id")
+    private Long houseId;
+
+    @TableField("linkman")
+    private String linkman;
+
+    @TableField("phone")
+    private String phone;
+
+    @TableField("young")
+    private Integer young;
+
+    @TableField("middle")
+    private Integer middle;
+
+    @TableField("old")
+    private Integer old;
+
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 状态:1正常,0草稿,-1删除
+     */
+    @TableField("status")
+    private Integer status;
+
+    @TableField(exist = false)
+    private DateTime timeCreate;
+
+    @TableField(exist = false)
+    private DateTime timeUpdate;
+}

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

@@ -8,6 +8,9 @@ import org.joda.time.DateTime;
 
 import java.util.Date;
 
+/**
+ * 门牌信息表
+ */
 @Getter
 @Setter
 @TableName("sys_uptown_house")
@@ -19,23 +22,14 @@ public class UptownHouse {
     @TableField("uptown_id")
     private Long uptownId;
 
-    @TableField("linkman")
-    private String linkman;
+    @TableField("ridgepole")
+    private String ridgepole;
 
-    @TableField("phone")
-    private String phone;
+    @TableField("unit")
+    private String unit;
 
-    @TableField("young")
-    private Integer young;
-
-    @TableField("middle")
-    private Integer middle;
-
-    @TableField("old")
-    private Integer old;
-
-    @TableField("remark")
-    private String remark;
+    @TableField("doorplate")
+    private String doorplate;
 
     /**
      * 状态:1正常,0草稿,-1删除

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

@@ -0,0 +1,9 @@
+package com.bofeng.service;
+
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:44
+ */
+public class MsReportService {
+}

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

@@ -0,0 +1,46 @@
+package com.bofeng.service;
+
+
+import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.bofeng.dao.MsSuspectedMapper;
+import com.bofeng.dao.UserOpenMapper;
+import com.bofeng.entity.MsSuspected;
+import com.bofeng.entity.Owner;
+import com.bofeng.entity.UptownHome;
+import com.bofeng.entity.UserRole;
+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;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:44
+ */
+
+@Service
+@Transactional(readOnly = true)
+public class MsSuspectedService {
+
+    @Autowired
+    private MsSuspectedMapper msSuspectedMapper;
+
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void addRibao(Long userId, Integer userType, String linkman, String phone) {
+        MsSuspected msSuspected = new MsSuspected();
+        msSuspected.setSuspectedId(IdWorker.getId());
+        msSuspected.setReportId(userId);
+        msSuspected.setFamilyRelative(userType);
+        msSuspected.setConditionStatus(0);
+        msSuspected.setMedical(0);
+        msSuspected.setRemarks("测试");
+        msSuspected.setUserCreate(userId);
+        msSuspected.setTimeCreate(DateTime.now());
+        msSuspected.setUserUpdate(userId);
+        msSuspected.setTimeUpdate(DateTime.now());
+        msSuspectedMapper.insert(msSuspected);
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.bofeng.service;
+
+import com.bofeng.dao.QzTaskReplyDao;
+import com.bofeng.entity.QzTaskReply;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class QzTaskReplyService {
+
+  @Autowired
+  private QzTaskReplyDao qzTaskReplyDao;
+
+  public List<QzTaskReply> taskQuery() {
+    return qzTaskReplyDao.taskQuery();
+
+  }
+}

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

@@ -1,7 +1,12 @@
 package com.bofeng.service;
 
+import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.bofeng.JwtHelper;
 import com.bofeng.dao.QzTaskDao;
 import com.bofeng.entity.QzTask;
+import com.yvan.platform.JsonWapper;
+import lombok.var;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -10,9 +15,36 @@ import java.util.List;
 @Service
 public class QzTaskService {
 
-    @Autowired
-    private QzTaskDao qzTaskDao;
-    public List<QzTask> selectAll () {
-        return qzTaskDao.selectAll();
-    }
+  @Autowired
+  private QzTaskDao qzTaskDao;
+
+
+  public List<QzTask> selectAll() {
+    return qzTaskDao.selectAll();
+  }
+
+
+  //求助的新增
+  public int addHelp(String taskTitle,String taskTarget,String remark) {
+    var qzTak=new QzTask();
+    qzTak.setTaskId(IdWorker.getId());
+    qzTak.setTaskTitle(taskTitle);
+    qzTak.setRemark(remark);
+    qzTak.setTaskTarget(taskTarget);
+    qzTak.setTaskStatus(1);
+
+    /*long userId = Long.parseLong(JwtHelper.getUserId());
+    qzTak.setUserId(userId);
+    qzTak.setUserCreate(userId);*/
+    qzTak.setTimeCreate(new DateTime());
+   /* qzTak.setUserUpdate(userId);*/
+    qzTak.setTimeUpdate(new DateTime());
+    return qzTaskDao.insert(qzTak);
+  }
+
+
+
+  public List<QzTask> queryQzTask(){
+    return qzTaskDao.queryQzTask();
+  }
 }

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

@@ -1,11 +1,9 @@
 package com.bofeng.service;
 
-import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.*;
 import com.bofeng.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.annotation.Id;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,14 +49,14 @@ public class UserOpenService {
     }
 
     @Autowired
-    private UptownHouseMapper uptownHouseMapper;
+    private UptownHomeMapper uptownHomeMapper;
     @Autowired
     private OwnerMapper ownerMapper;
     @Autowired
     private UserRoleMapper userRoleMapper;
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void saveUserInfo(Long userId, Integer userType, String linkman, String phone) {
+    public void saveUserInfo(Long userId, Integer userType, String linkman, String phone, Integer area, Long uptownId, Long houseId) {
         UserRole userRole = new UserRole();
         userRole.setUrId(IdWorker.getId());
         userRole.setUserId(userId);
@@ -66,23 +64,21 @@ public class UserOpenService {
         userRole.setUserCreate(userId);
         userRole.setUserUpdate(userId);
         if (userType == 1) {
-            UptownHouse uptownHouse = new UptownHouse();
-//            uptownHouse.setHouseId()
-            uptownHouse.setLinkman(linkman);
-            uptownHouse.setPhone(phone);
-//            uptownHouse.setYoung();
-//            uptownHouse.setMiddle();
-//            uptownHouse.setOld();
-//            uptownHouse.setRemark();
-            uptownHouse.setStatus(1);
-            uptownHouse.setUserCreate(userId);
-            uptownHouse.setUserUpdate(userId);
-            uptownHouseMapper.insert(uptownHouse);
-            userRole.setPropertyId(uptownHouse.getHouseId());
+            UptownHome uptownHome = new UptownHome();
+            uptownHome.setHouseId(houseId);
+            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) {
             Owner owner = new Owner();
             owner.setOwnerId(IdWorker.getId());
-//            owner.setUptownId();
+            owner.setUptownId(uptownId);
             owner.setLinkman(linkman);
             owner.setPhone(phone);
             owner.setUserCreate(userId);

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -118,7 +118,7 @@ public class WxController {
         btn1.setType(WxConsts.MenuButtonType.VIEW);
         btn1.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
-                                "/home/home.html",
+                                "/user/home.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
 

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

@@ -2,35 +2,67 @@ package com.bofeng.wx.controller;
 
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.Consts;
+import com.bofeng.JwtHelper;
 import com.bofeng.dao.UserOpenMapper;
 import com.bofeng.entity.*;
-import com.bofeng.service.HomeService;
-import com.bofeng.service.UserOpenService;
-import com.bofeng.service.UserService;
+import com.bofeng.service.*;
 import com.google.common.collect.Maps;
+import com.yvan.Model;
+import com.yvan.ModelOps;
+import com.yvan.mvc.JsonBody;
+import com.yvan.mvc.Pd;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
 import lombok.val;
+import lombok.var;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 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.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.PreDestroy;
 import java.util.List;
 import java.util.Map;
 
 @RestController
 public class HomeController {
 
-    @Autowired
-    private HomeService homeService;
+  @Autowired
+  private HomeService homeService;
 
-    @GetMapping("/home/home.html")
-    public ModelAndView home(ModelMap model) {
-        //UserOpen userOpen = homeService.getUserOpen();
-        model.put("user", new JsonWapper("{\"www\": \"er\"}"));
-        return new ModelAndView("/home/home.ftl", model);
-    }
+  @Autowired
+  private QzTaskService qzTaskService;
+
+  @Autowired
+  private QzTaskReplyService qzTaskReplyService;
+
+  @GetMapping("/home/home.html")
+  public ModelAndView home(ModelMap model) {
+    //UserOpen userOpen = homeService.getUserOpen();
+    model.put("user", new JsonWapper("{\"www\": \"er\"}"));
+    return new ModelAndView("/home/home.ftl", model);
+  }
+
+  //家庭求助
+  @GetMapping("/home/home/addFimaly")
+  public ModelOps family(@Pd(name="taskTitle")String taskTitle,
+                         @Pd(name = "taskTarget")String taskTarget,
+                         @Pd(name = "remark")String remark) {
+    return ModelOps.newSuccess(qzTaskService.addHelp(taskTitle,taskTarget,remark));
+  }
+
+  //我的在求助的展示
+  @GetMapping("/home/home/queryQzTask")
+  public Model<List<QzTask>> queryQzTask(){
+    return Model.newSuccess(qzTaskService.queryQzTask());
+  }
+
+  //小区求助的查看
+  @GetMapping("/home/home/taskQuery")
+  public Model<List<QzTaskReply>> taskQuery(){
+    return Model.newSuccess(qzTaskReplyService.taskQuery());
+  }
 }

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

@@ -0,0 +1,33 @@
+package com.bofeng.wx.controller;
+
+
+import com.bofeng.service.HomeService;
+import com.bofeng.service.MsSuspectedService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * @Author: xielianghe
+ * @Date: 2020/2/4 15:38
+ */
+@RestController
+public class MsReportController {
+
+
+    @Autowired
+    private MsSuspectedService msSuspectedService;
+
+    @PostMapping("/home/addRibao.json")
+    public ModelAndView saveUser(HttpServletRequest request) {
+        Long userId = Long.parseLong(request.getParameter("userId"));
+        Integer userType = Integer.parseInt(request.getParameter("userType"));
+        String linkman = request.getParameter("linkman");
+        String phone = request.getParameter("phone");
+        msSuspectedService.addRibao(userId, userType, linkman, phone);
+        return new ModelAndView("/home/home.ftl");
+    }
+}

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

@@ -1,15 +1,23 @@
 package com.bofeng.wx.controller;
 
-import com.bofeng.entity.UserOpen;
+import com.bofeng.dao.*;
+import com.bofeng.entity.*;
 import com.bofeng.service.HomeService;
+import com.bofeng.service.QzTaskService;
 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;
 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;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @RestController
 public class UserOpenController {
@@ -18,21 +26,85 @@ public class UserOpenController {
     private HomeService homeService;
     @Autowired
     private UserOpenService userOpenService;
+    @Autowired
+    private UserOpenMapper userOpenMapper;
+    @Autowired
+    private UptownMapper uptownMapper;
+    @Autowired
+    private UptownHouseMapper uptownHouseMapper;
+    @Autowired
+    private UptownHomeMapper uptownHomeMapper;
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+    @Autowired
+    private QzTaskService qzTaskService;
 
     @GetMapping("/user/home.html")
     public ModelAndView home(ModelMap model) {
         UserOpen userOpen = homeService.getUserOpen();
+        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
         model.put("user", userOpen);
-        return new ModelAndView("/user/home.ftl", model);
+        if (list.size() == 0) {
+            return new ModelAndView("/user/home.ftl", model);
+        } else if (list.size()>0) {
+            if (list.get(0).getRoleId() == 1) {
+                return new ModelAndView("/home/home.ftl", model);
+            } else if(list.get(0).getRoleId() == 2) {
+                List<QzTask> taskList = qzTaskService.selectAll();
+                model.put("taskList", YvanUtil.toJsonPretty(taskList));
+                return new ModelAndView("/yeweihui/home.ftl", model);
+            }
+        }
+        return null;
+    }
+
+    @GetMapping("/home/getUptownData.json")
+    public List<Uptown> getUptownData(HttpServletRequest request, @RequestParam(value = "area") Integer area) {
+        return uptownMapper.getAllUptown(area);
+    }
+
+    @GetMapping("/home/getUptownHouseData.json")
+    public List<UptownHouse> getUptownHouseData(HttpServletRequest request, @RequestParam(value = "uptownId") Long uptownId) {
+        return uptownHouseMapper.getAllUptownHouse(uptownId);
     }
 
-    @GetMapping("/home/saveUser.json")
-    public ModelAndView saveUser(HttpServletRequest request) {
+    @PostMapping("/home/checkHouseId.json")
+    public ResultModel checkHouseId(HttpServletRequest request) {
+        ResultModel resultModel = new ResultModel();
+        Long houseId = Long.parseLong(request.getParameter("houseId"));
+        List<UptownHome> list = uptownHomeMapper.getUptownHomeBy(houseId);
+        if (list.size() > 0) {
+            resultModel.put("success", false);
+            resultModel.put("msg", "该门牌已有人入住！");
+            return resultModel;
+        }
+        resultModel.put("success", true);
+        resultModel.put("msg", "操作成功");
+        return resultModel;
+    }
+
+    @PostMapping("/home/saveUser.json")
+    public ModelAndView saveUser(ModelMap model, HttpServletRequest request) {
         Long userId = Long.parseLong(request.getParameter("userId"));
         Integer userType = Integer.parseInt(request.getParameter("userType"));
         String linkman = request.getParameter("linkman");
         String phone = request.getParameter("phone");
-        userOpenService.saveUserInfo(userId,userType,linkman,phone);
-        return new ModelAndView("/home/home.ftl");
+        Integer area = Integer.parseInt(request.getParameter("area"));
+        Long uptownId = Long.parseLong(request.getParameter("uptownId"));
+        Long houseId = Long.parseLong(request.getParameter("houseId"));
+        userOpenService.saveUserInfo(userId,userType,linkman,phone,area,uptownId,houseId);
+        UserOpen userOpen = userOpenMapper.selectByUserId(userId);
+        model.put("user", userOpen);
+        if (userType == 1) {
+            return new ModelAndView("/home/home.ftl", model);
+        } else if (userType == 2) {
+            List<QzTask> taskList = qzTaskService.selectAll();
+            model.put("taskList", YvanUtil.toJsonPretty(taskList));
+            return new ModelAndView("/yeweihui/home.ftl", model);
+        } else {
+            return null;
+        }
+
     }
 }

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

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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 id="selectAll" resultType="com.bofeng.entity.QzTask">
     select * from qz_task
   </select>
+
+
+    <select id="queryQzTask" resultType="com.bofeng.entity.QzTask">
+    select * from qz_task order by time_update desc
+    </select>
 </mapper>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bofeng.dao.QzTaskReplyDao">
+
+
+    <select id="taskQuery" resultType="com.bofeng.entity.QzTaskReply">
+      select * from qz_task_reply
+    </select>
+</mapper>