5 年之前 · 124b183772
--- a/admin-ui/app/whepi/ceshi.js
+++ b/admin-ui/app/whepi/ceshi.js
@@ -64,7 +64,7 @@ define(function (require) {
 
				                     var a = $form.formGet()
			
 
				 
			
 
				                     $.yvan.ajax({
			
 
				-                      method: 'post',
			
 
				+                      method: 'get',
			
 
				                       url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
			
 
				                       data: $form.formGet(),
			
 
				                       success: function (data) {
			
--- a/admin-ui/app/whepi/mock/menu.json
+++ b/admin-ui/app/whepi/mock/menu.json
@@ -34,6 +34,14 @@
 
				           "children": []
			
 
				         }
			
 
				       ]
			
 
				+    },
			
 
				+    {
			
 
				+      "id": "ENT10011",
			
 
				+      "text": "授权测试",
			
 
				+      "href": "/app/whepi/ceshi.js",
			
 
				+      "iconCls": "icon-blank fa fa-align-justify",
			
 
				+      "state": "close",
			
 
				+      "children": []
			
 
				     }
			
 
				   ]
			
 
				 }
			
--- a/whepi-doc/task.sql
+++ b/whepi-doc/task.sql
@@ -4,7 +4,7 @@
 
				 drop table if exists qz_task;
			
 
				 create table qz_task (
			
 
				     task_id         bigint(20)      NOT NULL DEFAULT 0          COMMENT '求助任务ID',
			
 
				-    task_target     varchar(20)     NOT NULL DEFAULT ''         COMMENT '求助对象：A业委会，B居委会，C物业，D志愿者',
			
 
				+    task_target     varchar(20)     NOT NULL DEFAULT ''         COMMENT '求助对象：A管理员，B居委会，C物业，D志愿者',
			
 
				     task_status     int(11)         NOT NULL DEFAULT 0          COMMENT '求助状态：1未解决，2处理中，3已处理',
			
 
				     task_title      varchar(20)     NOT NULL DEFAULT ''         COMMENT '求助标题',
			
 
				     remark          varchar(100)    NOT NULL DEFAULT ''         COMMENT '备注',
			
--- a/whepi-ui/css/app.0d06b8fd.css
+++ b/whepi-ui/css/app.0d06b8fd.css
@@ -0,0 +1 @@
 
				+body{font-size:.42667rem;background-color:#f8f8f8;-webkit-font-smoothing:antialiased}
			
--- a/whepi-ui/css/chunk-4ed49933.df312b50.css
+++ b/whepi-ui/css/chunk-4ed49933.df312b50.css
--- a/whepi-ui/css/chunk-5562ea1c.54dc77dc.css
+++ b/whepi-ui/css/chunk-5562ea1c.54dc77dc.css
--- a/whepi-ui/css/chunk-5b624388.44a53004.css
+++ b/whepi-ui/css/chunk-5b624388.44a53004.css
--- a/whepi-ui/css/chunk-5ef44a67.064a2e94.css
+++ b/whepi-ui/css/chunk-5ef44a67.064a2e94.css
--- a/whepi-ui/css/chunk-6ab6e507.55e9460c.css
+++ b/whepi-ui/css/chunk-6ab6e507.55e9460c.css
--- a/whepi-ui/css/chunk-6cdc4b15.f5c344f0.css
+++ b/whepi-ui/css/chunk-6cdc4b15.f5c344f0.css
--- a/whepi-ui/css/chunk-72ab68c2.f5f5ee37.css
+++ b/whepi-ui/css/chunk-72ab68c2.f5f5ee37.css
--- a/whepi-ui/css/chunk-737f8e34.2e115144.css
+++ b/whepi-ui/css/chunk-737f8e34.2e115144.css
--- a/whepi-ui/css/chunk-74539060.70649e80.css
+++ b/whepi-ui/css/chunk-74539060.70649e80.css
--- a/whepi-ui/css/chunk-ab14af0e.637b2b96.css
+++ b/whepi-ui/css/chunk-ab14af0e.637b2b96.css
@@ -0,0 +1 @@
 
				+.address{overflow:hidden}.address-title{height:8vh;position:relative}.address-title-txt{padding-left:.5rem;font-size:.5rem}.address-input{height:82vh;color:#505050;overflow:auto}.address-input-view{margin:0;font-size:.4rem;padding:.2rem 2rem}.address-input-view .van-cell{padding:.1rem .2rem;background-color:#e5e5e5}.address-input-code{margin:0;font-size:.4rem;padding:.2rem 2rem}.address-input-code .van-cell{padding:.1rem .2rem;border:.02667rem solid #999}.address-btn{height:10vh}
			
--- a/whepi-ui/css/chunk-c500236c.9334b350.css
+++ b/whepi-ui/css/chunk-c500236c.9334b350.css
--- a/whepi-ui/css/chunk-dbc2a580.f2b98efb.css
+++ b/whepi-ui/css/chunk-dbc2a580.f2b98efb.css
--- a/whepi-ui/css/chunk-f5b633fe.6ac591b9.css
+++ b/whepi-ui/css/chunk-f5b633fe.6ac591b9.css
--- a/whepi-ui/css/chunk-f6ad3f88.28c88e88.css
+++ b/whepi-ui/css/chunk-f6ad3f88.28c88e88.css
--- a/whepi-ui/css/chunk-fbdc2710.52dfe2b6.css
+++ b/whepi-ui/css/chunk-fbdc2710.52dfe2b6.css
--- a/whepi-ui/css/chunk-vendors.58740506.css
+++ b/whepi-ui/css/chunk-vendors.58740506.css
--- a/whepi-ui/favicon.ico
+++ b/whepi-ui/favicon.ico
--- a/whepi-ui/index.html
+++ b/whepi-ui/index.html
@@ -0,0 +1,57 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+    <meta charset=utf-8>
			
 
				+    <meta http-equiv=X-UA-Compatible content="IE=edge">
			
 
				+    <meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,viewport-fit=cover">
			
 
				+    <link rel=icon href=/favicon.ico>
			
 
				+    <title>抗击疫情</title>
			
 
				+    <link href=/css/chunk-4ed49933.df312b50.css rel=prefetch>
			
 
				+    <link href=/css/chunk-5562ea1c.54dc77dc.css rel=prefetch>
			
 
				+    <link href=/css/chunk-5b624388.44a53004.css rel=prefetch>
			
 
				+    <link href=/css/chunk-5ef44a67.064a2e94.css rel=prefetch>
			
 
				+    <link href=/css/chunk-6ab6e507.55e9460c.css rel=prefetch>
			
 
				+    <link href=/css/chunk-6cdc4b15.f5c344f0.css rel=prefetch>
			
 
				+    <link href=/css/chunk-72ab68c2.f5f5ee37.css rel=prefetch>
			
 
				+    <link href=/css/chunk-737f8e34.2e115144.css rel=prefetch>
			
 
				+    <link href=/css/chunk-74539060.70649e80.css rel=prefetch>
			
 
				+    <link href=/css/chunk-ab14af0e.637b2b96.css rel=prefetch>
			
 
				+    <link href=/css/chunk-c500236c.9334b350.css rel=prefetch>
			
 
				+    <link href=/css/chunk-dbc2a580.f2b98efb.css rel=prefetch>
			
 
				+    <link href=/css/chunk-f5b633fe.6ac591b9.css rel=prefetch>
			
 
				+    <link href=/css/chunk-f6ad3f88.28c88e88.css rel=prefetch>
			
 
				+    <link href=/css/chunk-fbdc2710.52dfe2b6.css rel=prefetch>
			
 
				+    <link href=/js/chunk-2ca1646c.42d41cf3.js rel=prefetch>
			
 
				+    <link href=/js/chunk-2d0cb6c2.28c553d1.js rel=prefetch>
			
 
				+    <link href=/js/chunk-2d0d3628.ddbfa8dd.js rel=prefetch>
			
 
				+    <link href=/js/chunk-2d0e146b.ace28509.js rel=prefetch>
			
 
				+    <link href=/js/chunk-2d2291e5.bb4d3abf.js rel=prefetch>
			
 
				+    <link href=/js/chunk-2d22b973.04855e3e.js rel=prefetch>
			
 
				+    <link href=/js/chunk-4ed49933.8edc234e.js rel=prefetch>
			
 
				+    <link href=/js/chunk-5562ea1c.79ac22cd.js rel=prefetch>
			
 
				+    <link href=/js/chunk-5b624388.e0a00440.js rel=prefetch>
			
 
				+    <link href=/js/chunk-5ef44a67.4c551877.js rel=prefetch>
			
 
				+    <link href=/js/chunk-6ab6e507.ddbf44c7.js rel=prefetch>
			
 
				+    <link href=/js/chunk-6cdc4b15.d99732e6.js rel=prefetch>
			
 
				+    <link href=/js/chunk-72ab68c2.7607cd2d.js rel=prefetch>
			
 
				+    <link href=/js/chunk-737f8e34.a2fc7003.js rel=prefetch>
			
 
				+    <link href=/js/chunk-74539060.e77047f8.js rel=prefetch>
			
 
				+    <link href=/js/chunk-ab14af0e.a00dd59c.js rel=prefetch>
			
 
				+    <link href=/js/chunk-c500236c.ac9086ef.js rel=prefetch>
			
 
				+    <link href=/js/chunk-dbc2a580.4e4c4910.js rel=prefetch>
			
 
				+    <link href=/js/chunk-f5b633fe.ea217d56.js rel=prefetch>
			
 
				+    <link href=/js/chunk-f6ad3f88.3f1b4281.js rel=prefetch>
			
 
				+    <link href=/js/chunk-fbdc2710.e57e7b8a.js rel=prefetch>
			
 
				+    <link href=/css/app.0d06b8fd.css rel=preload as=style>
			
 
				+    <link href=/css/chunk-vendors.58740506.css rel=preload as=style>
			
 
				+    <link href=/js/app.93cf23f0.js rel=preload as=script>
			
 
				+    <link href=/js/chunk-vendors.9a6cea8f.js rel=preload as=script>
			
 
				+    <link href=/css/chunk-vendors.58740506.css rel=stylesheet>
			
 
				+    <link href=/css/app.0d06b8fd.css rel=stylesheet>
			
 
				+</head>
			
 
				+<body>
			
 
				+<div id=app></div>
			
 
				+<script src=/js/chunk-vendors.9a6cea8f.js></script>
			
 
				+<script src=/js/app.93cf23f0.js></script>
			
 
				+</body>
			
 
				+</html>
			
--- a/whepi-ui/js/app.93cf23f0.js
+++ b/whepi-ui/js/app.93cf23f0.js
--- a/whepi-ui/js/app.93cf23f0.js.map
+++ b/whepi-ui/js/app.93cf23f0.js.map
--- a/whepi-ui/js/chunk-2ca1646c.42d41cf3.js
+++ b/whepi-ui/js/chunk-2ca1646c.42d41cf3.js
--- a/whepi-ui/js/chunk-2ca1646c.42d41cf3.js.map
+++ b/whepi-ui/js/chunk-2ca1646c.42d41cf3.js.map
--- a/whepi-ui/js/chunk-2d0cb6c2.28c553d1.js
+++ b/whepi-ui/js/chunk-2d0cb6c2.28c553d1.js
@@ -0,0 +1,2 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0cb6c2"],{"4a32":function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},u=[],r=t("2877"),l={},a=Object(r["a"])(l,c,u,!1,null,null,null);n["default"]=a.exports}}]);
			
 
				+//# sourceMappingURL=chunk-2d0cb6c2.28c553d1.js.map
			
--- a/whepi-ui/js/chunk-2d0cb6c2.28c553d1.js.map
+++ b/whepi-ui/js/chunk-2d0cb6c2.28c553d1.js.map
--- a/whepi-ui/js/chunk-2d0d3628.ddbfa8dd.js
+++ b/whepi-ui/js/chunk-2d0d3628.ddbfa8dd.js
@@ -0,0 +1,2 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0d3628"],{"5d14":function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div")},i=[],u={name:"communityEpidemic"},d=u,a=t("2877"),o=Object(a["a"])(d,c,i,!1,null,"1e382d83",null);n["default"]=o.exports}}]);
			
 
				+//# sourceMappingURL=chunk-2d0d3628.ddbfa8dd.js.map
			
--- a/whepi-ui/js/chunk-2d0d3628.ddbfa8dd.js.map
+++ b/whepi-ui/js/chunk-2d0d3628.ddbfa8dd.js.map
--- a/whepi-ui/js/chunk-2d0e146b.ace28509.js
+++ b/whepi-ui/js/chunk-2d0e146b.ace28509.js
@@ -0,0 +1,2 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e146b"],{"7a6a":function(e,n,t){"use strict";t.r(n);var u=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("router-view")},r=[],a=t("2877"),c={},l=Object(a["a"])(c,u,r,!1,null,null,null);n["default"]=l.exports}}]);
			
 
				+//# sourceMappingURL=chunk-2d0e146b.ace28509.js.map
			
--- a/whepi-ui/js/chunk-2d0e146b.ace28509.js.map
+++ b/whepi-ui/js/chunk-2d0e146b.ace28509.js.map
--- a/whepi-ui/js/chunk-2d2291e5.bb4d3abf.js
+++ b/whepi-ui/js/chunk-2d2291e5.bb4d3abf.js
@@ -0,0 +1,2 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2291e5"],{dba2:function(n,e,t){"use strict";t.r(e);var c=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div")},u=[],a={name:"communityBulletin"},i=a,l=t("2877"),o=Object(l["a"])(i,c,u,!1,null,"c11f4376",null);e["default"]=o.exports}}]);
			
 
				+//# sourceMappingURL=chunk-2d2291e5.bb4d3abf.js.map
			
--- a/whepi-ui/js/chunk-2d2291e5.bb4d3abf.js.map
+++ b/whepi-ui/js/chunk-2d2291e5.bb4d3abf.js.map
--- a/whepi-ui/js/chunk-2d22b973.04855e3e.js
+++ b/whepi-ui/js/chunk-2d22b973.04855e3e.js
@@ -0,0 +1,2 @@
 
				+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d22b973"],{f02e:function(e,n,t){"use strict";t.r(n);var c=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("div")},u=[],a={name:"countryEpidemic"},i=a,r=t("2877"),o=Object(r["a"])(i,c,u,!1,null,"877434ae",null);n["default"]=o.exports}}]);
			
 
				+//# sourceMappingURL=chunk-2d22b973.04855e3e.js.map
			
--- a/whepi-ui/js/chunk-2d22b973.04855e3e.js.map
+++ b/whepi-ui/js/chunk-2d22b973.04855e3e.js.map
--- a/whepi-ui/js/chunk-4ed49933.8edc234e.js
+++ b/whepi-ui/js/chunk-4ed49933.8edc234e.js
--- a/whepi-ui/js/chunk-4ed49933.8edc234e.js.map
+++ b/whepi-ui/js/chunk-4ed49933.8edc234e.js.map
--- a/whepi-ui/js/chunk-5562ea1c.79ac22cd.js
+++ b/whepi-ui/js/chunk-5562ea1c.79ac22cd.js
--- a/whepi-ui/js/chunk-5562ea1c.79ac22cd.js.map
+++ b/whepi-ui/js/chunk-5562ea1c.79ac22cd.js.map
--- a/whepi-ui/js/chunk-5b624388.e0a00440.js
+++ b/whepi-ui/js/chunk-5b624388.e0a00440.js
--- a/whepi-ui/js/chunk-5b624388.e0a00440.js.map
+++ b/whepi-ui/js/chunk-5b624388.e0a00440.js.map
--- a/whepi-ui/js/chunk-5ef44a67.4c551877.js
+++ b/whepi-ui/js/chunk-5ef44a67.4c551877.js
--- a/whepi-ui/js/chunk-5ef44a67.4c551877.js.map
+++ b/whepi-ui/js/chunk-5ef44a67.4c551877.js.map
--- a/whepi-ui/js/chunk-6ab6e507.ddbf44c7.js
+++ b/whepi-ui/js/chunk-6ab6e507.ddbf44c7.js
--- a/whepi-ui/js/chunk-6ab6e507.ddbf44c7.js.map
+++ b/whepi-ui/js/chunk-6ab6e507.ddbf44c7.js.map
--- a/whepi-ui/js/chunk-6cdc4b15.d99732e6.js
+++ b/whepi-ui/js/chunk-6cdc4b15.d99732e6.js
--- a/whepi-ui/js/chunk-6cdc4b15.d99732e6.js.map
+++ b/whepi-ui/js/chunk-6cdc4b15.d99732e6.js.map
--- a/whepi-ui/js/chunk-72ab68c2.7607cd2d.js
+++ b/whepi-ui/js/chunk-72ab68c2.7607cd2d.js
--- a/whepi-ui/js/chunk-72ab68c2.7607cd2d.js.map
+++ b/whepi-ui/js/chunk-72ab68c2.7607cd2d.js.map
--- a/whepi-ui/js/chunk-737f8e34.a2fc7003.js
+++ b/whepi-ui/js/chunk-737f8e34.a2fc7003.js
--- a/whepi-ui/js/chunk-737f8e34.a2fc7003.js.map
+++ b/whepi-ui/js/chunk-737f8e34.a2fc7003.js.map
--- a/whepi-ui/js/chunk-74539060.e77047f8.js
+++ b/whepi-ui/js/chunk-74539060.e77047f8.js
--- a/whepi-ui/js/chunk-74539060.e77047f8.js.map
+++ b/whepi-ui/js/chunk-74539060.e77047f8.js.map
--- a/whepi-ui/js/chunk-ab14af0e.a00dd59c.js
+++ b/whepi-ui/js/chunk-ab14af0e.a00dd59c.js
--- a/whepi-ui/js/chunk-ab14af0e.a00dd59c.js.map
+++ b/whepi-ui/js/chunk-ab14af0e.a00dd59c.js.map
--- a/whepi-ui/js/chunk-c500236c.ac9086ef.js
+++ b/whepi-ui/js/chunk-c500236c.ac9086ef.js
--- a/whepi-ui/js/chunk-c500236c.ac9086ef.js.map
+++ b/whepi-ui/js/chunk-c500236c.ac9086ef.js.map
--- a/whepi-ui/js/chunk-dbc2a580.4e4c4910.js
+++ b/whepi-ui/js/chunk-dbc2a580.4e4c4910.js
--- a/whepi-ui/js/chunk-dbc2a580.4e4c4910.js.map
+++ b/whepi-ui/js/chunk-dbc2a580.4e4c4910.js.map
--- a/whepi-ui/js/chunk-f5b633fe.ea217d56.js
+++ b/whepi-ui/js/chunk-f5b633fe.ea217d56.js
--- a/whepi-ui/js/chunk-f5b633fe.ea217d56.js.map
+++ b/whepi-ui/js/chunk-f5b633fe.ea217d56.js.map
--- a/whepi-ui/js/chunk-f6ad3f88.3f1b4281.js
+++ b/whepi-ui/js/chunk-f6ad3f88.3f1b4281.js
--- a/whepi-ui/js/chunk-f6ad3f88.3f1b4281.js.map
+++ b/whepi-ui/js/chunk-f6ad3f88.3f1b4281.js.map
--- a/whepi-ui/js/chunk-fbdc2710.e57e7b8a.js
+++ b/whepi-ui/js/chunk-fbdc2710.e57e7b8a.js
--- a/whepi-ui/js/chunk-fbdc2710.e57e7b8a.js.map
+++ b/whepi-ui/js/chunk-fbdc2710.e57e7b8a.js.map
--- a/whepi-ui/js/chunk-vendors.9a6cea8f.js
+++ b/whepi-ui/js/chunk-vendors.9a6cea8f.js
--- a/whepi-ui/js/chunk-vendors.9a6cea8f.js.map
+++ b/whepi-ui/js/chunk-vendors.9a6cea8f.js.map
--- a/whepi-ui/ok.html
+++ b/whepi-ui/ok.html
@@ -1 +1,30 @@
 
				-ok23
			
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+    <title>测试</title>
			
 
				+    <meta charset="utf-8">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
			
 
				+    <script src="${s3('/jquery/1.11.0/jquery.min.js')}"></script>
			
 
				+</head>
			
 
				+<body>
			
 
				+<button style="height: 70px; width: 150px" onclick="click();"> 测试 </button>
			
 
				+</body>
			
 
				+<script>
			
 
				+  (function ($) {
			
 
				+
			
 
				+  })(jQuery);
			
 
				+
			
 
				+  function click() {
			
 
				+    debugger;
			
 
				+    $.ajax({
			
 
				+      url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
			
 
				+      get: "get",
			
 
				+      success: function (data) {
			
 
				+        alert(data);
			
 
				+        console.log(data);
			
 
				+
			
 
				+      },
			
 
				+    });
			
 
				+  }
			
 
				+</script>
			
--- a/whepi-ui/templates/home/home.ftl
+++ b/whepi-ui/templates/home/home.ftl
@@ -63,6 +63,9 @@
 
				 
			
 
				         <#if msReport ??>var msReport = ${msReport}</#if>;
			
 
				         $('#ribao_jinrijujian').append(msReport.safetyNum);
			
 
				+        if (msReport.reportStatus == 1) {
			
 
				+            document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
			
 
				+        }
			
 
				         ribaoInitialization(msReport.reportId);
			
 
				         $("#my-input-ribao").calendar();
			
 
				         /*submit_back();*/
			
@@ -92,11 +95,20 @@
 
				             buyGroup();
			
 
				         }
			
 
				 
			
 
				+        function selectqiuzhu() {
			
 
				+            $("#tab1").removeClass('weui-tab__bd-item--active');
			
 
				+            $("#jt1").removeClass('weui-bar__item--on');
			
 
				+            $("#tab2").addClass('weui-tab__bd-item--active');
			
 
				+            $("#jt2").addClass('weui-bar__item--on');
			
 
				+        }
			
 
				+
			
 
				         var show = ${show!'"-"'};
			
 
				 
			
 
				         if (show == 'tuangou') {
			
 
				             selectTab();
			
 
				 
			
 
				+        } else if (show == 'qiuzhu') {
			
 
				+            selectqiuzhu();
			
 
				         }
			
 
				     })(jQuery);
			
 
				 
			
@@ -105,7 +117,7 @@
 
				     function familyClick() {
			
 
				         $('#notitle').empty();//清除节点
			
 
				         $.ajax({
			
 
				-            url: '/home/home/queryQzTask',
			
 
				+            url: '/home/home/queryQzTaskxq',
			
 
				             data: {userId: $('#userId').val()},
			
 
				             type: 'GET',
			
 
				             async: false,
			
@@ -139,40 +151,23 @@
 
				     }
			
 
				 
			
 
				     function xiaoQuItemClick(v) {
			
 
				-        /*$.alert(v.taskId)*/
			
 
				-        if ($('#titlteZs')[0].style.display == 'none') {
			
 
				-            $('#notitle').toggle();
			
 
				-            $('#titlteZs')[0].style.display = '';
			
 
				-            $('#qzHS').empty();//清除节点
			
 
				-            //详情页面的展示
			
 
				-            $.ajax({
			
 
				-                url: '/home/home/taskQuery',
			
 
				-                data: {taskId: v.taskId},
			
 
				-                type: 'GET',
			
 
				-                success: function (data) {
			
 
				-                    console.log(data);
			
 
				-                    if (data.data.length > 0) {
			
 
				-                        hasData = true;
			
 
				-                        $('#qzHS').append($('<div>' + data.data[0].taskTitle + '</div>\n' + '<div class="weui-cell ">\n' + '<div class="weui-cell__bd">\n'
			
 
				-                                + '<textarea class="weui-textarea" rows="1" readonly />' + data.data[0].remark + '</div>'));
			
 
				-                        if (data.data[0].nickName != null) {
			
 
				-                            data.data.forEach(function (v) {
			
 
				-                                shValue(v);
			
 
				-                            });
			
 
				-                        }
			
 
				-                    } else {
			
 
				-
			
 
				-                    }
			
 
				-                },
			
 
				-                error: function () {
			
 
				+        $.ajax({
			
 
				+            url: '/home/home/taskQuery',
			
 
				+            data: {taskId: v.taskId},
			
 
				+            type: 'GET',
			
 
				+            success: function (data) {
			
 
				+                console.log(data);
			
 
				+                if (v.userId != data.data.userId) {
			
 
				+                    $.alert('当前求助信息不是你的')
			
 
				+                } else {
			
 
				+                    window.location.href = "/quzhu/home/quxiao.html?taskId=" + v.taskId + "&userId=" + v.userId;
			
 
				+                    familyClick()
			
 
				                 }
			
 
				-            });
			
 
				-            /*$('#qzHS').*/
			
 
				+            },
			
 
				+            error: function () {
			
 
				+            }
			
 
				+        });
			
 
				 
			
 
				-        } else {
			
 
				-            $('#notitle')[0].style.display = '';
			
 
				-            $('#titlteZs')[0].style.display = 'none';
			
 
				-        }
			
 
				     }
			
 
				 
			
 
				 
			
--- a/whepi-ui/templates/home/htlpXq.ftl
+++ b/whepi-ui/templates/home/htlpXq.ftl
@@ -0,0 +1,177 @@
 
				+<#assign title="求助详情"/>
			
 
				+<#include "/home/frag.head.ftl" />
			
 
				+
			
 
				+<div class="weui-tab">
			
 
				+    <div class="weui-btn-area" style="display: flex; flex-direction: row;">
			
 
				+        <a class="weui-btn weui-btn_primary" href="javascript:goback();"
			
 
				+           style="width: 25vw; height: 6vh; line-height: 6vh;">返回</a>
			
 
				+        <div style="width: 65%;"></div>
			
 
				+    </div>
			
 
				+
			
 
				+    <div class="weui-btn-area">
			
 
				+
			
 
				+        <p class="weui-media-box__desc">求助标题</p>
			
 
				+        <h4 class="weui-media-box__title">${ task.taskTitle }</h4>
			
 
				+        <br>
			
 
				+        <p class="weui-media-box__desc">求助对象</p>
			
 
				+        <h4 class="weui-media-box__title">${ task.taskTarget }</h4>
			
 
				+        <br>
			
 
				+        <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">
			
 
				+            <p style="align-items: center">处理中</p>
			
 
				+        </div>-->
			
 
				+        </#if>
			
 
				+        <#if task.taskStatus == 2>
			
 
				+        <div class="weui-btn-area">
			
 
				+            <a class="weui-btn weui-btn_default" href="javascript:doTask();">回复</a>
			
 
				+            <a class="weui-btn weui-btn_primary" href="javascript:commint();">完成</a>
			
 
				+        </div>
			
 
				+            <p class="weui-media-box__desc" style="margin-top: 3vh;">回复列表：</p>
			
 
				+            <div id="qz_doing_detail" style="margin-top: 3vh;"></div>
			
 
				+        </#if>
			
 
				+        <#if task.taskStatus == 3>
			
 
				+            <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>
			
 
				+            <p class="weui-media-box__desc" style="margin-top: 3vh;">回复列表：</p>
			
 
				+            <div id="qz_done_detail"></div>
			
 
				+        </#if>
			
 
				+    </div>
			
 
				+
			
 
				+    <div id="qz_showPop" class="weui-popup__container popup-bottom">
			
 
				+        <div class="weui-popup__overlay"></div>
			
 
				+        <div class="weui-popup__modal">
			
 
				+            <div class="weui-btn-area">
			
 
				+                <div style="display:flex; flex-direction: row; justify-content: space-between;">
			
 
				+                    <div style="width: 75%;"></div>
			
 
				+                    <a class="weui-btn weui-btn_primary" style="margin-bottom: 3vh;" href="javascript:close();">关闭</a>
			
 
				+                </div>
			
 
				+                <textarea id="qz_content" class="weui-textarea" placeholder="请输入文本" rows="5" maxlength="99"></textarea>
			
 
				+                <a class="weui-btn weui-btn_primary" style="margin-top: 3vh;margin-bottom: 5vh;"
			
 
				+                   href="javascript:send();">提交</a>
			
 
				+            </div>
			
 
				+        </div>
			
 
				+    </div>
			
 
				+</div>
			
 
				+
			
 
				+<#include "/home/frag.foot.ftl" />
			
 
				+
			
 
				+<script>
			
 
				+    var task = ${taskJson};
			
 
				+    var userId = ${userId};
			
 
				+    <#--var YeuserId = ${YeuserId};//业委会id-->
			
 
				+    (function ($) {
			
 
				+
			
 
				+        if (task.taskStatus == 2 || task.taskStatus == 3) {
			
 
				+            getdealdetail();
			
 
				+        }
			
 
				+
			
 
				+    })(jQuery);
			
 
				+
			
 
				+    function doTask() {
			
 
				+        $("#qz_showPop").popup();
			
 
				+    }
			
 
				+
			
 
				+    //完成
			
 
				+    function commint() {
			
 
				+        $.ajax({
			
 
				+            url: '/home/qiuzhu/reply.json',
			
 
				+            type: 'GET',
			
 
				+            data: {
			
 
				+                taskId: task.taskId,
			
 
				+            },
			
 
				+            success: function (data) {
			
 
				+                /*$.closePopup();*/
			
 
				+                window.location.href = "/user/homeIndex.html?show=qiuzhu&userId=" + userId + "&userType=" + 1;
			
 
				+            },
			
 
				+            error: function () {
			
 
				+            }
			
 
				+        });
			
 
				+    }
			
 
				+
			
 
				+    function close() {
			
 
				+        $.closePopup();
			
 
				+    }
			
 
				+
			
 
				+    function send() {
			
 
				+
			
 
				+        let qzcontent = $('#qz_content').val();
			
 
				+        if (qzcontent.length <= 0) {
			
 
				+            $.alert("请输入内容");
			
 
				+            return;
			
 
				+        }
			
 
				+        $.ajax({
			
 
				+            url: '/yeweihui/qiuzhu/reply/add.json',
			
 
				+            type: 'post',
			
 
				+            data: {
			
 
				+                userId: userId,
			
 
				+                taskId: task.taskId,
			
 
				+                replyContent: qzcontent,
			
 
				+                userCreate: userId,
			
 
				+                userUpdate: userId,
			
 
				+            },
			
 
				+            success: function (data) {
			
 
				+                $.closePopup();
			
 
				+                window.location.href = "/user/homeIndex.html?show=qiuzhu&userId=" + userId + "&userType=" + 1;
			
 
				+            },
			
 
				+            error: function () {
			
 
				+                $.alert("网络异常");
			
 
				+            }
			
 
				+        });
			
 
				+    }
			
 
				+
			
 
				+    function goback() {
			
 
				+        window.location.href = "/user/homeIndex.html?show=qiuzhu&userId=" + userId + "&userType=" + 1;
			
 
				+    }
			
 
				+
			
 
				+    function getdealdetail() {
			
 
				+        $.ajax({
			
 
				+            url: '/home/qiuzhu/getData',
			
 
				+            type: 'post',
			
 
				+            data: {
			
 
				+                taskId: task.taskId,
			
 
				+            },
			
 
				+            success: function (data) {
			
 
				+                console.log("---返回数据---", data);
			
 
				+
			
 
				+                if (task.taskStatus == 2) {
			
 
				+                    for (let i = 0; i < data.data.length; i++) {
			
 
				+                        let reply = data.data[i];
			
 
				+                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + reply.timeUpdate + '</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('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + reply.timeUpdate + '</p>\n' +
			
 
				+                                '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
			
 
				+                    }
			
 
				+                }
			
 
				+            },
			
 
				+            error: function () {
			
 
				+                $.alert("网络异常");
			
 
				+            }
			
 
				+        });
			
 
				+    }
			
 
				+
			
 
				+    function timestampToTime(timestamp) {
			
 
				+        var date = new Date(timestamp); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
			
 
				+        var Y = date.getFullYear() + '/';
			
 
				+        var M = ((date.getMonth() + 1) < 10) ? ('0' + (date.getMonth() + 1) + '/') : ((date.getMonth() + 1) + '/');
			
 
				+        var D = (date.getDate() < 10) ? ('0' + date.getDate() + ' ') : (date.getDate() + ' ');
			
 
				+        var h = (date.getHours() < 10) ? ('0' + date.getHours() + ':') : (date.getHours() + ':');
			
 
				+        var m = (date.getMinutes() < 10) ? ('0' + date.getMinutes() + ':') : (date.getMinutes() + ':');
			
 
				+        var s = (date.getSeconds() < 10) ? ('0' + date.getSeconds()) : (date.getSeconds());
			
 
				+        return Y + M + D + h + m + s;
			
 
				+    }
			
 
				+</script>
			
--- a/whepi-ui/templates/home/qiuzhu.ftl
+++ b/whepi-ui/templates/home/qiuzhu.ftl
@@ -73,7 +73,7 @@
 
				                     <div class="weui-cell weui-cell_active weui-cell_switch">
			
 
				                         <div class="weui-cell">
			
 
				                             <div class="weui-cell__bd">
			
 
				-                                <input id="quetyFamily" type="text" class="weui-input" placeholder="搜素关键字"
			
 
				+                                <input id="quetyFamily" type="text" class="weui-input" placeholder="搜索关键字"
			
 
				                                        maxlength="10" style="width: 150px"/>
			
 
				                             </div>
			
 
				                             <a href="javascript:"
			
@@ -318,40 +318,37 @@
 
				     var aid;
			
 
				 
			
 
				     function myItemClick(v) {
			
 
				-        if ($('#familyDisplay')[0].style.display == 'none') {
			
 
				-            $('#familyDisplay')[0].style.display = '';
			
 
				-            $("#notPlay").toggle();
			
 
				-            $('#qzHS2').empty();
			
 
				+        window.location.href = "/quzhu/home/quxiao.html?taskId=" + v.taskId + "&userId=" + v.userId;
			
 
				+        /*     $.ajax({
			
 
				+                 url: '/home/home/taskQuery',
			
 
				+                 data: {taskId: v.taskId},
			
 
				+                 type: 'GET',
			
 
				+                 success: function (data) {
			
 
				+                     console.log(data);
			
 
				 
			
 
				-            $.ajax({
			
 
				-                url: '/home/home/taskQuery',
			
 
				-                data: {taskId: v.taskId},
			
 
				-                type: 'GET',
			
 
				-                success: function (data) {
			
 
				-                    console.log(data);
			
 
				-                    //判断该求助是否完成  来判断按钮是否展示
			
 
				-                    if (data.data.length > 0 && data.data[0].taskStatus == 2) {
			
 
				-                        $('#isHiddenStyle12')[0].style.display = '';
			
 
				-                    } else {
			
 
				-                        $('#isHiddenStyle12')[0].style.display = 'none';
			
 
				-                    }
			
 
				+                /!*     //判断该求助是否完成  来判断按钮是否展示
			
 
				+                     if (data.data.length > 0 && data.data[0].taskStatus == 2) {
			
 
				+                         $('#isHiddenStyle12')[0].style.display = '';
			
 
				+                     } else {
			
 
				+                         $('#isHiddenStyle12')[0].style.display = 'none';
			
 
				+                     }
			
 
				 
			
 
				-                    if (data.data.length > 0) {
			
 
				-                        $('#qzHS2').append($('<div>' + data.data[0].taskTitle + '</div>\n'+'<div class="weui-cell ">\n'+'<div class="weui-cell__bd">\n'
			
 
				-                                +data.data[0].remark+'</div>'));
			
 
				-                        if(data.data[0].nickName!=null){
			
 
				-                            data.data.forEach(function (v) {
			
 
				-                                shValuenat2(v);
			
 
				-                            });
			
 
				-                        }
			
 
				-                    } else {
			
 
				+                     if (data.data.length > 0) {
			
 
				+                         $('#qzHS2').append($('<div>' + data.data[0].taskTitle + '</div>\n' + '<div class="weui-cell ">\n' + '<div class="weui-cell__bd">\n'
			
 
				+                                 + data.data[0].remark + '</div>'));
			
 
				+                         if (data.data[0].nickName != null) {
			
 
				+                             data.data.forEach(function (v) {
			
 
				+                                 shValuenat2(v);
			
 
				+                             });
			
 
				+                         }
			
 
				+                     } else {
			
 
				+
			
 
				+                     }*!/
			
 
				+                 },
			
 
				+                 error: function () {
			
 
				+                 }
			
 
				+             });*/
			
 
				 
			
 
				-                    }
			
 
				-                },
			
 
				-                error: function () {
			
 
				-                }
			
 
				-            });
			
 
				-        }
			
 
				     }
			
 
				 
			
 
				     function shValuenat2(v) {
			
@@ -418,7 +415,7 @@
 
				         /*展示*/
			
 
				         $('#play')[0].style.display = '';
			
 
				         $('#Qzinput').val("")
			
 
				-       // $("#qzf2").removeAttr('checked', false)
			
 
				+        // $("#qzf2").removeAttr('checked', false)
			
 
				         $('#remarks').val("")
			
 
				     }
			
 
				 
			
--- a/whepi-ui/templates/home/qiuzhu.js
+++ b/whepi-ui/templates/home/qiuzhu.js
@@ -3,7 +3,7 @@ function qiuzhu_init() {
 
				 }
			
 
				 
			
 
				 function shValue(v) {
			
 
				-  $('#qzHS').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +
			
 
				+/*  $('#qzHS').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +
			
 
				     '                <div class="weui-media-box__bd">\n' +
			
 
				     '                    <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
			
 
				     '                        <p class="weui-media-box__desc">' + v.nickName + '</p>\n' +
			
@@ -16,7 +16,7 @@ function shValue(v) {
 
				     '                        </div>\n' +
			
 
				     '                    </div>\n' +
			
 
				     '                </div>\n' +
			
 
				-    '            </a>\n<br />'));
			
 
				+    '            </a>\n<br />'));*/
			
 
				 }
			
 
				 
			
 
				 function timestampToTime(timestamp) {
			
--- a/whepi-ui/templates/home/ribao.ftl
+++ b/whepi-ui/templates/home/ribao.ftl
@@ -36,7 +36,7 @@
 
				                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
			
 
				                     </span></div>
			
 
				                     <div class="weui-btn-area">
			
 
				-                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
			
 
				+                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" style=""
			
 
				                            onclick="addReport()">上报</a>
			
 
				                     </div>
			
 
				                 </div>
			
@@ -119,8 +119,8 @@
 
				                             </div>
			
 
				                         </label>
			
 
				                     </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>
			
 
				+                    <#--<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>-->
			
 
				                     <input id="suspectedId" type="text" hidden="hidden" value=""/>
			
 
				                     <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
			
 
				                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
			
--- a/whepi-ui/templates/home/ribao.js
+++ b/whepi-ui/templates/home/ribao.js
@@ -224,13 +224,10 @@ function ribaoInitialization(reportId) {
 
				     success: function (data) {
			
 
				       console.log(data);
			
 
				       if (data.data.length > 0) {
			
 
				-        $('#btn_shangbao').text('上报');
			
 
				         hasData = true;
			
 
				         data.data.forEach(function (v) {
			
 
				           ribao_cell(v);
			
 
				         });
			
 
				-      } else {
			
 
				-        $('#btn_shangbao').text('上报');
			
 
				       }
			
 
				     },
			
 
				     error: function () {
			
@@ -272,9 +269,9 @@ function ribao_cell(v) {
 
				   var userName = v.userName + "：";
			
 
				   var grender = getGreder(v.grender);
			
 
				   var age = v.age;
			
 
				-  // var familyStatus = "";
			
 
				-  // if (v.familyStatus != 0)
			
 
				-  //   familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
			
 
				+  var familyStatus = "";
			
 
				+  if (v.familyStatus != 0)
			
 
				+    familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
			
 
				   var medical = "";
			
 
				   if (v.medical != 0)
			
 
				     medical = "是否确诊：" + getMedical(v.medical) + "；";
			
@@ -301,14 +298,14 @@ function ribao_cell(v) {
 
				     diarrhea = "腹泻现象：" + getDiarrhea(v.diarrhea) + "；";
			
 
				   var others = "";
			
 
				   if (v.others != "")
			
 
				-    others = "其他：" + v.others;
			
 
				+    others = "其他描述：" + v.others+ "；";
			
 
				   var scoreRezult = "";
			
 
				   if (v.scoreRezult != 0)
			
 
				     scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
			
 
				   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\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: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
			
 
				     '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
			
 
				-    '                                      <p class="weui-media-box__desc" style="height: 80%">'  + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
			
 
				+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
			
 
				     '                                    </div>\n' +
			
 
				     '                              '));
			
 
				 }
			
@@ -324,9 +321,15 @@ function ribao_add() {
 
				       $('#ribao')[0].style.display = 'none';
			
 
				     }
			
 
				 
			
 
				-    // $("#js_input_user_status").val(getFamilyStatus(0));
			
 
				-    // $("#js_input_user_status").attr("data-values", 0);
			
 
				 
			
 
				+    //基本情况
			
 
				+    $("input[name='checkbox1']").removeAttr("checked");
			
 
				+    $("input[name='checkbox2']").removeAttr("checked");
			
 
				+    $("input[name='checkbox3']").removeAttr("checked");
			
 
				+    $("input[name='checkbox4']").removeAttr("checked");
			
 
				+    $("input[name='checkbox5']").removeAttr("checked");
			
 
				+    $("input[name='checkbox6']").removeAttr("checked");
			
 
				+    $("input[name='checkbox7']").removeAttr("checked");
			
 
				 
			
 
				     $("#switchQuezhen").val(getMedical(0));
			
 
				     $("#switchQuezhen").attr("data-values", 0);
			
@@ -374,6 +377,11 @@ function ribaoCommit() {
 
				   var userName = $("#js_input_user_name").val();
			
 
				   var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
			
 
				   var age = $("#js_input_user_age").val();
			
 
				+  //不能同时选择服用和未服用
			
 
				+  if ($("input[name='checkbox1']:checked").val() == "on" && $("input[name='checkbox2']:checked").val() == "on") {
			
 
				+    $.alert("心脑血管不能同时选择服用和未服用");
			
 
				+    return;
			
 
				+  }
			
 
				   //家庭状态
			
 
				   var familyStatus = "";
			
 
				   if ($("input[name='checkbox1']:checked").val() == "on")
			
@@ -405,7 +413,8 @@ function ribaoCommit() {
 
				   else
			
 
				     familyStatus += ",0";
			
 
				   //var familyStatus = $("#js_input_user_status").attr("data-values") == undefined ? 0 : $("#js_input_user_status").attr("data-values");
			
 
				-  var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
			
 
				+  //var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
			
 
				+  var statusDesp = "";
			
 
				   var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
			
 
				   var singleRoom = $("#switchDanjiangeli").attr("data-values") == undefined ? 0 : $("#switchDanjiangeli").attr("data-values");
			
 
				   var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
			
@@ -489,7 +498,7 @@ function ribaoCommit() {
 
				       ribao_refrash();
			
 
				 
			
 
				       clearShow();
			
 
				-
			
 
				+      document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
			
 
				     },
			
 
				   });
			
 
				 }
			
@@ -537,31 +546,31 @@ function updateSuspected(suspectedId) {
 
				         if (suspected.familyStatus != "") {
			
 
				           var familyStatusList = suspected.familyStatus.split(",");
			
 
				           if (familyStatusList[0] == 1)
			
 
				-            $("input[name='checkbox1']").prop("checked","checked");
			
 
				+            $("input[name='checkbox1']").prop("checked", "checked");
			
 
				           else
			
 
				             $("input[name='checkbox1']").removeAttr("checked");
			
 
				           if (familyStatusList[1] == 1)
			
 
				-            $("input[name='checkbox2']").prop("checked","checked");
			
 
				+            $("input[name='checkbox2']").prop("checked", "checked");
			
 
				           else
			
 
				             $("input[name='checkbox2']").removeAttr("checked");
			
 
				           if (familyStatusList[2] == 1)
			
 
				-            $("input[name='checkbox3']").prop("checked","checked");
			
 
				+            $("input[name='checkbox3']").prop("checked", "checked");
			
 
				           else
			
 
				             $("input[name='checkbox3']").removeAttr("checked");
			
 
				           if (familyStatusList[3] == 1)
			
 
				-            $("input[name='checkbox4']").prop("checked","checked");
			
 
				+            $("input[name='checkbox4']").prop("checked", "checked");
			
 
				           else
			
 
				             $("input[name='checkbox4']").removeAttr("checked");
			
 
				           if (familyStatusList[4] == 1)
			
 
				-            $("input[name='checkbox5']").prop("checked","checked");
			
 
				+            $("input[name='checkbox5']").prop("checked", "checked");
			
 
				           else
			
 
				             $("input[name='checkbox5']").removeAttr("checked");
			
 
				           if (familyStatusList[5] == 1)
			
 
				-            $("input[name='checkbox6']").prop("checked","checked");
			
 
				+            $("input[name='checkbox6']").prop("checked", "checked");
			
 
				           else
			
 
				             $("input[name='checkbox6']").removeAttr("checked");
			
 
				           if (familyStatusList[6] == 1)
			
 
				-            $("input[name='checkbox7']").prop("checked","checked");
			
 
				+            $("input[name='checkbox7']").prop("checked", "checked");
			
 
				           else
			
 
				             $("input[name='checkbox7']").removeAttr("checked");
			
 
				 
			
@@ -569,7 +578,7 @@ function updateSuspected(suspectedId) {
 
				         // $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
			
 
				         // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
			
 
				 
			
 
				-        $("#jibenmiaoshu").val(suspected.statusDesp);
			
 
				+        // $("#jibenmiaoshu").val(suspected.statusDesp);
			
 
				 
			
 
				         $("#switchQuezhen").val(getMedical(suspected.medical));
			
 
				         $("#switchQuezhen").attr("data-values", suspected.medical);
			
@@ -617,6 +626,7 @@ function addReport() {
 
				     },
			
 
				     success: function (data) {
			
 
				       $.toast(data.msg);
			
 
				+      document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
			
 
				     },
			
 
				   });
			
 
				 }
			
@@ -660,9 +670,9 @@ function helpValue1(v) {
 
				   var userName = v.userName + "：";
			
 
				   var grender = getGreder(v.grender);
			
 
				   var age = v.age;
			
 
				-  // var familyStatus = "";
			
 
				-  // if (v.familyStatus != 0)
			
 
				-  //   familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
			
 
				+  var familyStatus = "";
			
 
				+  if (v.familyStatus != 0)
			
 
				+    familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
			
 
				   var medical = "";
			
 
				   if (v.medical != 0)
			
 
				     medical = "是否确诊：" + getMedical(v.medical) + "；";
			
@@ -689,13 +699,13 @@ function helpValue1(v) {
 
				     diarrhea = "腹泻现象：" + getDiarrhea(v.diarrhea) + "；";
			
 
				   var others = "";
			
 
				   if (v.others != "")
			
 
				-    others = "其他：" + v.others;
			
 
				+    others = "其他描述：" + v.others + "；";
			
 
				   var scoreRezult = "";
			
 
				   if (v.scoreRezult != 0)
			
 
				     scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
			
 
				   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
			
 
				     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
			
 
				-    '                                      <p class="weui-media-box__desc" style="height: 80%">'  + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
			
 
				+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
			
 
				     '                                    </div>\n' +
			
 
				     '                              '));
			
 
				 }
			
@@ -709,25 +719,25 @@ function getGreder(greder) {
 
				   return "";
			
 
				 }
			
 
				 
			
 
				-// function getFamilyStatus(familyStatus) {
			
 
				-//   if (familyStatus == 0)
			
 
				-//     return "无病史";
			
 
				-//   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 "妊娠期";
			
 
				-//   return "";
			
 
				-// }
			
 
				+function getFamilyStatus(familyStatus) {
			
 
				+  var familyStatusList = familyStatus.split(",");
			
 
				+  var familyStatusString = "";
			
 
				+  if (familyStatusList[0] == 1)
			
 
				+    familyStatusString += "心脑血管疾病(服用ARB),";
			
 
				+  if (familyStatusList[1] == 1)
			
 
				+    familyStatusString += "心脑血管疾病(未服ARB),";
			
 
				+  if (familyStatusList[2] == 1)
			
 
				+    familyStatusString += "呼吸系统病史,";
			
 
				+  if (familyStatusList[3] == 1)
			
 
				+    familyStatusString += "肿瘤病史,";
			
 
				+  if (familyStatusList[4] == 1)
			
 
				+    familyStatusString += "糖尿病史,";
			
 
				+  if (familyStatusList[5] == 1)
			
 
				+    familyStatusString += "服用过激素药物,";
			
 
				+  if (familyStatusList[6] == 1)
			
 
				+    familyStatusString += "妊娠期,";
			
 
				+  return familyStatusString.substring(0, familyStatusString.length - 1);
			
 
				+}
			
 
				 
			
 
				 function getCough(cough) {
			
 
				   if (cough == 0)
			
--- a/whepi-ui/templates/home/tuangouHome.ftl
+++ b/whepi-ui/templates/home/tuangouHome.ftl
@@ -1,8 +1,24 @@
 
				 <#assign title="我的团购"/>
			
 
				 <#include "/home/frag.head.ftl" />
			
 
				 
			
 
				-<#include "/home/buy.ftl" />
			
 
				-
			
 
				+<#--<#include "/home/buy.ftl" />-->
			
 
				+<div class="weui-tab">
			
 
				+    <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
			
 
				+    <div class="weui-tab__bd">
			
 
				+        <div id="tab3" class="weui-tab__bd-item weui-tab__bd-item--active">
			
 
				+    <#include "/home/buy.ftl" /></div>
			
 
				+    </div>
			
 
				+    <div class="weui-tabbar">
			
 
				+        <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
			
 
				+            <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
			
 
				+            <p class="weui-tabbar__label">商品团购</p>
			
 
				+        </a>
			
 
				+    <#--<a href="#tab4" class="weui-tabbar__item">-->
			
 
				+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
			
 
				+    <#--<p class="weui-tabbar__label">我</p>-->
			
 
				+    <#--</a>-->
			
 
				+    </div>
			
 
				+</div>
			
 
				 </body>
			
 
				 
			
 
				 <#include "/home/frag.foot.ftl" />
			
@@ -20,6 +36,22 @@
 
				                 $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
			
 
				             });
			
 
				         });
			
 
				+
			
 
				+      /*  function selectTab() {
			
 
				+           /!* $("#tab1").removeClass('weui-tab__bd-item--active');
			
 
				+            $("#jt1").removeClass('weui-bar__item--on');*!/
			
 
				+            $("#tab3").addClass('weui-tab__bd-item--active');
			
 
				+            $("#jt3").addClass('weui-bar__item--on');
			
 
				+            buyGroup();
			
 
				+        }
			
 
				+
			
 
				+        var show = ${show!'"-"'};
			
 
				+
			
 
				+        if (show == 'tuangou') {
			
 
				+            selectTab();
			
 
				+        }*/
			
 
				+        buyGroup();
			
 
				+
			
 
				     })(jQuery);
			
 
				 
			
 
				 </script>
			
--- a/whepi-ui/templates/ok.html
+++ b/whepi-ui/templates/ok.html
@@ -0,0 +1,38 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+    <title>测试</title>
			
 
				+    <meta charset="utf-8">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				+    <meta http-equiv="Access-Control-Allow-Origin" content="*" />
			
 
				+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
			
 
				+    <script src="${s3('/jquery/1.11.0/jquery.min.js')}"></script>
			
 
				+</head>
			
 
				+<body>
			
 
				+<div>
			
 
				+    <input type="button" style="height: 70px; width: 150px " onclick="clickwwwww();" value="测试"/>
			
 
				+</div>
			
 
				+</body>
			
 
				+</html>
			
 
				+<script src="https://www.w3cways.com/demo/vconsole/vconsole.min.js?v=2.2.0"></script>
			
 
				+<script>
			
 
				+  function clickwwwww() {
			
 
				+    window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect';
			
 
				+    // debugger;
			
 
				+    // $.ajax({
			
 
				+    //   url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
			
 
				+    //   get: "get",
			
 
				+    //   success: function (data) {
			
 
				+    //     alert(data);
			
 
				+    //     console.log(data);
			
 
				+    //
			
 
				+    //   },
			
 
				+    // });
			
 
				+  }
			
 
				+  (function ($) {
			
 
				+
			
 
				+
			
 
				+
			
 
				+
			
 
				+  })(jQuery);
			
 
				+</script>
			
--- a/whepi-ui/templates/yeweihui/home.ftl
+++ b/whepi-ui/templates/yeweihui/home.ftl
@@ -12,7 +12,8 @@
 
				             <#include "/yeweihui/ribaohuiz.ftl" />
			
 
				         </div>
			
 
				         <div id="tab2" class="weui-tab__bd-item">
			
 
				-            <#include "/yeweihui/qiuzhu.ftl" /></div>
			
 
				+            <#include "/yeweihui/qiuzhu.ftl" />
			
 
				+        </div>
			
 
				         <div id="tab3" class="weui-tab__bd-item">
			
 
				             <#include "/yeweihui/tuangou.ftl" />
			
 
				         </div>
			
--- a/whepi-ui/templates/yeweihui/qiuzhu.js
+++ b/whepi-ui/templates/yeweihui/qiuzhu.js
@@ -8,7 +8,8 @@ function qiuzhu_init() {
 
				       type: 'post',
			
 
				       data: {
			
 
				         houseNumber: $('#qz_searchNum1').val(),
			
 
				-        status: 1
			
 
				+        status: 1,
			
 
				+        userId: $('#userId').val()
			
 
				       },
			
 
				       success: function (data) {
			
 
				         makeList1(data.data);
			
@@ -26,7 +27,8 @@ function qiuzhu_init() {
 
				       type: 'post',
			
 
				       data: {
			
 
				         houseNumber: $('#qz_searchNum2').val(),
			
 
				-        status: 2
			
 
				+        status: 2,
			
 
				+        userId: $('#userId').val()
			
 
				       },
			
 
				       success: function (data) {
			
 
				         makeList2(data.data);
			
@@ -44,7 +46,8 @@ function qiuzhu_init() {
 
				       type: 'post',
			
 
				       data: {
			
 
				         houseNumber: $('#qz_searchNum3').val(),
			
 
				-        status: 3
			
 
				+        status: 3,
			
 
				+        userId: $('#userId').val()
			
 
				       },
			
 
				       success: function (data) {
			
 
				         makeList3(data.data);
			
@@ -97,7 +100,7 @@ function makeList1(tasks) {
 
				         '                            <div class="weui-media-box__bd">\n' +
			
 
				         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
			
 
				         '                                    <p class="weui-media-box__desc">' + task.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
			
 
				-        '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
			
 
				+        '                                    <p class="weui-media-box__desc">' + task.timeCreate + '</p>\n' +
			
 
				         '                                </div>\n' +
			
 
				         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
			
 
				         '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +
			
@@ -121,7 +124,7 @@ function makeList2(tasks) {
 
				         '                            <div class="weui-media-box__bd">\n' +
			
 
				         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
			
 
				         '                                    <p class="weui-media-box__desc">' + task.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
			
 
				-        '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
			
 
				+        '                                    <p class="weui-media-box__desc">' + task.timeCreate + '</p>\n' +
			
 
				         '                                </div>\n' +
			
 
				         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
			
 
				         '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +
			
@@ -146,7 +149,7 @@ function makeList3(tasks) {
 
				         '                            <div class="weui-media-box__bd">\n' +
			
 
				         '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
			
 
				         '                                    <p class="weui-media-box__desc">' + task.ridgepole + '-' + task.unit + '-' + task.houseNumber + '</p>\n' +
			
 
				-        '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
			
 
				+        '                                    <p class="weui-media-box__desc">' + task.timeCreate + '</p>\n' +
			
 
				         '                                </div>\n' +
			
 
				         '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
			
 
				         '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +
			
--- a/whepi-ui/templates/yeweihui/qiuzhuDetail.ftl
+++ b/whepi-ui/templates/yeweihui/qiuzhuDetail.ftl
@@ -24,16 +24,19 @@
 
				             </div>
			
 
				         </#if>
			
 
				         <#if task.taskStatus == 2>
			
 
				-            <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 class="weui-btn-area">
			
 
				+                <a class="weui-btn weui-btn_default">处理中</a>
			
 
				+                <a class="weui-btn weui-btn_primary" href="javascript:reply();">回复</a>
			
 
				             </div>
			
 
				+            <p class="weui-media-box__desc" style="margin-top: 3vh;">回复列表：</p>
			
 
				             <div id="qz_doing_detail" style="margin-top: 3vh;"></div>
			
 
				         </#if>
			
 
				         <#if task.taskStatus == 3>
			
 
				-            <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 class="weui-btn-area">
			
 
				+                <a class="weui-btn weui-btn_default">已处理完成</a>
			
 
				             </div>
			
 
				-            <div id="qz_done_detail"></div>
			
 
				+            <p class="weui-media-box__desc" style="margin-top: 3vh;">回复列表：</p>
			
 
				+            <div id="qz_done_detail" style="margin-top: 3vh;"></div>
			
 
				         </#if>
			
 
				     </div>
			
 
				 
			
@@ -69,6 +72,10 @@
 
				         $("#qz_showPop").popup();
			
 
				     }
			
 
				 
			
 
				+    function reply() {
			
 
				+        $("#qz_showPop").popup();
			
 
				+    }
			
 
				+
			
 
				     function close() {
			
 
				         $.closePopup();
			
 
				     }
			
@@ -92,8 +99,18 @@
 
				                 userUpdate: userId,
			
 
				             },
			
 
				             success: function (data) {
			
 
				-                $.closePopup();
			
 
				-                window.location.href = "/yeweihui/home.html?show=qiuzhu&userId=" + userId;
			
 
				+                if (data.success == true) {
			
 
				+                    $.closePopup();
			
 
				+                    if (task.taskStatus == 1) {
			
 
				+                        window.location.href = "/yeweihui/home.html?show=qiuzhu&userId=" + userId;
			
 
				+                    }
			
 
				+                    else if (task.taskStatus == 2) {
			
 
				+                        getdealdetail();
			
 
				+                    }
			
 
				+                }
			
 
				+                else {
			
 
				+                    $.alert("操作失败");
			
 
				+                }
			
 
				             },
			
 
				             error: function () {
			
 
				                 $.alert("网络异常");
			
@@ -116,16 +133,18 @@
 
				                 console.log("---返回数据---",data);
			
 
				 
			
 
				                 if (task.taskStatus == 2) {
			
 
				+                    $("#qz_doing_detail").empty();
			
 
				                     for (let i = 0; i < data.data.length; i++) {
			
 
				                         let reply = data.data[i];
			
 
				-                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">回复' + i + '</p>\n' +
			
 
				+                        $("#qz_doing_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + reply.timeUpdate + '</p>\n' +
			
 
				                             '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
			
 
				                     }
			
 
				                 }
			
 
				                 else if (task.taskStatus == 3) {
			
 
				+                    $("#qz_done_detail").empty();
			
 
				                     for (let i = 0; i < data.data.length; i++) {
			
 
				                         let reply = data.data[i];
			
 
				-                        $("#qz_done_detail").append('<p class="weui-media-box__desc">回复' + i + '</p>\n' +
			
 
				+                        $("#qz_done_detail").append('<p class="weui-media-box__desc">' + reply.nickName + '&emsp;' + reply.timeUpdate + '</p>\n' +
			
 
				                             '        <h4 class="weui-media-box__title">' + reply.replyContent + '</h4><br>');
			
 
				                     }
			
 
				                 }
			
--- a/whepi-ui/templates/yeweihui/tuangouHome.ftl
+++ b/whepi-ui/templates/yeweihui/tuangouHome.ftl
@@ -7,12 +7,12 @@
 
				     <input id="uptownName" type="text" hidden="hidden" value=${uptown_name!}/>
			
 
				 
			
 
				     <div class="weui-tab__bd">
			
 
				-        <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
			
 
				+        <div id="tab__1" class="weui-tab__bd-item weui-tab__bd-item--active">
			
 
				             <#include "/yeweihui/tuangou.ftl" />
			
 
				         </div>
			
 
				     </div>
			
 
				     <div class="weui-tabbar">
			
 
				-        <a id="tab1a" href="#tab1" class="weui-tabbar__item weui-bar__item--on">
			
 
				+        <a href="#tab__1" class="weui-tabbar__item weui-bar__item--on">
			
 
				             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
			
 
				             <p class="weui-tabbar__label">团购</p>
			
 
				         </a>
			
--- a/whepi-ui/www1.html
+++ b/whepi-ui/www1.html
@@ -0,0 +1,30 @@
 
				+<!DOCTYPE html>
			
 
				+<html>
			
 
				+<head>
			
 
				+    <title>测试</title>
			
 
				+    <meta charset="utf-8">
			
 
				+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
			
 
				+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
			
 
				+    <script src="/static/jquery/1.11.0/jquery.min.js"></script>
			
 
				+</head>
			
 
				+<body>
			
 
				+<button style="height: 70px; width: 150px" onclick="click();"> 测试 </button>
			
 
				+</body>
			
 
				+<script>
			
 
				+  (function ($) {
			
 
				+
			
 
				+  })(jQuery);
			
 
				+
			
 
				+  function click() {
			
 
				+    debugger;
			
 
				+    $.ajax({
			
 
				+      url: 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa3991865de920847&redirect_uri=http://yuliang.ng.yvanui.com/userOpen/loginTest&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect',
			
 
				+      get: "get",
			
 
				+      success: function (data) {
			
 
				+        alert(data);
			
 
				+        console.log(data);
			
 
				+
			
 
				+      },
			
 
				+    });
			
 
				+  }
			
 
				+</script>
			
--- a/whepi-web/src/main/java/com/bofeng/controller/EpiAdminController.java
+++ b/whepi-web/src/main/java/com/bofeng/controller/EpiAdminController.java
@@ -8,6 +8,7 @@ import com.bofeng.entity.UserOpen;
 
				 import com.bofeng.entity.UserRole;
			
 
				 import com.bofeng.service.EpiAdminService;
			
 
				 import com.bofeng.service.EpiTemplateMessageService;
			
 
				+import com.bofeng.service.MsReportService;
			
 
				 import com.bofeng.service.TemplateMessageService;
			
 
				 import com.yvan.ModelOps;
			
 
				 import com.yvan.mvc.Pd;
			
@@ -35,6 +36,9 @@ public class EpiAdminController {
 
				     @Autowired
			
 
				     private UserOpenMapper userOpenMapper;
			
 
				 
			
 
				+    @Autowired
			
 
				+    private MsReportService msReportService;
			
 
				+
			
 
				     @ApiOperation("升级业委会角色")
			
 
				     @PostMapping("/whepi/epi/admin/addRole")
			
 
				     public ModelOps adminAddRole(@Pd(name = "we", desc = "手机号码") String we){
			
@@ -73,4 +77,25 @@ public class EpiAdminController {
 
				 
			
 
				         System.out.println("==============执行定时任务完毕================");
			
 
				     }
			
 
				+
			
 
				+    @Scheduled(cron = "0 0 0 * * ?") //每天0点执行一次
			
 
				+    public void scheduledReportByFixedDelay() {
			
 
				+        System.out.println("==============执行定时任务开始================");
			
 
				+        msReportService.getNowByYesterdayDate();
			
 
				+//        Long start = 0L, count = 100L;
			
 
				+//        while (true) {
			
 
				+//            List<UserOpen> userOpens = userOpenMapper.getOpenUser(start, count);
			
 
				+//            int re = 0;
			
 
				+//            for (UserOpen userOpen : userOpens) {
			
 
				+//                re += epiTemplateMessageService.systemSendRemindMessage(userOpen.getUserId(), userOpen.getOpenId());
			
 
				+//            }
			
 
				+//            System.out.println("==============执行定时任务"+re+"================");
			
 
				+//            start += count;
			
 
				+//            if (userOpens == null || userOpens.size()<count) {
			
 
				+//                break;
			
 
				+//            }
			
 
				+//        }
			
 
				+
			
 
				+        System.out.println("==============执行定时任务完毕================");
			
 
				+    }
			
 
				 }
			
--- a/whepi-web/src/main/java/com/bofeng/controller/RootController.java
+++ b/whepi-web/src/main/java/com/bofeng/controller/RootController.java
@@ -106,12 +106,12 @@ public class RootController {
 
				         return Model.newSuccess(bofengProperties);
			
 
				     }
			
 
				 
			
 
				-    @GetMapping(value = {"/"})
			
 
				-    public ModelAndView index() {
			
 
				-        if (!JwtHelper.isLogined()) {
			
 
				-            return new ModelAndView(new RedirectViewJs("/user/login.html"));
			
 
				-        }
			
 
				-
			
 
				-        return new ModelAndView(new RedirectViewJs("/admin/index.html"));
			
 
				-    }
			
 
				+//    @GetMapping(value = {"/"})
			
 
				+//    public ModelAndView index() {
			
 
				+////        if (!JwtHelper.isLogined()) {
			
 
				+////            return new ModelAndView(new RedirectViewJs("/user/login.html"));
			
 
				+////        }
			
 
				+//
			
 
				+//        return new ModelAndView(new RedirectViewJs("/index.html"));
			
 
				+//    }
			
 
				 }
			
--- a/whepi-web/src/main/java/com/bofeng/controller/UserController.java
+++ b/whepi-web/src/main/java/com/bofeng/controller/UserController.java
@@ -30,10 +30,10 @@ public class UserController {
 
				     @Autowired
			
 
				     private PlaceService placeService;
			
 
				 
			
 
				-    @GetMapping("/index.html")
			
 
				-    public ModelAndView index() {
			
 
				-        return new ModelAndView("/index.html");
			
 
				-    }
			
 
				+//    @GetMapping("/index.html")
			
 
				+//    public ModelAndView index() {
			
 
				+//        return new ModelAndView("/index.html");
			
 
				+//    }
			
 
				 
			
 
				 //    @GetMapping("/user/logout.html")
			
 
				 //    @PostMapping("/user/logout.html")
			
--- a/whepi-web/src/main/java/com/bofeng/controller/WxUserOpenController.java
+++ b/whepi-web/src/main/java/com/bofeng/controller/WxUserOpenController.java
@@ -8,7 +8,7 @@ import com.bofeng.entity.UserRole;
 
				 import com.bofeng.service.HomeService;
			
 
				 import com.bofeng.service.WxUserOpenService;
			
 
				 import com.yvan.Model;
			
 
				-import com.yvan.ModelOps;
			
 
				+import com.yvan.platform.Conv;
			
 
				 import com.yvan.platform.JsonWapper;
			
 
				 import com.yvan.platform.StringUtils;
			
 
				 import com.yvan.springmvc.HttpParameterParser;
			
@@ -18,6 +18,7 @@ import lombok.val;
 
				 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.RequestBody;
			
 
				 import org.springframework.web.bind.annotation.RestController;
			
 
				 
			
 
				 import javax.servlet.http.HttpServletRequest;
			
@@ -57,8 +58,15 @@ public class WxUserOpenController {
 
				 
			
 
				     @ApiOperation("用户注册页面点登录")
			
 
				     @PostMapping("/userOpen/login")
			
 
				-    public Model<UserOpen> login(JsonWapper jsonWapper) {
			
 
				-        String code = jsonWapper.asObject(String.class, "code");
			
 
				+    public Model<Long> login(@RequestBody String body) {
			
 
				+//        val parser = HttpParameterParser.newInstance(HttpUtils.currentRequest());
			
 
				+//        String openId = parser.getString("openId");
			
 
				+//        String code = parser.getString("code");
			
 
				+        JsonWapper jsonWapper = new JsonWapper(body);
			
 
				+        Map map = jsonWapper.getInnerMap();
			
 
				+        String openId = Conv.NS(map.get("openId"));
			
 
				+        String code = Conv.NS(map.get("code"));
			
 
				+
			
 
				         if (StringUtils.isNullOrEmpty(code)) {
			
 
				             return Model.newFail("code为空");
			
 
				         }
			
@@ -68,7 +76,7 @@ public class WxUserOpenController {
 
				         }
			
 
				         //成功返回用户Id
			
 
				         try {
			
 
				-            return Model.newSuccess(userOpen);
			
 
				+            return Model.newSuccess(userOpen.getUserId());
			
 
				         } catch (Exception e) {
			
 
				             return Model.newFail(e.getMessage());
			
 
				         }
			
@@ -146,7 +154,6 @@ public class WxUserOpenController {
 
				         return Model.newSuccess(wxUserOpenService.queryFamily(userId));
			
 
				     }
			
 
				 
			
 
				-
			
 
				     @ApiOperation("创建业委会角色、成员信息")
			
 
				     @PostMapping("/userOpen/createYWH")
			
 
				     public Model<Long> createYWH(JsonWapper jsonWapper) throws Exception {
			
@@ -176,5 +183,69 @@ public class WxUserOpenController {
 
				         }
			
 
				     }
			
 
				 
			
 
				+    @ApiOperation("修改家庭及住宅信息")
			
 
				+    @PostMapping("/userOpen/editFamily")
			
 
				+    public Model<Long> editFamily(JsonWapper jsonWapper) throws Exception {
			
 
				+        Long userId = jsonWapper.asObject(Long.class, "userId");
			
 
				+        Long unitId = jsonWapper.asObject(Long.class, "unitId");
			
 
				+        String doorPlate = jsonWapper.asObject(String.class, "doorPlate");
			
 
				+        String linkMan = jsonWapper.asObject(String.class, "linkMan");
			
 
				+        Integer helpNum = jsonWapper.asObject(Integer.class, "helpNum");
			
 
				+        String phone = jsonWapper.asObject(String.class, "phone");
			
 
				+        Long urId = jsonWapper.asObject(Long.class, "urId");
			
 
				+        if (userId == null || userId == 0L) {
			
 
				+            return Model.newFail("用户不存在");
			
 
				+        }
			
 
				+        if (unitId == null || unitId == 0L) {
			
 
				+            return Model.newFail("请选择所在单元");
			
 
				+        }
			
 
				+        if (StringUtils.isNullOrEmpty(doorPlate)) {
			
 
				+            return Model.newFail("请填写门牌号");
			
 
				+        }
			
 
				+        if (StringUtils.isNullOrEmpty(linkMan)) {
			
 
				+            return Model.newFail("请填写家庭联系人");
			
 
				+        }
			
 
				+        if (helpNum == null) {
			
 
				+            helpNum = 0;
			
 
				+        }
			
 
				+        if (StringUtils.isNullOrEmpty(phone)) {
			
 
				+            return Model.newFail("请填写家庭联系电话");
			
 
				+        }
			
 
				+        //成功返回用户Id
			
 
				+        try {
			
 
				+            return Model.newSuccess(wxUserOpenService.editFamily(userId, unitId, doorPlate, linkMan, helpNum, phone, urId));
			
 
				+        } catch (Exception e) {
			
 
				+            return Model.newFail(e.getMessage());
			
 
				+        }
			
 
				+    }
			
 
				 
			
 
				+    @ApiOperation("修改业委会成员信息")
			
 
				+    @PostMapping("/userOpen/editYWH")
			
 
				+    public Model<Long> editYWH(JsonWapper jsonWapper) throws Exception {
			
 
				+        Long uptownId = jsonWapper.asObject(Long.class, "uptownId");
			
 
				+        Long userId = jsonWapper.asObject(Long.class, "userId");
			
 
				+        Long urId = jsonWapper.asObject(Long.class, "urId");
			
 
				+        List<OwnerLinkman> lstOwnerMan = new ArrayList<>();
			
 
				+        OwnerLinkman ownerLinkman;
			
 
				+        if (uptownId == null || uptownId == 0L) {
			
 
				+            return Model.newFail("请选择所在小区");
			
 
				+        }
			
 
				+        for (int i = 0; i < jsonWapper.asList("lstOwner").size(); i++) {
			
 
				+            Map<String, Object> mm = (Map) jsonWapper.asList("lstOwner").get(i);
			
 
				+            ownerLinkman = new OwnerLinkman();
			
 
				+            ownerLinkman.setLinkman(mm.get("linkman").toString());
			
 
				+            ownerLinkman.setPhone(mm.get("phone").toString());
			
 
				+            ownerLinkman.setType(Long.parseLong(mm.get("type").toString()));
			
 
				+            lstOwnerMan.add(ownerLinkman);
			
 
				+        }
			
 
				+        if (lstOwnerMan == null || lstOwnerMan.size() == 0) {
			
 
				+            return Model.newFail("请增加业委会成员");
			
 
				+        }
			
 
				+        //成功返回用户Id
			
 
				+        try {
			
 
				+            return Model.newSuccess(wxUserOpenService.editYWH(urId, userId, uptownId, lstOwnerMan));
			
 
				+        } catch (Exception e) {
			
 
				+            return Model.newFail(e.getMessage());
			
 
				+        }
			
 
				+    }
			
 
				 }
			
--- a/whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java
+++ b/whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java
@@ -19,6 +19,12 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
 
				 
			
 
				     List<MsReport> selectByReportDate(@Param("reportDate") String reportDate, @Param("userCreate") Long userCreate);
			
 
				 
			
 
				+    @Select("select * from ms_report where report_date<curdate()  and user_create=#{userCreate} ORDER BY report_date desc LIMIT 1")
			
 
				+    List<MsReport> getNowByYesterdayDate(@Param("userCreate") Long userCreate);
			
 
				+
			
 
				+    @Select("select user_create  from ms_report where report_date<curdate() GROUP BY user_create limit #{start}, #{count}")
			
 
				+    List<Long> getUserByYesterdayDate(@Param("start") Long start, @Param("count") Long count);
			
 
				+
			
 
				     @Select("select property_id from sys_user_role where user_id=#{userId} and role_id=1")
			
 
				     Long selectHouseIdByUserId(@Param("userId") Long userId);
			
 
				 
			
--- a/whepi-web/src/main/java/com/bofeng/dao/QzTaskDao.java
+++ b/whepi-web/src/main/java/com/bofeng/dao/QzTaskDao.java
@@ -18,13 +18,14 @@ public interface QzTaskDao extends BaseMapper<QzTask> {
 
				 
			
 
				     QzTask queryByTaskId(@Param("taskId") Long taskId);
			
 
				 
			
 
				-    List<QzTask> queryByHouseNumber(@Param("houseNumber") String houseNumber, @Param("status") Integer status);
			
 
				+    List<QzTask> queryByHouseNumber(@Param("uptownId") Long uptownId, @Param("houseNumber") String houseNumber, @Param("status") Integer status);
			
 
				 
			
 
				     Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
			
 
				 
			
 
				-    List<QzTask> queryQzTaskByStatus(@Param("taskStatus") Integer taskStatus);
			
 
				+    List<QzTask> queryQzTaskByStatus(@Param("uptownId") Long uptownId, @Param("taskStatus") Integer taskStatus);
			
 
				 
			
 
				     List<QzTask> queryQzTask(@Param("taskStatus") Integer taskStatus, @Param("taskTitle") String taskTitle, @Param("userId") Long userId);
			
 
				+    List<QzTask> queryQzTaskxq(@Param("userId") Long userId);
			
 
				 
			
 
				     //当前用户名称
			
 
				     QzTask selectUserName(@Param("userId") Long userId);
			
--- a/whepi-web/src/main/java/com/bofeng/dao/QzTaskReplyDao.java
+++ b/whepi-web/src/main/java/com/bofeng/dao/QzTaskReplyDao.java
@@ -16,4 +16,6 @@ public interface QzTaskReplyDao extends BaseMapper<QzTaskReply> {
 
				 
			
 
				   List<QzTaskReply> queryQzTaskReplyByTaskId(@Param("taskId")Long taskId);
			
 
				 
			
 
				+  QzTaskReply selectId(@Param("taskId")Long taskId);
			
 
				+
			
 
				 }
			
--- a/whepi-web/src/main/java/com/bofeng/dao/RbMapper.java
+++ b/whepi-web/src/main/java/com/bofeng/dao/RbMapper.java
@@ -45,6 +45,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
 
				     @Select(
			
 
				             "select count(a.house_id) as houseCount\n" +
			
 
				                     "from sys_uptown_house a \n" +
			
 
				+                    "inner join sys_uptown_home c on a.house_id=c.house_id\n" +
			
 
				                     "INNER JOIN sys_uptown_unit b ON b.unit_id = a.unit_id and b.uptown_id = #{uptownId}"
			
 
				     )
			
 
				     Map<String, Integer> selecthuiz1(@Param("uptownId") Long uptownId);
			
@@ -69,41 +70,44 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
 
				     Map<String, Integer> selecthuiz(@Param("uptownId") Long uptownId, @Param("date") String date);
			
 
				 
			
 
				     @Select(
			
 
				-            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum," +
			
 
				-            "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum," +
			
 
				-                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender," +
			
 
				-            "mss.age,mss.family_status as familyStatus,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
			
 
				-            "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult from ms_suspected mss "+
			
 
				-            "inner join ms_report msr on msr.report_id = mss.report_id and msr.report_date = #{date} "+
			
 
				-            "inner join sys_uptown_house suh on suh.house_id = msr.house_id "+
			
 
				-            "inner join sys_uptown_unit suu on suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} "+
			
 
				-            "left join sys_uptown_home suho on suho.house_id = suh.house_id order by doorplate asc"
			
 
				+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, \n" +
			
 
				+                    "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, \n" +
			
 
				+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,\n" +
			
 
				+                    "mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult \n" +
			
 
				+                    "from sys_uptown_house suh\n" +
			
 
				+                    "inner join sys_uptown_home suho on suho.house_id=suh.house_id\n" +
			
 
				+                    "INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}\n" +
			
 
				+                    "left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = #{date}\n" +
			
 
				+                    "left join ms_suspected mss on mss.report_id=msr.report_id\n" +
			
 
				+                    "order by suu.unit_id asc "
			
 
				     )
			
 
				     List<ExcelRiBao> selectExcelRiBao(@Param("uptownId") Long uptownId, @Param("date") String date);
			
 
				 
			
 
				     @Select(
			
 
				-            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum," +
			
 
				-                    "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum," +
			
 
				-                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender," +
			
 
				-                    "mss.age,mss.family_status as familyStatus,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
			
 
				-                    "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult from ms_suspected mss "+
			
 
				-                    "inner join ms_report msr on msr.report_id = mss.report_id and msr.report_date = #{date} "+
			
 
				-                    "inner join sys_uptown_house suh on suh.house_id = msr.house_id "+
			
 
				-                    "inner join sys_uptown_unit suu on suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} "+
			
 
				-                    "left join sys_uptown_home suho on suho.house_id = suh.house_id order by doorplate asc"
			
 
				+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, \n" +
			
 
				+                    "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, \n" +
			
 
				+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,\n" +
			
 
				+                    "mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult \n" +
			
 
				+                    "from sys_uptown_house suh\n" +
			
 
				+                    "inner join sys_uptown_home suho on suho.house_id=suh.house_id\n" +
			
 
				+                    "INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}\n" +
			
 
				+                    "left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = #{date}\n" +
			
 
				+                    "left join ms_suspected mss on mss.report_id=msr.report_id\n" +
			
 
				+                    "order by suu.unit_id asc "
			
 
				     )
			
 
				     List<ExcelRiBaoLY> selectExcelRiBaoLY(@Param("uptownId") Long uptownId, @Param("date") String date);
			
 
				 
			
 
				     @Select(
			
 
				-            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum," +
			
 
				-                    "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum," +
			
 
				-                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender," +
			
 
				-                    "mss.age,mss.family_status as familyStatus,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
			
 
				-                    "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult from ms_suspected mss "+
			
 
				-                    "inner join ms_report msr on msr.report_id = mss.report_id and msr.report_date = #{date} "+
			
 
				-                    "inner join sys_uptown_house suh on suh.house_id = msr.house_id "+
			
 
				-                    "inner join sys_uptown_unit suu on suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} "+
			
 
				-                    "left join sys_uptown_home suho on suho.house_id = suh.house_id order by doorplate asc"
			
 
				+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, \n" +
			
 
				+                    "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, \n" +
			
 
				+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,\n" +
			
 
				+                    "mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult \n" +
			
 
				+                    "from sys_uptown_house suh\n" +
			
 
				+                    "inner join sys_uptown_home suho on suho.house_id=suh.house_id\n" +
			
 
				+                    "INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}\n" +
			
 
				+                    "left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = #{date}\n" +
			
 
				+                    "left join ms_suspected mss on mss.report_id=msr.report_id\n" +
			
 
				+                    "order by suu.unit_id asc "
			
 
				     )
			
 
				     List<ExcelRiBaoPrivate> selectExcelRiBaoPrivate(@Param("uptownId") Long uptownId, @Param("date") String date);
			
 
				 
			
--- a/whepi-web/src/main/java/com/bofeng/entity/ExcelRiBao.java
+++ b/whepi-web/src/main/java/com/bofeng/entity/ExcelRiBao.java
@@ -12,19 +12,20 @@ import java.math.BigDecimal;
 
				 @Setter
			
 
				 public class ExcelRiBao {
			
 
				 
			
 
				-    private String ridgepole;
			
 
				-    private String unit;
			
 
				-    private String doorplate;
			
 
				-    private BigDecimal temperature;
			
 
				-    private int grender;
			
 
				-    private String familyStatus;
			
 
				-    private int medical;
			
 
				-    private int cough;
			
 
				-    private int muscle;
			
 
				-    private int dyspnea;
			
 
				-    private int fatigue;
			
 
				-    private int diarrhea;
			
 
				-    private int singleRoom;
			
 
				+    private String ridgepole = "";
			
 
				+    private String unit = "";
			
 
				+    private String doorplate = "";
			
 
				+    private BigDecimal temperature = new BigDecimal(0);
			
 
				+    private int grender = 0;
			
 
				+    private String familyStatus = "0,0,0,0,0,0,0";
			
 
				+    private int medical = 0;
			
 
				+    private int cough = 0;
			
 
				+    private int muscle = 0;
			
 
				+    private int dyspnea = 0;
			
 
				+    private int fatigue = 0;
			
 
				+    private int diarrhea = 0;
			
 
				+    private int singleRoom = 0;
			
 
				+    private int scoreRezult = 0;
			
 
				     private String statusDesp = "";
			
 
				     private String others = "";
			
 
				 
			
@@ -125,9 +126,8 @@ public class ExcelRiBao {
 
				     public String getBaseDesc() {
			
 
				 
			
 
				         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
			
 
				-            baseDesc = "心血管疾病（服用ARB）,";
			
 
				-        }
			
 
				-        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
			
 
				+            baseDesc += "心血管疾病（服用ARB）,";
			
 
				+        } else if (Conv.NI(familyStatus.split(",")[1]) == 1) {
			
 
				             baseDesc += "心血管疾病（未服用ARB）,";
			
 
				         }
			
 
				         if (Conv.NI(familyStatus.split(",")[2]) == 1) {
			
@@ -145,7 +145,7 @@ public class ExcelRiBao {
 
				         if (Conv.NI(familyStatus.split(",")[6]) == 1) {
			
 
				             baseDesc += "妊娠期";
			
 
				         }
			
 
				-        return baseDesc.substring(0, baseDesc.length() - 1);
			
 
				+        return baseDesc;
			
 
				     }
			
 
				 
			
 
				     @ExcelProperty(value = "病情描述", index = 14)
			
--- a/whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLY.java
+++ b/whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLY.java
@@ -12,19 +12,20 @@ import java.math.BigDecimal;
 
				 @Setter
			
 
				 public class ExcelRiBaoLY {
			
 
				 
			
 
				-    private String ridgepole;
			
 
				-    private String unit;
			
 
				-    private String doorplate;
			
 
				-    private BigDecimal temperature;
			
 
				-    private int grender;
			
 
				-    private String familyStatus;
			
 
				-    private int medical;
			
 
				-    private int cough;
			
 
				-    private int muscle;
			
 
				-    private int dyspnea;
			
 
				-    private int fatigue;
			
 
				-    private int diarrhea;
			
 
				-    private int singleRoom;
			
 
				+    private String ridgepole = "";
			
 
				+    private String unit = "";
			
 
				+    private String doorplate = "";
			
 
				+    private BigDecimal temperature = new BigDecimal(0);
			
 
				+    private int grender = 0;
			
 
				+    private String familyStatus = "0,0,0,0,0,0,0";
			
 
				+    private int medical = 0;
			
 
				+    private int cough = 0;
			
 
				+    private int muscle = 0;
			
 
				+    private int dyspnea = 0;
			
 
				+    private int fatigue = 0;
			
 
				+    private int diarrhea = 0;
			
 
				+    private int singleRoom = 0;
			
 
				+    private int scoreRezult = 0;
			
 
				     private String statusDesp = "";
			
 
				     private String others = "";
			
 
				 
			
@@ -127,9 +128,8 @@ public class ExcelRiBaoLY {
 
				     public String getBaseDesc() {
			
 
				 
			
 
				         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
			
 
				-            baseDesc = "心血管疾病（服用ARB）,";
			
 
				-        }
			
 
				-        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
			
 
				+            baseDesc += "心血管疾病（服用ARB）,";
			
 
				+        } else if (Conv.NI(familyStatus.split(",")[1]) == 1) {
			
 
				             baseDesc += "心血管疾病（未服用ARB）,";
			
 
				         }
			
 
				         if (Conv.NI(familyStatus.split(",")[2]) == 1) {
			
@@ -147,7 +147,7 @@ public class ExcelRiBaoLY {
 
				         if (Conv.NI(familyStatus.split(",")[6]) == 1) {
			
 
				             baseDesc += "妊娠期";
			
 
				         }
			
 
				-        return baseDesc.substring(0, baseDesc.length() - 1);
			
 
				+        return baseDesc;
			
 
				     }
			
 
				 
			
 
				     @ExcelProperty(value = "病情描述", index = 14)
			
--- a/whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoPrivate.java
+++ b/whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoPrivate.java
@@ -12,20 +12,20 @@ import java.math.BigDecimal;
 
				 @Setter
			
 
				 public class ExcelRiBaoPrivate {
			
 
				 
			
 
				-    private String ridgepole;
			
 
				-    private String unit;
			
 
				-    private String doorplate;
			
 
				-    private BigDecimal temperature;
			
 
				-    private int grender;
			
 
				-    private String familyStatus;
			
 
				-    private int medical;
			
 
				-    private int cough;
			
 
				-    private int muscle;
			
 
				-    private int dyspnea;
			
 
				-    private int fatigue;
			
 
				-    private int diarrhea;
			
 
				-    private int singleRoom;
			
 
				-    private int scoreRezult;
			
 
				+    private String ridgepole = "";
			
 
				+    private String unit = "";
			
 
				+    private String doorplate = "";
			
 
				+    private BigDecimal temperature = new BigDecimal(0);
			
 
				+    private int grender = 0;
			
 
				+    private String familyStatus = "0,0,0,0,0,0,0";
			
 
				+    private int medical = 0;
			
 
				+    private int cough = 0;
			
 
				+    private int muscle = 0;
			
 
				+    private int dyspnea = 0;
			
 
				+    private int fatigue = 0;
			
 
				+    private int diarrhea = 0;
			
 
				+    private int singleRoom = 0;
			
 
				+    private int scoreRezult = 0;
			
 
				     private String statusDesp = "";
			
 
				     private String others = "";
			
 
				 
			
@@ -139,9 +139,9 @@ public class ExcelRiBaoPrivate {
 
				     public String getBaseDesc() {
			
 
				 
			
 
				         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
			
 
				-            baseDesc = "心血管疾病（服用ARB）,";
			
 
				+            baseDesc += "心血管疾病（服用ARB）,";
			
 
				         }
			
 
				-        if (Conv.NI(familyStatus.split(",")[1]) == 1) {
			
 
				+        else if (Conv.NI(familyStatus.split(",")[1]) == 1) {
			
 
				             baseDesc += "心血管疾病（未服用ARB）,";
			
 
				         }
			
 
				         if (Conv.NI(familyStatus.split(",")[2]) == 1) {
			
@@ -159,7 +159,7 @@ public class ExcelRiBaoPrivate {
 
				         if (Conv.NI(familyStatus.split(",")[6]) == 1) {
			
 
				             baseDesc += "妊娠期";
			
 
				         }
			
 
				-        return baseDesc.substring(0, baseDesc.length() - 1);
			
 
				+        return baseDesc;
			
 
				     }
			
 
				 
			
 
				     @ExcelProperty(value = "病情描述", index = 17)
			
--- a/whepi-web/src/main/java/com/bofeng/entity/QzTask.java
+++ b/whepi-web/src/main/java/com/bofeng/entity/QzTask.java
@@ -1,9 +1,10 @@
 
				 package com.bofeng.entity;
			
 
				 
			
 
				+import com.fasterxml.jackson.annotation.JsonFormat;
			
 
				 import lombok.Data;
			
 
				-import org.joda.time.DateTime;
			
 
				 
			
 
				 import java.io.Serializable;
			
 
				+import java.util.Date;
			
 
				 
			
 
				 /**
			
 
				  * qz_task
			
@@ -17,7 +18,7 @@ public class QzTask implements Serializable {
 
				     private Long taskId;
			
 
				 
			
 
				     /**
			
 
				-     * 求助对象：A业委会，B居委会，C物业，D志愿者
			
 
				+     * 求助对象：A管理员，B居委会，C物业，D志愿者
			
 
				      */
			
 
				     private String taskTarget;
			
 
				 
			
@@ -78,7 +79,8 @@ public class QzTask implements Serializable {
 
				     /**
			
 
				      * 新增时间
			
 
				      */
			
 
				-    private DateTime timeCreate;
			
 
				+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
			
 
				+    private Date timeCreate;
			
 
				 
			
 
				     /**
			
 
				      * 修改人
			
@@ -88,7 +90,8 @@ public class QzTask implements Serializable {
 
				     /**
			
 
				      * 修改时间
			
 
				      */
			
 
				-    private DateTime timeUpdate;
			
 
				+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
			
 
				+    private Date timeUpdate;
			
 
				 
			
 
				     private static final long serialVersionUID = 1L;
			
 
				 }
			
--- a/whepi-web/src/main/java/com/bofeng/entity/QzTaskReply.java
+++ b/whepi-web/src/main/java/com/bofeng/entity/QzTaskReply.java
@@ -1,7 +1,7 @@
 
				 package com.bofeng.entity;
			
 
				 
			
 
				+import com.fasterxml.jackson.annotation.JsonFormat;
			
 
				 import lombok.Data;
			
 
				-import org.joda.time.DateTime;
			
 
				 
			
 
				 import java.io.Serializable;
			
 
				 import java.util.Date;
			
@@ -25,6 +25,11 @@ public class QzTaskReply implements Serializable {
 
				   private Long userId;
			
 
				 
			
 
				   /**
			
 
				+   * 回复用户ID
			
 
				+   */
			
 
				+  private String nikeName;
			
 
				+
			
 
				+  /**
			
 
				    * 回复内容
			
 
				    */
			
 
				   private String replyContent;
			
@@ -37,7 +42,8 @@ public class QzTaskReply implements Serializable {
 
				   /**
			
 
				    * 新增时间
			
 
				    */
			
 
				-  private DateTime timeCreate;
			
 
				+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			
 
				+  private Date timeCreate;
			
 
				 
			
 
				   /**
			
 
				    * 修改人
			
@@ -47,7 +53,8 @@ public class QzTaskReply implements Serializable {
 
				   /**
			
 
				    * 修改时间
			
 
				    */
			
 
				-  private DateTime timeUpdate;
			
 
				+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			
 
				+  private Date timeUpdate;
			
 
				 
			
 
				   private String taskTitle;
			
 
				   private Integer taskStatus;
			
--- a/whepi-web/src/main/java/com/bofeng/entity/UserRole.java
+++ b/whepi-web/src/main/java/com/bofeng/entity/UserRole.java
@@ -1,7 +1,9 @@
 
				 package com.bofeng.entity;
			
 
				 
			
 
				 import com.baomidou.mybatisplus.annotations.TableField;
			
 
				+import com.baomidou.mybatisplus.annotations.TableId;
			
 
				 import com.baomidou.mybatisplus.annotations.TableName;
			
 
				+import io.swagger.annotations.ApiModelProperty;
			
 
				 import lombok.Getter;
			
 
				 import lombok.Setter;
			
 
				 import org.joda.time.DateTime;
			
@@ -11,31 +13,43 @@ import org.joda.time.DateTime;
 
				 @TableName("sys_user_role")
			
 
				 public class UserRole {
			
 
				 
			
 
				-    @TableField("ur_id")
			
 
				+    @ApiModelProperty("用户角色关系ID")
			
 
				+    @TableId("UR_ID")
			
 
				     private Long urId;
			
 
				 
			
 
				-    @TableField("user_id")
			
 
				+    @ApiModelProperty("用户ID")
			
 
				+    @TableField("USER_ID")
			
 
				     private Long userId;
			
 
				 
			
 
				-    /* 1.家庭；2.业委会 */
			
 
				-    @TableField("role_id")
			
 
				-    private Integer roleId;
			
 
				+    @ApiModelProperty("角色ID:1居民,2业委会,3商家")
			
 
				+    @TableField("ROLE_ID")
			
 
				+    private int roleId;
			
 
				 
			
 
				-    @TableField("property_id")
			
 
				+    @ApiModelProperty("启用状态：0未启用、1已启用（默认1）")
			
 
				+    @TableField("STATUS")
			
 
				+    private int status;
			
 
				+
			
 
				+    @ApiModelProperty("属性ID,居民门牌ID,业委会ID")
			
 
				+    @TableField("PROPERTY_ID")
			
 
				     private Long propertyId;
			
 
				 
			
 
				-    @TableField("user_create")
			
 
				+    @ApiModelProperty("新增人")
			
 
				+    @TableField("USER_CREATE")
			
 
				     private Long userCreate;
			
 
				 
			
 
				+    @ApiModelProperty("新增时间")
			
 
				     @TableField(exist = false)
			
 
				     private DateTime timeCreate;
			
 
				 
			
 
				-    @TableField("user_update")
			
 
				+    @ApiModelProperty("修改人")
			
 
				+    @TableField("USER_UPDATE")
			
 
				     private Long userUpdate;
			
 
				 
			
 
				+    @ApiModelProperty("修改时间")
			
 
				     @TableField(exist = false)
			
 
				     private DateTime timeUpdate;
			
 
				 
			
 
				+
			
 
				     @TableField(exist = false)
			
 
				     private UptownHome uptownHome;
			
 
				 
			
--- a/whepi-web/src/main/java/com/bofeng/service/MsReportService.java
+++ b/whepi-web/src/main/java/com/bofeng/service/MsReportService.java
@@ -6,6 +6,7 @@ import com.bofeng.dao.MsReportMapper;
 
				 import com.bofeng.dao.MsSuspectedMapper;
			
 
				 import com.bofeng.entity.MsReport;
			
 
				 import com.bofeng.entity.MsSuspected;
			
 
				+import com.bofeng.entity.UserOpen;
			
 
				 import org.joda.time.DateTime;
			
 
				 import org.springframework.beans.factory.annotation.Autowired;
			
 
				 import org.springframework.stereotype.Service;
			
@@ -57,7 +58,9 @@ public class MsReportService {
 
				     //获取今天数据
			
 
				     public MsReport getReportByDateNow(Long userCreate) {
			
 
				         //根据昨天的获取今天的
			
 
				-        msReportService.getNowByYesterday(userCreate);
			
 
				+        // msReportService.getNowByYesterday(userCreate);
			
 
				+        //msReportService.getNowByYesterdayDate();
			
 
				+        //msReportService.addReport250();
			
 
				         Date t = new Date();
			
 
				         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
			
 
				         String reportDate = df.format(t);
			
@@ -180,4 +183,119 @@ public class MsReportService {
 
				         }
			
 
				     }
			
 
				 
			
 
				+    //自动将用户最新的数据更新到今天
			
 
				+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
			
 
				+    public void getNowByYesterdayDate() {
			
 
				+        //每次执行100条
			
 
				+        Long start = 0L, count = 100L;
			
 
				+        while (true) {
			
 
				+            //今天以前一共有多少用户
			
 
				+            List<Long> listUser = msReportMapper.getUserByYesterdayDate(start, count);
			
 
				+            if (listUser != null && listUser.size() > 0) {
			
 
				+                for (Long userCreate : listUser) {
			
 
				+                    //判断用户今天是否有数据
			
 
				+                    SimpleDateFormat sj = new SimpleDateFormat("yyyy-MM-dd");
			
 
				+                    Date d = new Date();
			
 
				+                    String DateNow = sj.format(d);
			
 
				+                    List<MsReport> listReport = msReportMapper.selectByReportDate(DateNow, userCreate);
			
 
				+                    if (listReport != null && listReport.size() > 0)
			
 
				+                        continue;
			
 
				+                    //查询改用户今天以前的最近一条记录
			
 
				+                    List<MsReport> listReport1 = msReportMapper.getNowByYesterdayDate(userCreate);
			
 
				+                    if (listReport1 != null && listReport1.size() > 0) {
			
 
				+                        for (MsReport msReport : listReport1) {
			
 
				+                            if (msReport != null) {
			
 
				+                                //添加日报
			
 
				+                                MsReport msReport1 = new MsReport();
			
 
				+                                msReport1.setReportId(IdWorker.getId());
			
 
				+                                msReport1.setHouseId(msReport.getHouseId());
			
 
				+                                msReport1.setSafetyNum(msReport.getSafetyNum());
			
 
				+                                msReport1.setSureNum(msReport.getSureNum());
			
 
				+                                msReport1.setSuspectedNum(msReport.getSuspectedNum());
			
 
				+                                msReport1.setNormalNum(msReport.getNormalNum());
			
 
				+                                msReport1.setSingleNum(msReport.getSingleNum());
			
 
				+                                msReport1.setRemarks(msReport.getRemarks());
			
 
				+                                msReport1.setReportDate(DateTime.now().toDate());
			
 
				+                                msReport1.setReportStatus(0);//未上报
			
 
				+                                msReport1.setMsStatus(msReport.getMsStatus());
			
 
				+                                msReport1.setUserCreate(msReport.getUserCreate());
			
 
				+                                msReport1.setTimeCreate(DateTime.now());
			
 
				+                                msReport1.setUserUpdate(msReport.getUserCreate());
			
 
				+                                msReport1.setTimeUpdate(DateTime.now());
			
 
				+                                msReportMapper.insert(msReport1);
			
 
				+                                //添加家人
			
 
				+                                List<MsSuspected> listSuspected = msSuspectedMapper.selectByReportId(msReport.getReportId());
			
 
				+                                if (listSuspected != null && listSuspected.size() > 0) {
			
 
				+                                    for (MsSuspected msSuspected : listSuspected) {
			
 
				+                                        MsSuspected msSuspected1 = new MsSuspected();
			
 
				+                                        msSuspected1.setSuspectedId(IdWorker.getId());
			
 
				+                                        msSuspected1.setReportId(msReport1.getReportId());
			
 
				+                                        msSuspected1.setUserName(msSuspected.getUserName());
			
 
				+                                        msSuspected1.setGrender(msSuspected.getGrender());
			
 
				+                                        msSuspected1.setAge(msSuspected.getAge());
			
 
				+                                        msSuspected1.setFamilyStatus(msSuspected.getFamilyStatus());
			
 
				+                                        msSuspected1.setStatusDesp(msSuspected.getStatusDesp());
			
 
				+                                        msSuspected1.setMedical(msSuspected.getMedical());
			
 
				+                                        msSuspected1.setTemperature(new BigDecimal(0));//温度0
			
 
				+                                        msSuspected1.setCough(msSuspected.getCough());
			
 
				+                                        msSuspected1.setMuscle(msSuspected.getMuscle());
			
 
				+                                        msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
			
 
				+                                        msSuspected1.setFatigue(msSuspected.getFatigue());
			
 
				+                                        msSuspected1.setDiarrhea(msSuspected.getDiarrhea());
			
 
				+                                        msSuspected1.setSingleRoom(msSuspected.getSingleRoom());
			
 
				+                                        msSuspected1.setOthers(msSuspected.getOthers());
			
 
				+                                        // msSuspected1.setScoreRezult(msSuspected.getScoreRezult());
			
 
				+                                        // msSuspected1.setScore(msSuspected.getScore());
			
 
				+                                        // msSuspected1.setScoreHistroy(msSuspected.getScoreHistroy());
			
 
				+                                        // msSuspected1.setTemperatureScore(msSuspected.getTemperatureScore());
			
 
				+                                        msSuspected1.setSuspectedStatus(0);
			
 
				+                                        msSuspected1.setUserCreate(msSuspected.getUserCreate());
			
 
				+                                        msSuspected1.setTimeCreate(DateTime.now());
			
 
				+                                        msSuspected1.setUserUpdate(msSuspected.getUserUpdate());
			
 
				+                                        msSuspected1.setTimeUpdate(DateTime.now());
			
 
				+                                        msSuspectedMapper.insert(msSuspected1);
			
 
				+                                    }
			
 
				+                                }
			
 
				+                            }
			
 
				+                        }
			
 
				+                    }
			
 
				+                }
			
 
				+            }
			
 
				+            start += count;
			
 
				+            if (listUser == null || listUser.size() < count) {
			
 
				+                break;
			
 
				+            }
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				+    //添加250条记录
			
 
				+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
			
 
				+    public void addReport250() {
			
 
				+        //每次执行100条
			
 
				+        Long count = 0L;
			
 
				+        while (true) {
			
 
				+            //添加日报
			
 
				+            MsReport msReport1 = new MsReport();
			
 
				+            msReport1.setReportId(IdWorker.getId());
			
 
				+            msReport1.setHouseId(0L);
			
 
				+            msReport1.setSafetyNum(0);
			
 
				+            msReport1.setSureNum(0);
			
 
				+            msReport1.setSuspectedNum(0);
			
 
				+            msReport1.setNormalNum(0);
			
 
				+            msReport1.setSingleNum(0);
			
 
				+            msReport1.setRemarks("");
			
 
				+            msReport1.setReportDate(DateTime.now().toDate());
			
 
				+            msReport1.setReportStatus(0);//未上报
			
 
				+            msReport1.setMsStatus(0);
			
 
				+            msReport1.setUserCreate(count);
			
 
				+            msReport1.setTimeCreate(DateTime.now());
			
 
				+            msReport1.setUserUpdate(count);
			
 
				+            msReport1.setTimeUpdate(DateTime.now());
			
 
				+            count += msReportMapper.insert(msReport1);
			
 
				+            if (count> 250) {
			
 
				+                break;
			
 
				+            }
			
 
				+        }
			
 
				+    }
			
 
				+
			
 
				 }
			
--- a/whepi-web/src/main/java/com/bofeng/service/QzTaskReplyService.java
+++ b/whepi-web/src/main/java/com/bofeng/service/QzTaskReplyService.java
@@ -40,4 +40,7 @@ public class QzTaskReplyService {
 
				         return qzTaskReplyDao.queryQzTaskReplyByTaskId(taskId);
			
 
				     }
			
 
				 
			
 
				+    public QzTaskReply selectId(Long taskId){
			
 
				+        return qzTaskReplyDao.selectId(taskId);
			
 
				+    }
			
 
				 }
			
--- a/whepi-web/src/main/java/com/bofeng/service/QzTaskService.java
+++ b/whepi-web/src/main/java/com/bofeng/service/QzTaskService.java
@@ -6,12 +6,12 @@ import com.bofeng.dao.YeweihuiSysOwnerMapper;
 
				 import com.bofeng.dao.YeweihuiUserRoleMapper;
			
 
				 import com.bofeng.entity.QzTask;
			
 
				 import lombok.var;
			
 
				-import org.joda.time.DateTime;
			
 
				 import org.springframework.beans.factory.annotation.Autowired;
			
 
				 import org.springframework.stereotype.Service;
			
 
				 import org.springframework.transaction.annotation.Propagation;
			
 
				 import org.springframework.transaction.annotation.Transactional;
			
 
				 
			
 
				+import java.util.Date;
			
 
				 import java.util.List;
			
 
				 
			
 
				 @Service
			
@@ -36,8 +36,12 @@ public class QzTaskService {
 
				     return qzTaskDao.selectAll(uptownId);
			
 
				   }
			
 
				 
			
 
				-  public List<QzTask> queryByHouseNumber(String houseNumber, Integer status) {
			
 
				-    return qzTaskDao.queryByHouseNumber(houseNumber, status);
			
 
				+  public List<QzTask> queryByHouseNumber(Long userId, String houseNumber, Integer status) {
			
 
				+    Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(userId);
			
 
				+
			
 
				+    Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
			
 
				+
			
 
				+    return qzTaskDao.queryByHouseNumber(uptownId, houseNumber, status);
			
 
				   }
			
 
				 
			
 
				   public QzTask queryByTaskId(Long taskId) {
			
@@ -63,19 +67,26 @@ public class QzTaskService {
 
				     qzTak.setUptownId(qzTask1.getUptownId());
			
 
				     qzTak.setHouseNumber(qzTask1.getHouseNumber());
			
 
				     qzTak.setUserCreate(userId);
			
 
				-    qzTak.setTimeCreate(new DateTime());
			
 
				+    qzTak.setTimeCreate(new Date());
			
 
				     qzTak.setUserUpdate(userId);
			
 
				-    qzTak.setTimeUpdate(new DateTime());
			
 
				+    qzTak.setTimeUpdate(new Date());
			
 
				     return qzTaskDao.insert(qzTak);
			
 
				   }
			
 
				 
			
 
				-  public List<QzTask> queryQzTaskByStatus(Integer taskStatus) {
			
 
				-    return qzTaskDao.queryQzTaskByStatus(taskStatus);
			
 
				+  public List<QzTask> queryQzTaskByStatus(Long userId, Integer taskStatus) {
			
 
				+    Long propertyId = yeweihuiUserRoleMapper.queryPropertyIdByUserId(userId);
			
 
				+
			
 
				+    Long uptownId = yeweihuiSysOwnerMapper.queryUptownIdByUserId(propertyId);
			
 
				+
			
 
				+    return qzTaskDao.queryQzTaskByStatus(uptownId, taskStatus);
			
 
				   }
			
 
				 
			
 
				   public List<QzTask> queryQzTask(Integer taskStatus, String taskTitle, Long userId) {
			
 
				     return qzTaskDao.queryQzTask(taskStatus, taskTitle, userId);
			
 
				   }
			
 
				+  public List<QzTask> queryQzTaskxq(Long userId) {
			
 
				+    return qzTaskDao.queryQzTaskxq(userId);
			
 
				+  }
			
 
				 
			
 
				   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
			
 
				   public int taskQueryTaskId(Long taskId) {
			
--- a/whepi-web/src/main/java/com/bofeng/service/WxUserOpenService.java
+++ b/whepi-web/src/main/java/com/bofeng/service/WxUserOpenService.java
		`@@ -0,0 +1 @@`
		`+body{font-size:.42667rem;background-color:#f8f8f8;-webkit-font-smoothing:antialiased}`