xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -17,41 +17,41 @@
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
                 <div class="weui-panel weui-panel_access">
                     <div id="notOpenRibao">
-                    <div class="weui-cells weui-cells_form">
-                        <div class="weui-cell weui-cell_vcode" style="height: 7vh">
-                            <div class="weui-cell__hd">
-                                <label class="weui-label">今日居家</label>
-                            </div>
-                            <div class="weui-cell__bd" id="ribao_jinrijujian">
+                        <div class="weui-cells weui-cells_form">
+                            <div class="weui-cell weui-cell_vcode" style="height: 7vh">
+                                <div class="weui-cell__hd">
+                                    <label class="weui-label">今日居家</label>
+                                </div>
+                                <div class="weui-cell__bd" id="ribao_jinrijujian">
 
-                            </div>
-                            <div class="weui-cell__ft">
-                                <button id="btnAdd" href="javascript:" style="height:5vh; margin-right: 3vh;"
-                                        class="weui-btn weui-btn_mini weui-btn_primary">添加人员
-                                </button>
+                                </div>
+                                <div class="weui-cell__ft">
+                                    <button id="btnAdd" href="javascript:" style="height:5vh; margin-right: 3vh;"
+                                            class="weui-btn weui-btn_mini weui-btn_primary">添加人员
+                                    </button>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div id="rb_family">
-                    <#--<div class="weui-media-box weui-media-box_text">-->
-                    <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
-                    <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
-                    <#--</div>-->
-                    </div>
-                    <div class="weui-cells__tips"> <span style="color: red; display: none">
+                        <div id="rb_family">
+                        <#--<div class="weui-media-box weui-media-box_text">-->
+                        <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
+                        <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
+                        <#--</div>-->
+                        </div>
+                        <div class="weui-cells__tips"> <span style="color: red; display: none">
                         <br/>
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
                     </span></div>
-                    <div class="weui-btn-area" style="text-align: center">
+                        <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="background-color: #D9D9D9"
-                           onclick="addReport()">上报</a>
+                            <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
+                               style="background-color: #D9D9D9"
+                               onclick="addReport()">上报</a>
+                        </div>
                     </div>
-                </div>
                     <div id="ribao" class="weui-btn-area" style="display: none">
                         <div style="text-align: center;">基本信息</div>
                         <div style="display:flex; flex-direction: row; justify-content: space-between;">
@@ -278,7 +278,9 @@
                                        onchange="selectinput6(this)"/>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                                <div style="height: 5vh; line-height: 5vh; color: red">注：本地区出行无需填写行程</div>
+                                <div style="height: 5vh; line-height: 5vh; color: red">
+                                    注：本地区出行无需填写行程,所有地点只填市一级（武汉市、孝感市），省或下面县区都不用填
+                                </div>
                             </div>
                             <br/>
                         <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
@@ -374,8 +376,10 @@
                 <div class="weui-panel weui-panel_access">
                 <#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
                     <div class="weui-panel__hd" style=" font-size: large">员工姓名：${linkman!''}</div>
-                    <div class="weui-panel__hd" style=" font-size: large">所在部门：<span id="unitMsg">${ridgepole!''}${unit!''}</span></div>
-                    <div class="weui-panel__hd" style=" font-size: large">员工编号：<span id="doorplateMsg">${doorplate!''}</span></div>
+                    <div class="weui-panel__hd" style=" font-size: large">所在部门：<span
+                            id="unitMsg">${ridgepole!''}${unit!''}</span></div>
+                    <div class="weui-panel__hd" style=" font-size: large">员工编号：<span
+                            id="doorplateMsg">${doorplate!''}</span></div>
                     <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
                     <input id="uptownId" type="text" hidden="hidden" value="${uptownId!''}"/>
                     <div class="weui-cell weui-cell_select weui-cell_select-after">

whepi-ui/templates/home/ribao.js

@@ -1267,23 +1267,35 @@ function ribaoCommit() {
 
       ribao_refrash();
       //修改
-      if (suspectedId > 0) {
-        var date = new Date();
-        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());
-        var time = Y + M + D + h + m + s;
-        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_shangbaotime').empty();
-        $('#txt_shangbaotime').append("上报时间：" + time);
+      var uptownId = $("#uptownId").val();
+      //是凌云
+      if (uptownId == xiaoquId || uptownId == ceshixiaoquId) {
+        if (suspectedId > 0) {
+          var date = new Date();
+          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());
+          var time = Y + M + D + h + m + s;
+          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_shangbaotime').empty();
+          $('#txt_shangbaotime').append("上报时间：" + time);
+        }
+        else {
+          canSahngbao = true;
+          document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
+          document.getElementById("txt_shangbao").style['color'] = "red";
+          $('#txt_shangbao').empty();
+          $('#txt_shangbao').append("今日未上报");
+          $('#txt_shangbaotime').empty();
+        }
       }
       else {
         canSahngbao = true;
@@ -1293,7 +1305,6 @@ function ribaoCommit() {
         $('#txt_shangbao').append("今日未上报");
         $('#txt_shangbaotime').empty();
       }
-
       clearShow();
     },
   });
@@ -1534,7 +1545,7 @@ function addReport() {
       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 m = (date.getMinutes() < 10 ? '0' + (date.getMinutes()) : date.getMinutes()) + ':';
       var s = (date.getSeconds() < 10 ? '0' + (date.getSeconds()) : date.getSeconds());
       var time = Y + M + D + h + m + s;
       if (data.msg == "操作成功") {

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

@@ -265,9 +265,15 @@ public class MsTripService {
             }
             //更新今日日报,直接上报
             msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
-            Integer rezuitNum = msReportService.addReport(userCreate);
-            if (rezuitNum == 4)
-                reportId = 4L;
+            //是领域
+            UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userCreate);
+            if (unit != null) {
+                if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+                    Integer rezuitNum = msReportService.addReport(userCreate);
+                    if (rezuitNum == 4)
+                        reportId = 4L;
+                }
+            }
         }
         return reportId;
     }