Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -83,7 +83,7 @@
         <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_jinrijujian').append(msReport.safetyNum);
         if (msReport.reportStatus == 1) {
-            var date = new Date();
+            var date = new Date(msReport.timeUpdate*1);
             var year = date.getFullYear();
             var month = date.getMonth() + 1;
             var day = date.getDate();
@@ -94,8 +94,11 @@
             canSahngbao = false;
             document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
             document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
+            document.getElementById("txt_shangbaotime").style['color'] = "#0bb20c";
             $('#txt_shangbao').empty();
-            $('#txt_shangbao').append("今日已上报" );
+            $('#txt_shangbao').append("今日已上报");
+            $('#txt_shangbaotime').empty();
+            $('#txt_shangbaotime').append("上报时间：" + time);
         }
         else {
             canSahngbao = true;
@@ -103,6 +106,7 @@
             document.getElementById("txt_shangbao").style['color'] = "red";
             $('#txt_shangbao').empty();
             $('#txt_shangbao').append("今日未上报");
+            $('#txt_shangbaotime').empty();
         }
         ribaoInitialization(msReport.reportId);
         $("#my-input-ribao").calendar();

whepi-ui/templates/home/ribao.ftl

@@ -45,6 +45,8 @@
                     <div class="weui-btn-area" style="text-align: center">
                         <span style="color: red;font-size:x-large" id="txt_shangbao">
                          今日未上报
+                       </span><br/> <span style="color: red;font-size:x-large" id="txt_shangbaotime">
+                         上报时间
                        </span>
                         <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
                            style=""

whepi-ui/templates/home/ribao.js

@@ -667,7 +667,6 @@ function ribao_refrash() {
       if (data.data == undefined || data.data == "") {
         $('#rb_family').empty();
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
-        canSahngbao = false;
       }
       else {
         $('#rb_family').empty();
@@ -1237,6 +1236,7 @@ function ribaoCommit() {
       document.getElementById("txt_shangbao").style['color'] = "red";
       $('#txt_shangbao').empty();
       $('#txt_shangbao').append("今日未上报");
+      $('#txt_shangbaotime').empty();
     },
   });
 }
@@ -1472,8 +1472,11 @@ function addReport() {
         canSahngbao = false;
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
         document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
+        document.getElementById("txt_shangbaotime").style['color'] = "#0bb20c";
         $('#txt_shangbao').empty();
-        $('#txt_shangbao').append("今日已上报,上报时间:" + time);
+        $('#txt_shangbao').append("今日已上报" );
+        $('#txt_shangbaotime').empty();
+        $('#txt_shangbaotime').append("上报时间：" + time);
       }
 
     },
@@ -1590,6 +1593,7 @@ function helpValue1(v) {
 
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: auto">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
+    '                                      &nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
     '                                      <div style="height: auto">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</div>\n' +
     '                                    </div>\n' +
     '                              '));

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

@@ -288,7 +288,7 @@ public class MsSuspectedService {
                 msReport.setMsStatus(2);
             else
                 msReport.setMsStatus(1);
-            msReport.setReportStatus(0);
+            //msReport.setReportStatus(0);
             msReportMapper.updateById(msReport);
         }
     }