Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -84,6 +84,16 @@
         if (msReport.reportStatus == 1) {
             canSahngbao = false;
             document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+            document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
+            $('#txt_shangbao').empty();
+            $('#txt_shangbao').append("今日已上报");
+        }
+        else {
+            canSahngbao = true;
+            document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
+            document.getElementById("txt_shangbao").style['color'] = "red";
+            $('#txt_shangbao').empty();
+            $('#txt_shangbao').append("今日未上报");
         }
         ribaoInitialization(msReport.reportId);
         $("#my-input-ribao").calendar();

whepi-ui/templates/home/ribao.ftl

@@ -42,7 +42,10 @@
                         <br/>
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
                     </span></div>
-                    <div class="weui-btn-area">
+                    <div class="weui-btn-area" style="text-align: center">
+                        <span style="color: red;font-size:x-large" id="txt_shangbao">
+                         今日未上报
+                       </span>
                         <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
                            style=""
                            onclick="addReport()">上报</a>

whepi-ui/templates/home/ribao.js

@@ -1234,6 +1234,9 @@ function ribaoCommit() {
       clearShow();
       canSahngbao = true;
       document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
+      document.getElementById("txt_shangbao").style['color'] = "red";
+      $('#txt_shangbao').empty();
+      $('#txt_shangbao').append("今日未上报");
     },
   });
 }
@@ -1248,6 +1251,13 @@ function deleteSuspected(suspectedId) {
     success: function (data) {
       $('#ribao_jinrijujian').empty();
       $('#ribao_jinrijujian').append(data.safetyNum);
+
+      //今日未上报
+      canSahngbao = true;
+      document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
+      document.getElementById("txt_shangbao").style['color'] = "red";
+      $('#txt_shangbao').empty();
+      $('#txt_shangbao').append("今日未上报");
       ribao_refrash();
     },
   });
@@ -1453,6 +1463,9 @@ function addReport() {
       if (data.msg == "操作成功") {
         canSahngbao = false;
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+        document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
+        $('#txt_shangbao').empty();
+        $('#txt_shangbao').append("今日已上报");
       }
 
     },

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

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