Merge remote-tracking branch 'origin/master'

whepi-doc/mrsb.sql

@@ -10,6 +10,7 @@ CREATE TABLE ms_report  (
   suspected_num     int(11) NOT NULL DEFAULT 0                              COMMENT '疑似人数',
   remarks           varchar(200)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
   report_date       date                                                    COMMENT '上报日期',
+  report_status     int(11) NOT NULL DEFAULT 1                              COMMENT '上报状态:0草稿,1正常',
   ms_status         int(11) NOT NULL DEFAULT 1                              COMMENT '健康状态:1正常,2异常',
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',
@@ -27,10 +28,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妊娠期，8其他',
+  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,11 +60,10 @@
         family_init();
         ribao_add();
         ribao_cancel();
-        ribao_commit();
 
-        <#--var msReport = ${msReport};-->
-        <#--$('#ribao_safety_num').val(msReport.safetyNum);-->
-        <#--ribaoInitialization(msReport.reportId);-->
+        <#if msReport ??>var msReport = ${msReport}</#if>;
+        $('#ribao_safety_num').val(msReport.safetyNum);
+        ribaoInitialization(msReport.reportId);
         /*submit_back();*/
         familyClick();
 
@@ -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"><#--发起求助的展示界面-->
@@ -308,7 +312,7 @@
                 '                                    </div>\n' +
                 '                                </div>\n' +
                 '                                <div class="weui-cell__ft">' + conversion(v.taskStatus) + '</div>\n' +
-                '                            </a><br />'));
+                '                            </a><br/>'));
     }
 
     var aid;

whepi-ui/templates/home/ribao.ftl

@@ -38,97 +38,158 @@
                         <a class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" onclick="addReport()">全家报平安</a>
                     </div>
                 </div>
-                <div id="ribao" style="display: none">
-                    <div class="weui-form__control-area">
-                        <div class="weui-cells__group weui-cells__group_form">
-                            <div class="weui-cells weui-cells_form">
-                                <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_user_name" class="weui-input" autofocus="" type="text"
-                                               placeholder="请输入姓名" maxlength="20">
-                                    </div>
-                                </div>
-                                <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="checkbox" class="weui-check" name="checkbox1" 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="checkbox" name="checkbox2" class="weui-check" id="s12">
-                                            <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">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox3" class="weui-check" id="s13">
-                                            <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">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox4" class="weui-check" id="s14">
-                                            <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="s15">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox5" class="weui-check" id="s15">
-                                            <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="s16">
-                                        <div class="weui-cell__hd">
-                                            <input type="checkbox" name="checkbox6" class="weui-check" id="s16">
-                                            <i class="weui-icon-checked"></i>
-                                        </div>
-                                        <div class="weui-cell__bd">
-                                            <p>其他</p>
-                                        </div>
-                                    </label>
-                                </div>
-                                <div class="weui-cell ">
-                                    <div class="weui-cell__bd">
-                                        <textarea id="rb_remarks" class="weui-textarea" placeholder="请输入病情描述"
-                                                  rows="3"></textarea>
-                                        <div class="weui-textarea-counter"><span>0</span>/100</div>
-                                    </div>
-                                </div>
-                                <div class="weui-cell weui-cell_switch">
-                                    <div class="weui-cell__bd">是否确诊</div>
-                                    <div class="weui-cell__ft">
-                                        <input class="weui-switch" type="checkbox" name="medical"/>
-                                    </div>
-                                </div>
+                <div id="ribao" class="weui-btn-area" style="display: none">
+                    <div style="text-align: center;">基本信息</div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between;">
+                        <input id="js_input_user_name" class="weui-input" autofocus="" type="text" placeholder="请输入姓名" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 30%; text-align: center;" />
+                        <input id="js_input_user_sex" class="weui-input" autofocus="" type="text" placeholder="性别" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;" />
+                        <input id="js_input_user_age" class="weui-input" autofocus="" type="text" placeholder="年龄" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;" />
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="width: 20%;height: 5vh; line-height: 5vh;margin-left: 2vw;">基本状况</div>
+                        <input id="js_input_user_status" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 75%;" />
+                    </div>
+                    <textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="width: 20%;height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
+                        <div style="width: 70%;display:flex; flex-direction: row;">
+                            <div style="color: gray;height: 5vh; line-height: 5vh;margin-right: 5vw;">是否确诊</div>
+<#--                            <input id="switchQuezhen" class="weui-switch" type="checkbox">-->
+                            <input hidden="hidden" name="switchQuezhen" id="switchQuezhen" value="off" type="radio" checked="checked"/>
+                            <div class="weui-cell__ft">
+                                <input class="weui-switch" type="checkbox" id="rb_switch" name="rb_switch">
                             </div>
                         </div>
                     </div>
-                    <div class="weui-cells__tips"> <span style="color: red">
-                        注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！
-                    </span></div>
-                    <div class="button-sp-area">
-                        <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default">取消</a>
-                        <a id="commit" href="javascript:;" onclick="ribaoCommit();"
-                           class="weui-btn weui-btn_primary">提交</a>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;">体温</div>
+                        <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="text" placeholder="请输入" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;margin-left: 5vw;">咳嗽</div>
+                        <input id="js_input_user_kesou" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="color: gray;height: 5vh;line-height: 2.5vh; width: 10%;">肌肉酸痛</div>
+                        <input id="js_input_user_jirou" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
+                        <div style="color: gray;height: 5vh;line-height: 2.5vh; width: 10%;margin-left: 5vw;">呼吸困难</div>
+                        <input id="js_input_user_huxi" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;">胸闷</div>
+                        <input id="js_input_user_xiongmen" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;margin-left: 5vw;">乏力</div>
+                        <input id="js_input_user_fali" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;">腹泻</div>
+                        <input id="js_input_user_fuxie" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 35%;" />
+                        <div style="width: 50%; display: flex; flex-direction: row;">
+                            <input id="js_input_user_cishu" class="weui-input" autofocus="" type="text" placeholder="请输入" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 30%;" />
+                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 30%; margin-left: 3vw;">次/日</div>
+                        </div>
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 10%;margin-right: 2vw;">其他</div>
+                        <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容（300字内）" rows="5" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
+                    </div>
+                    <div style="display: flex; justify-content: center;">
+                        <div style="width: 70%;color: red; text-align: center;">
+                            请认真填写健康信息，会根据信息给予相关居家防控医疗建议！
+                        </div>
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh; margin-bottom: 5vh;">
+                        <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default" style="width: 30%;">取消</a>
+                        <a id="commit" href="javascript:;" onclick="ribaoCommit();" class="weui-btn weui-btn_primary" style="margin-top: 0;width: 30%;">提交</a>
                     </div>
+                    <#--                    <div class="weui-form__control-area">-->
+<#--                        <div class="weui-cells__group weui-cells__group_form">-->
+<#--                            <div class="weui-cells weui-cells_form">-->
+<#--                                <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_user_name" class="weui-input" autofocus="" type="text"-->
+<#--                                               placeholder="请输入姓名" maxlength="20">-->
+<#--                                    </div>-->
+<#--                                </div>-->
+<#--                                <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="checkbox" class="weui-check" name="checkbox1" 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="checkbox" name="checkbox2" class="weui-check" id="s12">-->
+<#--                                            <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">-->
+<#--                                        <div class="weui-cell__hd">-->
+<#--                                            <input type="checkbox" name="checkbox3" class="weui-check" id="s13">-->
+<#--                                            <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">-->
+<#--                                        <div class="weui-cell__hd">-->
+<#--                                            <input type="checkbox" name="checkbox4" class="weui-check" id="s14">-->
+<#--                                            <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="s15">-->
+<#--                                        <div class="weui-cell__hd">-->
+<#--                                            <input type="checkbox" name="checkbox5" class="weui-check" id="s15">-->
+<#--                                            <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="s16">-->
+<#--                                        <div class="weui-cell__hd">-->
+<#--                                            <input type="checkbox" name="checkbox6" class="weui-check" id="s16">-->
+<#--                                            <i class="weui-icon-checked"></i>-->
+<#--                                        </div>-->
+<#--                                        <div class="weui-cell__bd">-->
+<#--                                            <p>其他</p>-->
+<#--                                        </div>-->
+<#--                                    </label>-->
+<#--                                </div>-->
+<#--                                <div class="weui-cell ">-->
+<#--                                    <div class="weui-cell__bd">-->
+<#--                                        <textarea id="rb_remarks" class="weui-textarea" placeholder="请输入病情描述"-->
+<#--                                                  rows="3"></textarea>-->
+<#--                                        <div class="weui-textarea-counter"><span>0</span>/100</div>-->
+<#--                                    </div>-->
+<#--                                </div>-->
+<#--                                <div class="weui-cell weui-cell_switch">-->
+<#--                                    <div class="weui-cell__bd">是否确诊</div>-->
+<#--                                    <div class="weui-cell__ft">-->
+<#--                                        <input class="weui-switch" type="checkbox" name="medical"/>-->
+<#--                                    </div>-->
+<#--                                </div>-->
+<#--                            </div>-->
+<#--                        </div>-->
+<#--                    </div>-->
+<#--                    <div class="weui-cells__tips"> <span style="color: red">-->
+<#--                        注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！-->
+<#--                    </span></div>-->
+<#--                    <div class="button-sp-area">-->
+<#--                        <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default">取消</a>-->
+<#--                        <a id="commit" href="javascript:;" onclick="ribaoCommit();"-->
+<#--                           class="weui-btn weui-btn_primary">提交</a>-->
+<#--                    </div>-->
                 </div>
                 </br>
                 </br>
@@ -136,6 +197,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

@@ -3,6 +3,185 @@ function ribao_init() {
     window.location.href = "/yeweihui/home.html";
   });
 
+  $("#js_input_user_sex").select({
+    title: "选择性别",
+    items: [
+      {
+        title: "男",
+        value: "1",
+      },
+      {
+        title: "女",
+        value: "2",
+      }]
+  });
+
+  $("#js_input_user_status").select({
+    title: "选择基本状况",
+    items: [
+      {
+        title: "心脑血管疾病（服用ARB）",
+        value: "1",
+      },
+      {
+        title: "心脑血管疾病（未服ARB）",
+        value: "2",
+      },
+      {
+        title: "呼吸系统病史",
+        value: "3",
+      },
+      {
+        title: "肿瘤病史",
+        value: "4",
+      },
+      {
+        title: "糖尿病史",
+        value: "5",
+      },
+      {
+        title: "服用过激素药物",
+        value: "6",
+      },
+      {
+        title: "妊娠期",
+        value: "7",
+      }, {
+        title: "其他",
+        value: "8",
+      }]
+  });
+
+  $("#js_input_user_kesou").select({
+    title: "选择咳嗽情况",
+    items: [
+      {
+        title: "无咳嗽",
+        value: "0",
+      },
+      {
+        title: "偶尔短暂咳嗽",
+        value: "1",
+      },
+      {
+        title: "频繁咳嗽轻度影响生活",
+        value: "2",
+      },
+      {
+        title: "频繁咳嗽重度影响生活",
+        value: "3",
+      }]
+  });
+
+  $("#js_input_user_jirou").select({
+    title: "选择肌肉情况",
+    items: [
+      {
+        title: "无",
+        value: "0",
+      },
+      {
+        title: "加重",
+        value: "1",
+      },
+      {
+        title: "好转",
+        value: "2",
+      },
+      {
+        title: "无变化",
+        value: "3",
+      }]
+  });
+
+  $("#js_input_user_huxi").select({
+    title: "选择呼吸情况",
+    items: [
+      {
+        title: "无",
+        value: "0",
+      },
+      {
+        title: "加重",
+        value: "1",
+      },
+      {
+        title: "好转",
+        value: "2",
+      },
+      {
+        title: "无变化",
+        value: "3",
+      },
+      {
+        title: "严重",
+        value: "4",
+      }]
+  });
+
+  $("#js_input_user_xiongmen").select({
+    title: "选择胸闷情况",
+    items: [
+      {
+        title: "无",
+        value: "0",
+      },
+      {
+        title: "端坐呼吸",
+        value: "1",
+      },
+      {
+        title: "活动无耐力",
+        value: "2",
+      },
+      {
+        title: "无变化",
+        value: "3",
+      }]
+  });
+
+  $("#js_input_user_fali").select({
+    title: "选择乏力情况",
+    items: [
+      {
+        title: "无",
+        value: "0",
+      },
+      {
+        title: "加重",
+        value: "1",
+      },
+      {
+        title: "好转",
+        value: "2",
+      },
+      {
+        title: "无变化",
+        value: "3",
+      }]
+  });
+
+  $("#js_input_user_fuxie").select({
+    title: "选择乏力情况",
+    items: [
+      {
+        title: "无",
+        value: "0",
+      },
+      {
+        title: "有",
+        value: "1",
+      }]
+  });
+
+  $("#rb_switch").bind("click", function () {
+    if ($("#switchQuezhen").val() == "off") {
+      $("#switchQuezhen").val("on");
+    } else {
+      $("#switchQuezhen").val("off");
+    }
+  });
+
 }
 
 //近日报告
@@ -33,20 +212,28 @@ 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);
-      if (data.data.length > 0) {
-        hasData = true;
-        $('#rb_family').empty();
-        data.data.forEach(function (v) {
-          ribao_cell(v);
-        });
-      } else {
+      if (data.data == undefined) {
+        $('#ribao_famliy').empty();
+      }
+      else {
+        if (data.data.length > 0) {
+          hasData = true;
+          $('#rb_family').empty();
+          data.data.forEach(function (v) {
+            ribao_cell(v);
+          });
+        } else {
 
+        }
       }
     },
     error: function () {
@@ -55,27 +242,23 @@ function ribao_refrash() {
 }
 
 function ribao_cell(v) {
-  var conditionStatusList = v.conditionStatus.split(',');
-  var conditionStatus = v.userName + "：";
-  if (conditionStatusList[0] > 0)
-    conditionStatus += "   咳嗽"
-  if (conditionStatusList[1] > 0)
-    conditionStatus += "   发烧"
-  if (conditionStatusList[2] > 0)
-    conditionStatus += "   腹泻"
-  if (conditionStatusList[3] > 0)
-    conditionStatus += "   酸痛"
-  if (conditionStatusList[4] > 0)
-    conditionStatus += "   乏力"
-  if (conditionStatusList[5] > 0)
-    conditionStatus += "   其他"
-  if (v.medical > 0)
-    conditionStatus += "   确诊"
-  else
-    conditionStatus += "   未确诊"
+  var userName = v.userName + "：";
+  var grender = getGreder(v.grender);
+  var age = v.age;
+  var familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
+  var medical = "是否确诊：" + getGreder(v.grender) + "；";
+  var temperature = "体温：" + v.temperature + "；";
+  var cough = "咳嗽：" + getCough(v.cough) + "；";
+  var muscle = "肌肉酸痛：" + getMuscle(v.muscle) + "；";
+  var dyspnea = "呼吸困难：" + getDyspnea(v.dyspnea) + "；";
+  var chest = "胸闷：" + getChest(v.chest) + "；";
+  var fatigue = "乏力：" + getFatigue(v.fatigue) + "；";
+  var diarrhea = "腹泻：" + getDiarrhea(v.diarrhea) + "；";
+  var diarrheaNum = "腹泻次数:" + v.diarrheaNum + "次；";
+  var others = "其他：" + v.others;
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text">\n' +
-    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId)+ ')\'>删除</a></h4>\n' +
-    '                                      <p class="weui-media-box__desc">' + v.remarks + '</p>\n' +
+    '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&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">' + familyStatus + medical + temperature + cough + muscle + dyspnea + chest + fatigue + diarrhea + diarrheaNum + others + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -104,78 +287,72 @@ 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 user_name = $("#js_input_user_name").val();
-  if(user_name==""){
-    alert("请填写家人姓名");
-    return;
-  }if(user_name.length>25){
-    alert("请填写正确格式家人姓名");
-    return;
-  }
-  var remarks = $("#rb_remarks").val();
-  if(remarks==""){
-    alert("请填写病情描述");
-    return;
-  }if(remarks.length>100){
-    alert("病情描述内容太长");
-    return;
-  }
-  var medical = "";
-  if ($("input[name='medical']:checked").val() == "on")
-    medical = "1";
-  else
-    medical = "0";
-  var conditionStatus = "";
-  if ($("input[name='checkbox1']:checked").val() == "on")
-    conditionStatus += "1";
-  else
-    conditionStatus += "0";
-  if ($("input[name='checkbox2']:checked").val() == "on")
-    conditionStatus += ",2";
-  else
-    conditionStatus += ",0";
-  if ($("input[name='checkbox3']:checked").val() == "on")
-    conditionStatus += ",3";
-  else
-    conditionStatus += ",0";
-  if ($("input[name='checkbox4']:checked").val() == "on")
-    conditionStatus += ",4";
-  else
-    conditionStatus += ",0";
-  if ($("input[name='checkbox5']:checked").val() == "on")
-    conditionStatus += ",5";
-  else
-    conditionStatus += ",0";
-  if ($("input[name='checkbox6']:checked").val() == "on")
-    conditionStatus += ",4";
-  else
-    conditionStatus += ",6";
 
+  // console.log("sss");
+  // console.log(
+  //     "姓名", $("#js_input_user_name").val(),
+  //     "性别", $("#js_input_user_sex").val(), "实际值", $("#js_input_user_sex").attr("data-values"),
+  //     "年龄", $("#js_input_user_age").val(),
+  //     "基本状况", $("#js_input_user_status").val(),
+  //     "状况描述", $("#jibenmiaoshu").val(),
+  //     "是否确诊", $("#switchQuezhen").val(),
+  //     "体温", $("#js_input_user_tiwen").val(),
+  //     "咳嗽", $("#js_input_user_kesou").val(),
+  //     "肌肉酸痛", $("#js_input_user_jirou").val(),
+  //     "呼吸困难", $("#js_input_user_huxi").val(),
+  //     "胸闷", $("#js_input_user_xiongmen").val(),
+  //     "乏力", $("#js_input_user_fali").val(),
+  //     "腹泻", $("#js_input_user_fuxie").val(),
+  //     "次数", $("#js_input_user_cishu").val(),
+  //     "其他", $("#shuruqita").val(),
+  // );
+  // return;
+  var userId = $("#userId").val();
+  var userName = $("#js_input_user_name").val();
+  var grender = $("#js_input_user_sex").attr("data-values");
+  var age = $("#js_input_user_age").val();
+  var familyStatus = $("#js_input_user_status").attr("data-values");
+  var statusDesp = $("#jibenmiaoshu").val();
+  var medical = $("#switchQuezhen").val() == "on" ? 1 : 0;
+  var temperature = $("#js_input_user_tiwen").val();
+  var cough = $("#js_input_user_kesou").attr("data-values");
+  var muscle = $("#js_input_user_jirou").attr("data-values");
+  var dyspnea = $("#js_input_user_huxi").attr("data-values");
+  var chest = $("#js_input_user_xiongmen").attr("data-values");
+  var fatigue = $("#js_input_user_fali").attr("data-values");
+  var diarrhea = $("#js_input_user_fuxie").attr("data-values");
+  var diarrheaNum = $("#js_input_user_cishu").val();
+  var others = $("#shuruqita").val();
   $.ajax({
-    url: '/home/addRibao.json',
+    url: '/home/addRibao',
     type: "post",
     data: {
-      "userName": user_name,
-      "conditionStatus": conditionStatus,
+      "userCreate": userId,
+      "userName": userName,
+      "grender": grender,
+      "age": age,
+      "familyStatus": familyStatus,
+      "statusDesp": statusDesp,
       "medical": medical,
-      "remarks": remarks,
+      "temperature": temperature,
+      "cough": cough,
+      "muscle": muscle,
+      "dyspnea": dyspnea,
+      "chest": chest,
+      "fatigue": fatigue,
+      "diarrhea": diarrhea,
+      "diarrheaNum": diarrheaNum,
+      "others": others,
     },
     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 +360,7 @@ function ribaoCommit() {
 
 function deleteSuspected(suspectedId) {
   $.ajax({
-    url: '/home/deleteSuspected.json',
+    url: '/home/deleteSuspected',
     type: "post",
     data: {
       "suspectedId": suspectedId
@@ -196,17 +373,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 +397,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 {
@@ -244,32 +428,133 @@ $("#my-input-ribao").calendar({
 
 
 function helpValue1(v) {
-  var conditionStatusList = v.conditionStatus.split(',');
-  var conditionStatus = v.userName + "：";
-  if (conditionStatusList[0] > 0)
-    conditionStatus += "&nbsp;&nbsp;&nbsp;咳嗽"
-  if (conditionStatusList[1] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
-  }
-  if (conditionStatusList[2] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;腹泻"
-  }
-  if (conditionStatusList[3] > 0) {
-      conditionStatus += "&nbsp;&nbsp;&nbsp;酸痛"
-  }
-  if (conditionStatusList[4] > 0) {
-    conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"
-  }
-  if (conditionStatusList[5] > 0) {
-    conditionStatus += "&nbsp;&nbsp;&nbsp;其他"
-  }
-  if (v.medical > 0)
-    conditionStatus += "&nbsp;&nbsp;&nbsp;确诊"
-  else
-    conditionStatus += "&nbsp;&nbsp;&nbsp;未确诊"
+  var userName = v.userName + "：";
+  var grender = getGreder(v.grender);
+  var age = v.age;
+  var familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
+  var medical = "是否确诊：" + getGreder(v.grender) + "；";
+  var temperature = "体温：" + v.temperature + "；";
+  var cough = "咳嗽：" + getCough(v.cough) + "；";
+  var muscle = "肌肉酸痛：" + getMuscle(v.muscle) + "；";
+  var dyspnea = "呼吸困难：" + getDyspnea(v.dyspnea) + "；";
+  var chest = "胸闷：" + getChest(v.chest) + "；";
+  var fatigue = "乏力：" + getFatigue(v.fatigue) + "；";
+  var diarrhea = "腹泻：" + getDiarrhea(v.diarrhea) + "；";
+  var diarrheaNum = "腹泻次数:" + v.diarrheaNum + "次；";
+  var others = "其他：" + v.others;
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text">\n' +
-    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc">' + v.remarks + '</p>\n' +
+    '                                      <h4 class="weui-media-box__title">'  + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age  + '</h4>\n' +
+    '                                      <p class="weui-media-box__desc">' +familyStatus + medical + temperature + cough + muscle + dyspnea + chest + fatigue + diarrhea + diarrheaNum + others  + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
+
+
+function getGreder(greder) {
+  if (greder == 1)
+    return "男";
+  else if (greder == 2)
+    return "女";
+  return "";
+}
+
+function getFamilyStatus(familyStatus) {
+  if (familyStatus == 1)
+    return "心脑血管疾病（服用ARB）";
+  else if (familyStatus == 2)
+    return "心脑血管疾病（未服ARB）";
+  else if (familyStatus == 3)
+    return "呼吸系统病史";
+  else if (familyStatus == 4)
+    return "肿瘤病史";
+  else if (familyStatus == 5)
+    return "糖尿病史";
+  else if (familyStatus == 6)
+    return "服用过激素药物";
+  else if (familyStatus == 7)
+    return "妊娠期";
+  else if (familyStatus == 8)
+    return "其他";
+  return "";
+}
+
+function getCough(cough) {
+  if (cough == 0)
+    return "无咳嗽";
+  else if (cough == 1)
+    return "偶尔短暂咳嗽";
+  else if (cough == 2)
+    return "频繁咳嗽轻度影响生活";
+  else if (cough == 3)
+    return "频繁咳嗽重度影响生活";
+  return "";
+}
+
+function getMuscle(muscle) {
+  if (muscle == 0)
+    return "无";
+  else if (muscle == 1)
+    return "加重";
+  else if (muscle == 2)
+    return "好转";
+  else if (muscle == 3)
+    return "无变化";
+  return "";
+}
+
+function getDyspnea(dyspnea) {
+  if (dyspnea == 0)
+    return "无";
+  else if (dyspnea == 1)
+    return "加重";
+  else if (dyspnea == 2)
+    return "好转";
+  else if (dyspnea == 3)
+    return "无变化";
+  else if (dyspnea == 4)
+    return "严重";
+  return "";
+}
+
+function getChest(chest) {
+  if (chest == 0)
+    return "无";
+  else if (chest == 1)
+    return "端坐呼吸";
+  else if (chest == 2)
+    return "活动无耐力";
+  else if (chest == 3)
+    return "无变化";
+  return "";
+}
+
+function getFatigue(fatigue) {
+  if (fatigue == 0)
+    return "无";
+  else if (fatigue == 1)
+    return "加重";
+  else if (fatigue == 2)
+    return "好转";
+  else if (fatigue == 3)
+    return "无变化";
+  return "";
+}
+
+function getMedical(medical) {
+  if (medical == 0)
+    return "为确诊";
+  else if (medical == 1)
+    return "确诊";
+  return "";
+}
+
+
+function getDiarrhea(diarrhea) {
+  if (diarrhea == 0)
+    return "无";
+  else if (diarrhea == 1)
+    return "有";
+  return "";
+}
+
+

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/wuye/qiuzhu.js

@@ -1,12 +1,14 @@
 function qiuzhu_init() {
+  //统计求助及处理数据
   analyData();
+  //求组信息列表
 }
 
 function analyData() {
   $('#userHelpAnaly').empty();//清除节点
   $.ajax({
     url: '/wuye/userHelpAnaly',
-    data: {queryDate: '2020-02-05'},
+    data: {queryDate: '2020-02-05', userId: 0},
     type: 'GET',
     success: function (data) {
       console.log(data);
@@ -25,30 +27,16 @@ function analyData() {
 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 class="placeholder">已解决总数</div>\n' +
+    '                       <div>' + data.totalDo + '</div>\n' +
     '                   </div>\n' +
     '                   <div class="weui-flex__item">\n' +
-    '                       <div class="placeholder">今日已处理</div>\n' +
-    '                       <div>' + data.todayDo + '</div>\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.todayDonot + '</div>\n' +
-    '                   </div>\n' +
-    '               </div>\n' +
-    '               <div class="weui-flex"> \n' +
-    '                   <div class="weui-flex__item">\n' +
-    '                       <div class="placeholder">近30天新增</div>\n' +
-    '                       <div>' + data.monthAdd + '</div>\n' +
-    '                   </div>\n' +
-    '                   <div class="weui-flex__item">\n' +
-    '                       <div class="placeholder">近30天已处理</div>\n' +
-    '                       <div>' + data.monthDo + '</div>\n' +
-    '                   </div>\n' +
-    '                   <div class="weui-flex__item">\n' +
-    '                   <div class="placeholder">近30天未处理</div>\n' +
-    '                       <div>' + data.monthDonot + '</div>\n' +
+    '                   <div class="placeholder">未处理总数</div>\n' +
+    '                       <div>' + data.totalDonot + '</div>\n' +
     '                   </div>\n' +
     '               </div>'));
 }

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-ui/templates/yeweihui/ribao.ftl

@@ -77,11 +77,11 @@
                         tr = $("<tr></tr>");
                     }
                     var td;
-                    if(v.msStatus == 2){//异常
-                        td = '<td style="background-color: yellow" align="center">'+v.doorplate+'</td>';
-                    }else if(v.msStatus != 2 && v.reportId != 0 && v.msStatus != null && v.reportId !=null){//已报
+                    if(v.msStatus == 2 && v.reportStatus == 2){//异常
+                        td = '<td style="background-color: yellow" align="center" value="'+v.houseId+'"><button style="height: 100%;width: 100%;background-color: yellow" value="'+v.houseId+'" onclick="ribao_ycxq(this.value)">'+v.doorplate+'</button></td>';
+                    }else if(v.msStatus != 2 && v.reportStatus == 2 && v.msStatus != null && v.reportStatus !=null){//已报
                         td = '<td style="background-color: #0bb20c" align="center">'+v.doorplate+'</td>';
-                    }else if(v.reportId == null){//待报
+                    }else if(v.reportStatus == 1 || v.reportStatus == 0){//待报
                         td = '<td style="background-color: #75859f" align="center">'+v.doorplate+'</td>';
                     }
                     tr.append(td);
@@ -94,9 +94,16 @@
         });
     })(jQuery);
 
+    function ribao_ycxq(houseId) {
+        $('#tableId').on('click', function () {
+            window.location.href = "/yeweihui/ribaoXq.html?"+houseId
+        });
+
+    }
+
     $('#return').on('click', function () {
-        window.location.href = "/user/home.html#tab2"
-        // alert("日报");
+        window.history.back()
+        // window.location.href = "/user/home.html#tab2"
     });
 </script>
 

whepi-ui/templates/yeweihui/ribao.js

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

whepi-ui/templates/yeweihui/ribaoXq.ftl

@@ -1,29 +1,116 @@
+<#assign title="业委会"/>
+<#include "/home/frag.head.ftl" />
 <div class="page__bd">
+
     <div class="weui-tab">
-        <div class="weui-tab__panel">
+        <div class="weui-tab__panel" style="height: 570px">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
-                <div class="weui-btn-area">
-                    <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">查询</a>
-                </div>
-                <div class="weui-panel weui-panel_access">
-                    <div class="weui-panel__bd">
-                            <div class="weui-media-box__bd">
-                                <div style="display: flex; flex-direction: row; justify-content: space-between;">
-                                    <p class="weui-media-box__desc">&nbsp;&nbsp; 7-2-202</p>
-                                    <p class="weui-media-box__desc">2020-02-02 14:30</p>
-                                </div>
-                                <h4 class="weui-media-box__title">异常情况:</h4>
-                                <p class="weui-media-box__desc">确诊入院1人,居家隔离2人</p>
+                <#--<div class="weui-btn-area">-->
+                    <#--<a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">查询</a>-->
+                <#--</div>-->
+                    <div class="weui-tab">
+                        <div class="weui-navbar">
+                            <div class="weui-bar__item_on" style="text-align: center">
+                                <h3 style="text-align: center" id="msh3"></h3>
+                                <h5 style="text-align: center" id="msh5"></h5>
                             </div>
-                        <#--<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">-->
-                            <#--<div class="weui-media-box__bd">-->
-                                <#--<h4 class="weui-media-box__title">医药求助</h4>-->
-                                <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
-                            <#--</div>-->
-                        <#--</a>-->
+                        </div>
+                    </div>
+                    <br/>
+                    <br/>
+                    <div>
+                        <table cellspacing="0" cellpadding="0" style="width: 100%">
+                            <tbody><#--border="1" cellspacing="0" cellpadding="0"-->
+                            <tr>
+                                <td style="background-color: lightgrey" align="center">今日居家</td>
+                                <td style="background-color: lightgrey" align="center">确诊入院</td>
+                                <td style="background-color: lightgrey" align="center">异常观察</td>
+                                <td style="background-color: lightgrey" align="center">身体正常</td>
+                            </tr>
+                            <tr id="zc">
+                                <#--<td align="center">8</td>-->
+                                <#--<td align="center">0</td>-->
+                                <#--<td align="center">0</td>-->
+                                <#--<td align="center">0</td>-->
+                                <#--<td align="center">8</td>-->
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div>
+                        <table border="1" cellspacing="0" cellpadding="0" style="width: 100%">
+                            <tbody id="tableIdycxq">
+                            <tr>
+                                <td colspan="3" align="center" style="background-color: lightgrey">病情描述</td>
+                            </tr>
+                            <tr>
+                                <td align="center">家人</td>
+                                <td align="center">症状</td>
+                                <td align="center">病情描述</td>
+                            </tr>
+                            </tbody>
+                        </table>
                     </div>
-                </div>
             </div>
         </div>
+        <div class="weui-btn-area"  style="display: grid;">
+        <#--<p id="btnRB" class="weui-btn weui-btn_primary" href="javascript:" type="hidden">一键通知</p>-->
+            <p id="returnycxq" class="weui-btn weui-btn_primary" href="javascript:">返&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;回</p>
+        </div>
     </div>
 </div>
+<#include "/home/frag.foot.ftl" />
+<script>
+    (function ($) {
+        $(function(){
+            var date2 = new Date();
+            date2.setTime(date2.getTime());
+            var month = date2.getMonth()+1;
+            var day = date2.getDate();
+            $("#msh5").text('('+month+'/'+day+')健康日报')
+        var search = location.search;
+        var houseId;
+        if(search.indexOf("?")!=-1){
+            houseId = search.substr(1);
+        }
+        $.ajax({
+            url: '/yeweihui/ribaoDyYcXq',
+            type: "get",
+            data: {
+                houseId:houseId
+            },success: function(data){
+                console.log(data.data);
+                for (var i = 0; i < data.data.length; i++) {
+                    var v = data.data[i];
+                    if(i==0){
+                        $("#msh3").text(v.ridgepole+"栋"+v.unit+"单元"+v.doorplate+"室");
+                        var t1 = $('<td align="center">'+v.safetyNum+'</td>');
+                        var t2 = $('<td align="center">'+v.sureNum+'</td>');
+                        var t3 = $('<td align="center">'+v.suspectedNum+'</td>');
+                        var t4 = $('<td align="center">'+(v.safetyNum-v.sureNum-v.suspectedNum)+'</td>');
+                        $("#zc").append(t1);
+                        $("#zc").append(t2);
+                        $("#zc").append(t3);
+                        $("#zc").append(t4);
+                    }
+
+                    var tr = $("<tr></tr>");
+                    var td1 = $('<td align="center">'+v.userName+'</td>');
+                    var td2 = $('<td align="center">'+v.zhengzhuang+'</td>');
+                    var td3 = $('<td align="center">'+v.others+'</td>');
+                    tr.append(td1);
+                    tr.append(td2);
+                    tr.append(td3);
+                    $("#tableIdycxq").append(tr);
+
+                }
+
+            }
+        });
+        });
+    })(jQuery);
+    $('#returnycxq').on('click', function () {
+        window.history.back()
+        // window.location.href = "/user/home.html#tab2"
+    });
+</script>

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/dao/RbMapper.java

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

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

@@ -0,0 +1,17 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.SysUserRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+
+@Mapper
+@Repository
+public interface YeweihuiSysOwnerMapper extends BaseMapper<SysUserRole> {
+
+    @Select("select uptown_id from sys_owner where owner_id=#{propertyId}")
+    long queryUptownIdByUserId(@Param("propertyId") Long propertyId);
+}

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

@@ -0,0 +1,16 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.SysUserRole;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface YeweihuiUserRoleMapper extends BaseMapper<SysUserRole> {
+
+    @Select("select property_id from sys_user_role where user_id=#{userId} and role_id=2")
+    long queryPropertyIdByUserId(@Param("userId") Long userId);
+}

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

@@ -41,6 +41,9 @@ public class MsReport {
     @TableField("report_date")
     private Date reportDate;
 
+    @TableField("report_status")
+    private Integer reportStatus;
+
     @TableField("ms_status")
     private Integer msStatus;
 

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,68 @@ 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(exist = false)
+    private String coughStr;
+
+    @TableField("muscle")
+    private Integer muscle;
+
+    @TableField(exist = false)
+    private String muscleStr;
+
+    @TableField("dyspnea")
+    private Integer dyspnea;
+
+    @TableField(exist = false)
+    private String dyspneaStr;
+
+    @TableField("chest")
+    private Integer chest;
+
+    @TableField(exist = false)
+    private String chestStr;
+
+    @TableField("fatigue")
+    private Integer fatigue;
 
-    @TableField("remarks")
-    private String remarks;
+    @TableField(exist = false)
+    private String fatigueStr;
+
+    @TableField("diarrhea")
+    private Integer diarrhea;
+
+    @TableField(exist = false)
+    private String diarrheaStr;
+
+    @TableField(exist = false)
+    private String zhengzhuang;
+
+    @TableField("diarrhea_num")
+    private Integer diarrheaNum;
+
+    @TableField("others")
+    private String others;
 
     @TableField("user_create")
     private Long userCreate;
@@ -50,4 +103,25 @@ public class MsSuspected {
 
     @TableField("time_update")
     private DateTime timeUpdate;
+
+    @TableField(exist = false)
+    private Integer safetyNum;
+
+    @TableField(exist = false)
+    private Integer sureNum;
+
+    @TableField(exist = false)
+    private Integer suspectedNum;
+
+    @TableField(exist = false)
+    private Integer qz;
+
+    @TableField(exist = false)
+    private String ridgepole;
+
+    @TableField(exist = false)
+    private String unit;
+
+    @TableField(exist = false)
+    private String doorplate;
 }

whepi-web/src/main/java/com/bofeng/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/SysUptownHouse.java

@@ -40,6 +40,9 @@ public class SysUptownHouse implements Serializable {
     @TableField("status")
     private int status;
 
+    @TableField("report_status")
+    private int reportStatus;
+
     @TableField("time_create")
     private DateTime timeCreate;
 

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

@@ -0,0 +1,55 @@
+package com.bofeng.entity;
+
+import lombok.Data;
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+
+/**
+ * sys_user_role
+ * @author 
+ */
+@Data
+public class SysUserRole implements Serializable {
+    /**
+     * 用户角色关系ID
+     */
+    private Long urId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 角色ID:1居民,2业委会,3商家
+     */
+    private Integer roleId;
+
+    /**
+     * 属性ID,居民门牌ID,业委会ID
+     */
+    private Long propertyId;
+
+    /**
+     * 新增人
+     */
+    private Long userCreate;
+
+    /**
+     * 新增时间
+     */
+    private DateTime timeCreate;
+
+    /**
+     * 修改人
+     */
+    private Long userUpdate;
+
+    /**
+     * 修改时间
+     */
+    private DateTime timeUpdate;
+
+    private static final long serialVersionUID = 1L;
+}

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;
@@ -72,6 +71,7 @@ public class MsReportService {
             msReport.setSuspectedNum(0);
             msReport.setRemarks("");
             msReport.setReportDate(DateTime.now().toDate());
+            msReport.setReportStatus(1);
             msReport.setMsStatus(1);
             msReport.setUserCreate(userCreate);
             msReport.setTimeCreate(DateTime.now());
@@ -87,6 +87,7 @@ public class MsReportService {
                     msReport.setMsStatus(1);
                 else
                     msReport.setMsStatus(2);
+                msReport.setReportStatus(1);
                 msReport.setSafetyNum(Integer.parseInt(safetyNum));
                 msReport.setUserUpdate(0L);
                 msReport.setTimeUpdate(DateTime.now());

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

@@ -2,6 +2,8 @@ package com.bofeng.service;
 
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.QzTaskDao;
+import com.bofeng.dao.YeweihuiSysOwnerMapper;
+import com.bofeng.dao.YeweihuiUserRoleMapper;
 import com.bofeng.entity.QzTask;
 import lombok.var;
 import org.joda.time.DateTime;
@@ -19,8 +21,19 @@ public class QzTaskService {
   @Autowired
   private QzTaskDao qzTaskDao;
 
-  public List<QzTask> selectAll() {
-    return qzTaskDao.selectAll();
+  @Autowired
+  private YeweihuiUserRoleMapper yeweihuiUserRoleMapper;
+
+  @Autowired
+  private YeweihuiSysOwnerMapper yeweihuiSysOwnerMapper;
+
+  public List<QzTask> selectAll(Long userId) {
+
+    Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(userId);
+
+    Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
+
+    return qzTaskDao.selectAll(uptownId);
   }
 
   public List<QzTask> queryByHouseNumber(String houseNumber, Integer status) {
@@ -46,6 +59,8 @@ 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());

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

@@ -3,9 +3,7 @@ package com.bofeng.service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.bofeng.dao.QzTaskDao;
 import com.bofeng.dao.RbMapper;
-import com.bofeng.entity.QzTask;
-import com.bofeng.entity.SysUptownHouse;
-import com.bofeng.entity.sysUptownUnit;
+import com.bofeng.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,8 +19,8 @@ public class RbService {
     private RbMapper rbMapper;
 
     public List<sysUptownUnit> selectAll (Long userId) {
-        List<sysUptownUnit> sysUptownHouses = rbMapper.selectDY(userId);
-        return sysUptownHouses;
+        List<sysUptownUnit> sysUptownUnits = rbMapper.selectDY(userId);
+        return sysUptownUnits;
     }
 
     public List<SysUptownHouse> selectXq (Long str) {
@@ -31,7 +29,78 @@ public class RbService {
         Date date = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String dateStr = simpleDateFormat.format(date);
-        List<SysUptownHouse> sysUptownHouses = rbMapper.selectMp(str,dateStr);
+        List<SysUptownHouse> sysUptownHousesss = rbMapper.selectMp(str,dateStr);
+        return sysUptownHousesss;
+    }
+
+    public List<MsSuspected> selectYcXq (Long houseId) {
+        Date date = new Date();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String dateStr = simpleDateFormat.format(date);
+        List<MsSuspected> sysUptownHouses = rbMapper.selectYcXq(houseId,dateStr);
+        if(sysUptownHouses.size() !=0){
+            for (int i = 0; i < sysUptownHouses.size(); i++) {
+
+
+
+
+                if(sysUptownHouses.get(i).getCough()==0){
+                    sysUptownHouses.get(i).setChestStr("无咳嗽");
+                }else if(sysUptownHouses.get(i).getCough()==1){
+                    sysUptownHouses.get(i).setChestStr("偶尔短暂咳嗽");
+                }else if(sysUptownHouses.get(i).getCough()==2){
+                    sysUptownHouses.get(i).setChestStr("频繁咳嗽轻重");
+                }else if(sysUptownHouses.get(i).getCough()==3){
+                    sysUptownHouses.get(i).setChestStr("频繁咳嗽重度");
+                }
+                if(sysUptownHouses.get(i).getMuscle()==0){
+                    sysUptownHouses.get(i).setMuscleStr("无肌肉酸痛");
+                }else if(sysUptownHouses.get(i).getMuscle()==1){
+                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛加重");
+                }else if(sysUptownHouses.get(i).getMuscle()==2){
+                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛好转");
+                }else if(sysUptownHouses.get(i).getMuscle()==3){
+                    sysUptownHouses.get(i).setMuscleStr("肌肉酸痛无变化");
+                }
+                if(sysUptownHouses.get(i).getDyspnea()==0){
+                    sysUptownHouses.get(i).setDyspneaStr("无呼吸困难");
+                }else if(sysUptownHouses.get(i).getDyspnea()==1){
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难加重");
+                }else if(sysUptownHouses.get(i).getDyspnea()==2){
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难好转");
+                }else if(sysUptownHouses.get(i).getDyspnea()==3){
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难无变化");
+                }else if(sysUptownHouses.get(i).getDyspnea()==4){
+                    sysUptownHouses.get(i).setDyspneaStr("呼吸困难严重");
+                }
+                if(sysUptownHouses.get(i).getChest()==0){
+                    sysUptownHouses.get(i).setChestStr("无胸闷");
+                }else if(sysUptownHouses.get(i).getChest()==1){
+                    sysUptownHouses.get(i).setChestStr("端坐呼吸");
+                }else if(sysUptownHouses.get(i).getChest()==2){
+                    sysUptownHouses.get(i).setChestStr("活动无");
+                }else if(sysUptownHouses.get(i).getChest()==3){
+                    sysUptownHouses.get(i).setChestStr("无变化");
+                }
+                if(sysUptownHouses.get(i).getFatigue() == 0){
+                    sysUptownHouses.get(i).setFatigueStr("无乏力");
+                }else if(sysUptownHouses.get(i).getFatigue() == 1){
+                    sysUptownHouses.get(i).setFatigueStr("乏力加重");
+                }else if(sysUptownHouses.get(i).getFatigue() == 2){
+                    sysUptownHouses.get(i).setFatigueStr("乏力好转");
+                }else if(sysUptownHouses.get(i).getFatigue() == 3){
+                    sysUptownHouses.get(i).setFatigueStr("乏力无变化");
+                }
+                if(sysUptownHouses.get(i).getDiarrhea() == 0){
+                    sysUptownHouses.get(i).setDiarrheaStr("无腹泻");
+                }else if(sysUptownHouses.get(i).getDiarrhea() == 1){
+                    sysUptownHouses.get(i).setDiarrheaStr("有腹泻");
+                }
+                sysUptownHouses.get(i).setZhengzhuang(sysUptownHouses.get(i).getChestStr()+","+sysUptownHouses.get(i).getMuscleStr()+","+sysUptownHouses.get(i).getDyspneaStr()
+                        +","+sysUptownHouses.get(i).getChestStr()+","+sysUptownHouses.get(i).getFatigueStr()+","+sysUptownHouses.get(i).getDiarrheaStr());
+            }
+        }
+
         return sysUptownHouses;
     }
 }

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

@@ -56,10 +56,10 @@ public class UserOpenController {
                              @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(123L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(123L);
+//            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()+"\"");
@@ -98,7 +98,7 @@ public class UserOpenController {
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
             } else if (userType == 2) {
-                List<QzTask> taskList = qzTaskService.selectAll();
+                List<QzTask> taskList = qzTaskService.selectAll(userId);
                 model.put("taskList", YvanUtil.toJsonPretty(taskList));
                 List<sysUptownUnit> rbList = rbService.selectAll(userId);
                 model.put("rbList", YvanUtil.toJsonPretty(rbList));

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(userId);
 //        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

@@ -4,6 +4,8 @@ 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;
 import com.bofeng.service.RbService;
@@ -37,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) {
 
@@ -44,16 +49,16 @@ public class YeWeiHuiController {
         queryParam.put("userId", "12345677");
         queryParam.put("statistics", "M");
 
-        List<QzTask> taskList = qzTaskService.selectAll();
-        List<sysUptownUnit> rbList = rbService.selectAll(1224706869998772226L);
-        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+//        List<QzTask> taskList = qzTaskService.selectAll(2L);
+        List<sysUptownUnit> rbList = rbService.selectAll(1225331049509187586L);
+//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
         return new ModelAndView("/yeweihui/home.ftl", model);
     }
 
     @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志愿者
@@ -90,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);
     }
@@ -97,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);
@@ -124,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);
@@ -147,4 +158,18 @@ public class YeWeiHuiController {
 
         return Model.newSuccess(rbList);
     }
+
+    @GetMapping("/yeweihui/ribaoXq.html")
+    public ModelAndView yeweihuiRibaoYcXq(ModelMap model) {
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+        queryParam.put("userId", "12345677");
+        queryParam.put("statistics", "M");
+        return new ModelAndView("/yeweihui/ribaoXq.ftl", model);
+    }
+
+    @GetMapping("/yeweihui/ribaoDyYcXq")
+    public Model<List<MsSuspected>> yeweihuiRibaoYcXq(Long houseId) {
+        List<MsSuspected> rbList = rbService.selectYcXq(houseId);
+        return Model.newSuccess(rbList);
+    }
 }

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

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

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

@@ -1,123 +0,0 @@
-<?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.generator.QzTaskReplyDao">
-  <resultMap id="BaseResultMap" type="com.bofeng.generator.QzTaskReply">
-    <id column="reply_id" jdbcType="BIGINT" property="replyId" />
-    <result column="task_id" jdbcType="BIGINT" property="taskId" />
-    <result column="user_id" jdbcType="BIGINT" property="userId" />
-    <result column="reply_content" jdbcType="VARCHAR" property="replyContent" />
-    <result column="user_create" jdbcType="BIGINT" property="userCreate" />
-    <result column="time_create" jdbcType="TIMESTAMP" property="timeCreate" />
-    <result column="user_update" jdbcType="BIGINT" property="userUpdate" />
-    <result column="time_update" jdbcType="TIMESTAMP" property="timeUpdate" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    reply_id, task_id, user_id, reply_content, user_create, time_create, user_update, 
-    time_update
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from qz_task_reply
-    where reply_id = #{replyId,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from qz_task_reply
-    where reply_id = #{replyId,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" keyColumn="reply_id" keyProperty="replyId" parameterType="com.bofeng.generator.QzTaskReply" useGeneratedKeys="true">
-    insert into qz_task_reply (task_id, user_id, reply_content, 
-      user_create, time_create, user_update, 
-      time_update)
-    values (#{taskId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{replyContent,jdbcType=VARCHAR}, 
-      #{userCreate,jdbcType=BIGINT}, #{timeCreate,jdbcType=TIMESTAMP}, #{userUpdate,jdbcType=BIGINT}, 
-      #{timeUpdate,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" keyColumn="reply_id" keyProperty="replyId" parameterType="com.bofeng.generator.QzTaskReply" useGeneratedKeys="true">
-    insert into qz_task_reply
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="taskId != null">
-        task_id,
-      </if>
-      <if test="userId != null">
-        user_id,
-      </if>
-      <if test="replyContent != null">
-        reply_content,
-      </if>
-      <if test="userCreate != null">
-        user_create,
-      </if>
-      <if test="timeCreate != null">
-        time_create,
-      </if>
-      <if test="userUpdate != null">
-        user_update,
-      </if>
-      <if test="timeUpdate != null">
-        time_update,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="taskId != null">
-        #{taskId,jdbcType=BIGINT},
-      </if>
-      <if test="userId != null">
-        #{userId,jdbcType=BIGINT},
-      </if>
-      <if test="replyContent != null">
-        #{replyContent,jdbcType=VARCHAR},
-      </if>
-      <if test="userCreate != null">
-        #{userCreate,jdbcType=BIGINT},
-      </if>
-      <if test="timeCreate != null">
-        #{timeCreate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="userUpdate != null">
-        #{userUpdate,jdbcType=BIGINT},
-      </if>
-      <if test="timeUpdate != null">
-        #{timeUpdate,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.bofeng.generator.QzTaskReply">
-    update qz_task_reply
-    <set>
-      <if test="taskId != null">
-        task_id = #{taskId,jdbcType=BIGINT},
-      </if>
-      <if test="userId != null">
-        user_id = #{userId,jdbcType=BIGINT},
-      </if>
-      <if test="replyContent != null">
-        reply_content = #{replyContent,jdbcType=VARCHAR},
-      </if>
-      <if test="userCreate != null">
-        user_create = #{userCreate,jdbcType=BIGINT},
-      </if>
-      <if test="timeCreate != null">
-        time_create = #{timeCreate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="userUpdate != null">
-        user_update = #{userUpdate,jdbcType=BIGINT},
-      </if>
-      <if test="timeUpdate != null">
-        time_update = #{timeUpdate,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where reply_id = #{replyId,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.bofeng.generator.QzTaskReply">
-    update qz_task_reply
-    set task_id = #{taskId,jdbcType=BIGINT},
-      user_id = #{userId,jdbcType=BIGINT},
-      reply_content = #{replyContent,jdbcType=VARCHAR},
-      user_create = #{userCreate,jdbcType=BIGINT},
-      time_create = #{timeCreate,jdbcType=TIMESTAMP},
-      user_update = #{userUpdate,jdbcType=BIGINT},
-      time_update = #{timeUpdate,jdbcType=TIMESTAMP}
-    where reply_id = #{replyId,jdbcType=BIGINT}
-  </update>
-</mapper>

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,9 +42,10 @@
     </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
+        INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
         where a.user_id=#{userId} limit 1
     </select>