Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

admin-ui/app/whepi/index.js

@@ -2,9 +2,11 @@ var userRole = 0;
 $(function () {
   //隐藏角色上的提示红点
   $('#role-name-num').hide();
+
   function doSearch(text) {
     $('#menutree').tree('search', text);
   }
+
   App.init(function () {
     document.onkeydown = function (event) {
       if (event.ctrlKey && event.keyCode === 191) {
@@ -69,6 +71,27 @@ $(function () {
         onLoadSuccess: function (node, data) {
         }
       });
+    } else if (userRole == "5") {//指挥部登录
+      $('#menutree').tree({
+        url: '/app/whepi/mock/menu5.json',
+        onDblClick: function (node) {
+          var $this = $(this);
+          if (!$this.tree('isLeaf', node.target)) {
+            $this.tree(node.state === 'closed' ? 'expand' : 'collapse', node.target);
+          }
+        },
+        onSelect: function () {
+          return false;
+        },
+        onClick: function (node) {
+          var href = node.href;
+          if ($.trim(href)) {
+            App.addTab({title: node.text, url: node.href, id: node.id, iconCls: node.iconCls});
+          }
+        },
+        onLoadSuccess: function (node, data) {
+        }
+      });
     }
 
 
@@ -157,7 +180,7 @@ var App = {
 
     } else {
       iframe = '<iframe src="' + params.url +
-          '" scrolling="auto" frameborder="0" style="width:100%;height:100%;"></iframe>';
+        '" scrolling="auto" frameborder="0" style="width:100%;height:100%;"></iframe>';
     }
 
     $tt.tabs('add', {

admin-ui/app/whepi/mock/menu.json

@@ -11,14 +11,6 @@
       "children": []
     },
     {
-      "id": "ENT10001",
-      "text": "团购系统",
-      "href": "/app/whepi/tugou/tugou.js",
-      "iconCls": "icon-blank fa fa-align-justify",
-      "state": "close",
-      "children": []
-    },
-    {
       "id": "ENT10002",
       "text": "小区进出信息",
       "href": "",

admin-ui/app/whepi/mock/menu5.json

@@ -0,0 +1,14 @@
+{
+  "success": true,
+  "msg": "",
+  "data": [
+    {
+      "id": "ENT10001",
+      "text": "团购系统",
+      "href": "/app/whepi/tugou/tugou.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    }
+  ]
+}

admin-ui/app/whepi/tugou/dialogTugou.js

@@ -91,10 +91,10 @@ define(function (require) {
                 height: 35, validType: 'isBlank'
               },
               {
-                name: 'tgSupplier', label: '供应商', maxlength: 20,
+                name: 'tgSupplier', label: '组织者', maxlength: 20,
                 width: 450, height: 35,
-                required: true,
-                readonly: context.isEdit ? true : false,
+                required: true,value:'指挥部',
+                readonly:  true ,
               },
               [{
                 name: 'tgGoods', label: '团购套餐',

admin-ui/app/whepi/tugou/tugou.js

@@ -186,7 +186,7 @@ define(function (require) {
                     {field: 'uptown_id', title: '小区id', maxWidth: 200, align: 'left', hidden: true},
                     {field: 'uptownName', title: '小区', maxWidth: 200, align: 'left',},
                     {field: 'tgTitle', title: '组团标题', maxWidth: 200, align: 'left',},
-                    {field: 'tgSupplier', title: '供应商', maxWidth: 200,},
+                    {field: 'tgSupplier', title: '组织者', maxWidth: 200,},
                     {
                       field: 'tgGoods',
                       title: '团购套餐', maxWidth: 200,

whepi-ui/templates/home/buytc.ftl

@@ -54,7 +54,7 @@
                         '            </div>\n' +
                         '        </div>\n' +
                         '        <div>\n' +
-                        '            <div style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;' + v.tgSupplier + '</div>\n' +
+                        '            <div style="text-indent: -0em;margin-left: 2em;">组织者:&nbsp;&nbsp;' + v.tgSupplier + '</div>\n' +
                         '\n' +
                         '            <div style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;' + v.tgGoods + '</div>\n' +
                         '\n' +

whepi-ui/templates/home/home.ftl

@@ -100,6 +100,7 @@
             $("#jt1").removeClass('weui-bar__item--on');
             $("#tab2").addClass('weui-tab__bd-item--active');
             $("#jt2").addClass('weui-bar__item--on');
+            familyClick();
         }
 
         var show = ${show!'"-"'};
@@ -151,7 +152,9 @@
     }
 
     function xiaoQuItemClick(v) {
-        $.ajax({
+        window.location.href = "/quzhu/home/quxiao.html?taskId=" + v.taskId + "&userId=" + $('#userId').val();
+        /*familyClick();*/
+    /*    $.ajax({
             url: '/home/home/taskQuery',
             data: {taskId: v.taskId},
             type: 'GET',
@@ -167,7 +170,7 @@
             },
             error: function () {
             }
-        });
+        });*/
 
     }
 

whepi-ui/templates/home/htlpXq.ftl

@@ -29,8 +29,8 @@
             <p style="align-items: center">处理中</p>
         </div>-->
         </#if>
-        <#if task.taskStatus == 2>
-        <div class="weui-btn-area">
+        <#if task.taskStatus == 2 >
+        <div class="weui-btn-area" id="hf">
             <a class="weui-btn weui-btn_default" href="javascript:doTask();">回复</a>
             <a class="weui-btn weui-btn_primary" href="javascript:commint();">完成</a>
         </div>
@@ -74,7 +74,11 @@
         if (task.taskStatus == 2 || task.taskStatus == 3) {
             getdealdetail();
         }
-
+        console.log(task.userId)
+        console.log(userId)
+        if (task.userId != userId) {
+            $('#hf').toggle();
+        }
     })(jQuery);
 
     function doTask() {
@@ -130,7 +134,9 @@
     }
 
     function goback() {
-        window.history.back();
+        window.location.href = "/user/homeIndex.html?show=qiuzhu&userId=" + userId + "&userType=" + 1;
+
+        //window.history.back();
     }
 
     function getdealdetail() {

whepi-ui/templates/home/qiuzhu.ftl

@@ -10,6 +10,17 @@
         </div>
         <div class="weui-tab__panel">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
+                <div class="weui-btn-area" style="display: flex; flex-direction: row; justify-content: space-between;">
+                    <div style="display: flex; flex-direction: row; align-items: center; justify-content: space-between;width: 70vw;">
+                        <input id="qz_searchtitle" class="weui-input" placeholder="请输入标题"
+                               style="background-color: #d1d1d1; height: 5vh;"/>
+                    </div>
+                    <a id="qz_select" class="weui-btn_primary"
+                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 10px;"
+                       href="javascript:">
+                        <div style="width: 20vw; height: 5vh;line-height:5vh; text-align: center; color: white">查询</div>
+                    </a>
+                </div>
                 <div id="notitle">
                     <div>
 

whepi-ui/templates/home/qiuzhu.js

@@ -3,20 +3,20 @@ function qiuzhu_init() {
 }
 
 function shValue(v) {
-/*  $('#qzHS').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +
-    '                <div class="weui-media-box__bd">\n' +
-    '                    <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
-    '                        <p class="weui-media-box__desc">' + v.nickName + '</p>\n' +
-    '                        <p class="weui-media-box__desc">' + timestampToTime(v.timeUpdate) + '</p>\n' +
-    '                    </div>\n' +
-    '                    <div class="weui-cell ">\n' +
-    '                        <div class="weui-cell__bd">\n' +
-    '                            <textarea class="weui-textarea" rows="1" readonly >' + v.replyContent + '</textarea>\n' +
-    '                            <div class="weui-textarea-counter"></div>\n' +
-    '                        </div>\n' +
-    '                    </div>\n' +
-    '                </div>\n' +
-    '            </a>\n<br />'));*/
+  /*  $('#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' +
+      '                        <p class="weui-media-box__desc">' + timestampToTime(v.timeUpdate) + '</p>\n' +
+      '                    </div>\n' +
+      '                    <div class="weui-cell ">\n' +
+      '                        <div class="weui-cell__bd">\n' +
+      '                            <textarea class="weui-textarea" rows="1" readonly >' + v.replyContent + '</textarea>\n' +
+      '                            <div class="weui-textarea-counter"></div>\n' +
+      '                        </div>\n' +
+      '                    </div>\n' +
+      '                </div>\n' +
+      '            </a>\n<br />'));*/
 }
 
 function timestampToTime(timestamp) {
@@ -31,19 +31,29 @@ function timestampToTime(timestamp) {
 }
 
 function family_init() {
-  /*$('#family').on('click',function () {
-    $('#familyDisplay')[0].style.display == '';
-    $.alert($('#familyDisplay')[0].style.display == 'none')
-    if($('#familyDisplay')[0].style.display == 'none'){
-      $('#notPlay').toggle();
-
-    }else{
-      $('#familyDisplay')[0].style.display == '';
-      $('#notPlay')[0].style.display == 'none';
-    }
-
+  $('#qz_select').on('click', function () {
+    $('#notitle').empty();//清除节点
+    $.ajax({
+      url: '/home/home/queryQzTaskxq',
+      data: {userId: $('#userId').val(),
+             taskTitle:$('#qz_searchtitle').val()},
+      type: 'GET',
+      async: false,
+      success: function (data) {
+        console.log(data);
+        if (data.data.length > 0) {
+          hasData = true;
+          data.data.forEach(function (v) {
+            familyValue(v);
+          });
+        } else {
 
-  })*/
+        }
+      },
+      error: function () {
+      }
+    });
+  })
 }
 
 function submit_back() {

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

@@ -25,7 +25,7 @@ public interface QzTaskDao extends BaseMapper<QzTask> {
     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);
+    List<QzTask> queryQzTaskxq(@Param("userId") Long userId,@Param("taskTitle")String taskTitle);
 
     //当前用户名称
     QzTask selectUserName(@Param("userId") Long userId);

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

@@ -80,7 +80,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     Map<String, Integer> selecthuizong(@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, \n" +
+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,\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" +
@@ -94,7 +94,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     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, \n" +
+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,\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" +
@@ -108,7 +108,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     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, \n" +
+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,\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" +

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

@@ -26,6 +26,12 @@ public class ExcelRiBao {
     private int diarrhea = 0;
     private int singleRoom = 0;
     private int scoreRezult = 0;
+    private int safetyNum = 0;
+    private int reportStatus = 0;
+    private int sureNum = 0;
+    private int singleNum = 0;
+    private int suspectedNum = 0;
+    private int normalNum = 0;
     private String statusDesp = "";
     private String others = "";
 
@@ -56,20 +62,66 @@ public class ExcelRiBao {
     @ExcelProperty(value = "联系电话", index = 3)
     private String phone;
 
+
     @ExcelProperty(value = "今日居家人数", index = 4)
-    private int safetyNum;
+    private String safetyNumStr = "";
+
+    public String getSafetyNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        safetyNumStr = "" + safetyNum;
+
+        return safetyNumStr;
+    }
 
     @ExcelProperty(value = "确诊人数", index = 5)
-    private int sureNum;
+    private String sureNumStr;
+
+    public String getSureNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        sureNumStr = "" + sureNum;
+
+        return sureNumStr;
+    }
 
     @ExcelProperty(value = "隔离人数", index = 6)
-    private int singleNum;
+    private String singleNumStr;
+
+    public String getSingleNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        singleNumStr = "" + singleNum;
+
+        return singleNumStr;
+    }
 
     @ExcelProperty(value = "异常观察人数", index = 7)
-    private int suspectedNum;
+    private String suspectedNumStr;
+
+    public String getSuspectedNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        suspectedNumStr = "" + suspectedNum;
+
+        return suspectedNumStr;
+    }
 
     @ExcelProperty(value = "身体正常人数", index = 8)
-    private int normalNum;
+    private String normalNumStr;
+
+    public String getNormalNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        normalNumStr = "" + normalNum;
+
+        return normalNumStr;
+    }
 
     @ExcelProperty(value = "居家人员姓名", index = 9)
     private String userName;
@@ -93,30 +145,45 @@ public class ExcelRiBao {
 
     @ExcelProperty(value = "体温", index = 10)
     private String temperatureStr;
+
     public String getTemperatureStr() {
-        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        temperatureStr = temperature.floatValue() > 10 ? temperature + "" : "未填报";
         return temperatureStr;
     }
 
     @ExcelProperty(value = "确诊", index = 11)
     private String medicalStr;
+
     public String getMedicalStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (medical == 0) {
             medicalStr = "否";
         } else {
             medicalStr = "是";
         }
+
+
         return medicalStr;
     }
 
     @ExcelProperty(value = "单间隔离", index = 12)
     private String singleRoomStr;
+
     public String getSingleRoomStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (singleRoom == 0) {
             singleRoomStr = "否";
         } else {
             singleRoomStr = "是";
         }
+
         return singleRoomStr;
     }
 
@@ -125,6 +192,9 @@ public class ExcelRiBao {
 
     public String getBaseDesc() {
 
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
             baseDesc += "心血管疾病（服用ARB）,";
         } else if (Conv.NI(familyStatus.split(",")[1]) == 1) {
@@ -150,8 +220,13 @@ public class ExcelRiBao {
 
     @ExcelProperty(value = "病情描述", index = 14)
     private String bingqingDesc = "";
+
     public String getBingqingDesc() {
 
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+
         if (medical == 1) {
             bingqingDesc += "已确诊、";
         }

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

@@ -26,6 +26,12 @@ public class ExcelRiBaoLY {
     private int diarrhea = 0;
     private int singleRoom = 0;
     private int scoreRezult = 0;
+    private int safetyNum = 0;
+    private int reportStatus = 0;
+    private int sureNum = 0;
+    private int singleNum = 0;
+    private int suspectedNum = 0;
+    private int normalNum = 0;
     private String statusDesp = "";
     private String others = "";
 
@@ -57,19 +63,64 @@ public class ExcelRiBaoLY {
     private String phone;
 
     @ExcelProperty(value = "今日居家人数", index = 4)
-    private int safetyNum;
+    private String safetyNumStr = "";
+
+    public String getSafetyNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        safetyNumStr = "" + safetyNum;
+
+        return safetyNumStr;
+    }
 
     @ExcelProperty(value = "确诊人数", index = 5)
-    private int sureNum;
+    private String sureNumStr;
+
+    public String getSureNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        sureNumStr = "" + sureNum;
+
+        return sureNumStr;
+    }
 
     @ExcelProperty(value = "隔离人数", index = 6)
-    private int singleNum;
+    private String singleNumStr;
+
+    public String getSingleNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        singleNumStr = "" + singleNum;
+
+        return singleNumStr;
+    }
 
     @ExcelProperty(value = "异常观察人数", index = 7)
-    private int suspectedNum;
+    private String suspectedNumStr;
+
+    public String getSuspectedNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        suspectedNumStr = "" + suspectedNum;
+
+        return suspectedNumStr;
+    }
 
     @ExcelProperty(value = "身体正常人数", index = 8)
-    private int normalNum;
+    private String normalNumStr;
+
+    public String getNormalNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        normalNumStr = "" + normalNum;
+
+        return normalNumStr;
+    }
 
     @ExcelProperty(value = "居家人员姓名", index = 9)
     private String userName;
@@ -94,15 +145,23 @@ public class ExcelRiBaoLY {
 
     @ExcelProperty(value = "体温", index = 10)
     private String temperatureStr;
+
     public String getTemperatureStr() {
-        temperatureStr = temperature.floatValue()>10?temperature+"":"未填报";
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        temperatureStr = temperature.floatValue() > 10 ? temperature + "" : "未填报";
         return temperatureStr;
     }
 
 
     @ExcelProperty(value = "确诊", index = 11)
     private String medicalStr;
+
     public String getMedicalStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (medical == 0) {
             medicalStr = "否";
         } else {
@@ -113,7 +172,11 @@ public class ExcelRiBaoLY {
 
     @ExcelProperty(value = "单间隔离", index = 12)
     private String singleRoomStr;
+
     public String getSingleRoomStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (singleRoom == 0) {
             singleRoomStr = "否";
         } else {
@@ -126,7 +189,9 @@ public class ExcelRiBaoLY {
     private String baseDesc = "";
 
     public String getBaseDesc() {
-
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
             baseDesc += "心血管疾病（服用ARB）,";
         } else if (Conv.NI(familyStatus.split(",")[1]) == 1) {
@@ -152,8 +217,11 @@ public class ExcelRiBaoLY {
 
     @ExcelProperty(value = "病情描述", index = 14)
     private String bingqingDesc = "";
-    public String getBingqingDesc() {
 
+    public String getBingqingDesc() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (medical == 1) {
             bingqingDesc += "已确诊、";
         }

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

@@ -26,6 +26,12 @@ public class ExcelRiBaoPrivate {
     private int diarrhea = 0;
     private int singleRoom = 0;
     private int scoreRezult = 0;
+    private int safetyNum = 0;
+    private int reportStatus = 0;
+    private int sureNum = 0;
+    private int singleNum = 0;
+    private int suspectedNum = 0;
+    private int normalNum = 0;
     private String statusDesp = "";
     private String others = "";
 
@@ -67,19 +73,64 @@ public class ExcelRiBaoPrivate {
     private String phone;
 
     @ExcelProperty(value = "今日居家人数", index = 5)
-    private int safetyNum;
+    private String safetyNumStr = "";
+
+    public String getSafetyNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        safetyNumStr = "" + safetyNum;
+
+        return safetyNumStr;
+    }
 
     @ExcelProperty(value = "确诊人数", index = 6)
-    private int sureNum;
+    private String sureNumStr;
+
+    public String getSureNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        sureNumStr = "" + sureNum;
+
+        return sureNumStr;
+    }
 
     @ExcelProperty(value = "隔离人数", index = 7)
-    private int singleNum;
+    private String singleNumStr;
+
+    public String getSingleNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        singleNumStr = "" + singleNum;
+
+        return singleNumStr;
+    }
 
     @ExcelProperty(value = "异常观察人数", index = 8)
-    private int suspectedNum;
+    private String suspectedNumStr;
+
+    public String getSuspectedNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        suspectedNumStr = "" + suspectedNum;
+
+        return suspectedNumStr;
+    }
 
     @ExcelProperty(value = "身体正常人数", index = 9)
-    private int normalNum;
+    private String normalNumStr;
+
+    public String getNormalNumStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
+        normalNumStr = "" + normalNum;
+
+        return normalNumStr;
+    }
 
     @ExcelProperty(value = "居家人员姓名", index = 10)
     private String userName;
@@ -88,6 +139,9 @@ public class ExcelRiBaoPrivate {
     private String grenderStr;
 
     public String getGrenderStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (grender == 1) {
             grenderStr = "男";
         } else if (grender == 2) {
@@ -105,6 +159,9 @@ public class ExcelRiBaoPrivate {
     private String temperatureStr;
 
     public String getTemperatureStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         temperatureStr = temperature.floatValue() > 10 ? temperature + "" : "未填报";
         return temperatureStr;
     }
@@ -113,6 +170,9 @@ public class ExcelRiBaoPrivate {
     private String medicalStr;
 
     public String getMedicalStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (medical == 0) {
             medicalStr = "否";
         } else {
@@ -125,6 +185,9 @@ public class ExcelRiBaoPrivate {
     private String singleRoomStr;
 
     public String getSingleRoomStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (singleRoom == 0) {
             singleRoomStr = "否";
         } else {
@@ -137,6 +200,9 @@ public class ExcelRiBaoPrivate {
     private String baseDesc = "";
 
     public String getBaseDesc() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
 
         if (Conv.NI(familyStatus.split(",")[0]) == 1) {
             baseDesc += "心血管疾病（服用ARB）,";
@@ -166,6 +232,9 @@ public class ExcelRiBaoPrivate {
     private String bingqingDesc = "";
 
     public String getBingqingDesc() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
 
         if (medical == 1) {
             bingqingDesc += "已确诊、";
@@ -230,6 +299,9 @@ public class ExcelRiBaoPrivate {
     private String scoreRezultStr;
 
     public String getScoreRezultStr() {
+        if (reportStatus == 0) {
+            return "未填报";
+        }
         if (scoreRezult == 0) {
             scoreRezultStr = "未评估";
         } else if (scoreRezult == 1) {

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

@@ -1,6 +1,7 @@
 package com.bofeng.service;
 
 import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.bofeng.JwtHelper;
 import com.bofeng.dao.JmTuangouDao;
 import com.bofeng.dao.YeweihuiSysOwnerMapper;
 import com.bofeng.dao.YeweihuiUserRoleMapper;
@@ -88,7 +89,7 @@ public class JmTuangouService {
 
             jmTuangou.setTgEndTime(jmTuangou.gettgEndTime);
             jmTuangou.setTgDeliverTime(tgDeliverTime);*/
-      jmTuangou.setUserId(jmTuangouDao.selectByUserId().getUserId());
+      jmTuangou.setUserId(JwtHelper.getUserId());
       success = jmTuangouDao.insert(jmTuangou);
     }
     return success;

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

@@ -84,8 +84,8 @@ public class QzTaskService {
   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);
+  public List<QzTask> queryQzTaskxq(Long userId,String taskTitle) {
+    return qzTaskDao.queryQzTaskxq(userId,taskTitle);
   }
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)

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

@@ -68,8 +68,9 @@ public class HomeController {
 
   //我的在求助的展示
   @GetMapping("/home/home/queryQzTaskxq")
-  public Model<List<QzTask>> queryQzTaskxq(@Pd(name = "userId", required = false) Long userId) {
-    return Model.newSuccess(qzTaskService.queryQzTaskxq(userId));
+  public Model<List<QzTask>> queryQzTaskxq(@Pd(name = "userId", required = false) Long userId,
+                                           @Pd(name = "taskTitle", required = false)String taskTitle) {
+    return Model.newSuccess(qzTaskService.queryQzTaskxq(userId,taskTitle));
   }
 
 
@@ -103,6 +104,14 @@ public class HomeController {
     if (qzTaskReply != null) {
       userId1 = qzTaskReply.getUserId();
     }*/
+//    if (YuserId != 1) {
+//      if (userId.longValue() != YuserId.longValue()) {
+//        model.put("type", "\"" + 1 + "\"");
+//      } else {
+//        model.put("type", "\"" + 2 + "\"");
+//      }
+//      model.put("type", "\"" + 0 + "\"");
+//    }
 
 
 //        A业委会，B居委会，C物业，D志愿者

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

@@ -67,8 +67,8 @@ public class UserOpenController {
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
             list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            /*list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);*/
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");

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

@@ -1,5 +1,6 @@
 package com.bofeng.wx.controller;
 
+import com.bofeng.JwtHelper;
 import com.bofeng.dao.RbMapper;
 import com.bofeng.dao.UptownMapper;
 import com.bofeng.entity.*;
@@ -370,9 +371,9 @@ public class YeWeiHuiController {
   public Model whepiTuangoulist(@Pd(name = "userId", required = false) Long userId, @Pd(name = "uptownIds", required = false) String uptownIds, @Pd(name = "queryProperties", required = false) String queryProperties, @Pd(name = "tgStatus", required = false) Long tgStatus,
                                 PageDb pageDb) {
     //系统管理员只有一个人 获取当前userId
-    JmTuangou jmTuangou = jmTuangouService.selectByUserId();
+   // JmTuangou jmTuangou = jmTuangouService.selectByUserId();
 
-    List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(jmTuangou.getUserId(),
+    List<JmTuangou> myList = jmTuangouService.whepiTuangoulist(JwtHelper.getUserId(),
       uptownIds, queryProperties, tgStatus, pageDb);
 
     return Model.newSuccess(pageDb, myList);

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

@@ -65,8 +65,8 @@ spring:
     #driverClassName: com.mysql.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     driverClassName: net.sf.log4jdbc.DriverSpy
-    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: whepi_test
+    url: jdbc:log4jdbc:mysql://localhost:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: root
     password: 123456
 
   redis:

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

@@ -56,6 +56,9 @@
             INNER JOIN sys_uptown_house b on a.property_id=b.house_id
             INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
             where a.user_id=#{userId} limit 1)
+            <if test="taskTitle!=null and taskTitle!=''">
+                and qz.task_title like concat('%',#{taskTitle},'%')
+            </if>
         </where>
         order by qz.time_update desc
     </select>
@@ -85,7 +88,7 @@
         FROM sys_user_role a
         INNER JOIN sys_uptown_house b on a.property_id=b.house_id
         INNER JOIN sys_uptown_unit c on c.unit_id=b.unit_id
-        where a.user_id=#{userId} limit 1
+        where a.user_id=#{userId} and a.role_id=1 limit 1
     </select>
 
 </mapper>