lange 5 年 前
コミット
4d2b907db8

+ 11 - 33
whepi-ui/templates/home/ribao.ftl

@@ -116,40 +116,18 @@
                 </br>
             </div>
             <div id="rb_nav2" class="weui-tab__bd-item ">
-                <div class="weui-grids">
-                    <a href="javascript:;" class="weui-grid" style="background-color: #0bb20c">
-                        <p class="weui-grid__label">
-                            01
-                        </p>
-                    </a>
-                    <a href="javascript:;" class="weui-grid" style="background-color: red">
-                        <p class="weui-grid__label">
-                            02
-                        </p>
-                    </a>
-                    <a href="javascript:;" class="weui-grid">
-                        <p class="weui-grid__label">
-                            03
-                        </p>
-                    </a>
-                    <a href="javascript:;" class="weui-grid">
-                        <p class="weui-grid__label">
-                            04
-                        </p>
-                    </a>
-                </div>
+                <div id="my-input-ribao"></div>
                 <div class="weui-panel weui-panel_access">
-                    <div class="weui-panel__hd">2020-02-03</div>
-                    <div class="weui-panel__bd">
-                        <div class="weui-media-box weui-media-box_text">
-                            <h4 class="weui-media-box__title">家人1:咳嗽、乏力、未确诊</h4>
-                            <p class="weui-media-box__desc">由各种物质组成的巨型球状天体,叫做星球。星球有一定的形状,有自己的运行轨道。</p>
-                        </div>
-                        <div class="weui-media-box weui-media-box_text">
-                            <h4 class="weui-media-box__title">家人1:咳嗽、乏力、确诊</h4>
-                            <p class="weui-media-box__desc">由各种物质组成的巨型球状天体,叫做星球。星球有一定的形状,有自己的运行轨道。</p>
-                        </div>
-                    </div>
+                    <div class="weui-panel__bd" id="ribao_famliy">
+                        <#--<div class="weui-media-box weui-media-box_text">-->
+                            <#--<h4 class="weui-media-box__title">家人1:咳嗽、乏力、未确诊</h4>-->
+                            <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体,叫做星球。星球有一定的形状,有自己的运行轨道。</p>-->
+                        <#--</div>-->
+                        <#--<div class="weui-media-box weui-media-box_text">-->
+                            <#--<h4 class="weui-media-box__title">家人1:咳嗽、乏力、确诊</h4>-->
+                            <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体,叫做星球。星球有一定的形状,有自己的运行轨道。</p>-->
+                        <#--</div>-->
+                    </div><br /><br />
                 </div>
             </div>
         </div>

+ 58 - 4
whepi-ui/templates/home/ribao.js

@@ -35,13 +35,13 @@ function helpValue(v) {
   var conditionStatusList = v.conditionStatus.split(',');
   var conditionStatus = v.userName + ":";
   if (conditionStatusList[0] > 0)
-    conditionStatus += "咳嗽"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;咳嗽"
   if (conditionStatusList[1] > 0)
-    conditionStatus += "发烧"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
   if (conditionStatusList[2] > 0)
-    conditionStatus += "乏力"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"
   if (conditionStatusList[3] > 0)
-    conditionStatus += "其他"
+    conditionStatus += "&nbsp;&nbsp;&nbsp;其他"
   if (v.medical > 0)
     conditionStatus += "&nbsp;&nbsp;&nbsp;确诊"
   else
@@ -150,3 +150,57 @@ function addReport() {
     },
   });
 }
+
+$("#my-input-ribao").calendar({
+  dateFormat: 'yyyy-mm-dd',
+  inputReadOnly: false,
+  onChange: function (p, values, displayValues) {
+    var reportDate = values.toString();
+    $.ajax({
+      url: '/home/home/queryRibaoReportDate',
+      data: {
+        "reportDate": reportDate,
+      },
+      type: 'GET',
+      success: function (data) {
+        console.log(data);
+        if (data.data.length > 0) {
+          hasData = true;
+          data.data.forEach(function (v) {
+            helpValue1(v);
+          });
+        } else {
+
+        }
+      },
+      error: function () {
+      }
+    });
+  }
+});
+
+
+function helpValue1(v) {
+  var conditionStatusList = v.conditionStatus.split(',');
+  var conditionStatus = v.userName + ":";
+  if (conditionStatusList[0] > 0)
+    conditionStatus += "&nbsp;&nbsp;&nbsp;咳嗽"
+  if (conditionStatusList[1] > 0) {
+      conditionStatus += "&nbsp;&nbsp;&nbsp;发烧"
+  }
+  if (conditionStatusList[2] > 0) {
+      conditionStatus += "&nbsp;&nbsp;&nbsp;乏力"
+  }
+  if (conditionStatusList[3] > 0) {
+      conditionStatus += "&nbsp;&nbsp;&nbsp;其他"
+  }
+  if (v.medical > 0)
+    conditionStatus += "&nbsp;&nbsp;&nbsp;确诊"
+  else
+    conditionStatus += "&nbsp;&nbsp;&nbsp;未确诊"
+  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text">\n' +
+    '                                      <h4 class="weui-media-box__title">' + conditionStatus + '</h4>\n' +
+    '                                      <p class="weui-media-box__desc">' + v.remarks + '</p>\n' +
+    '                                    </div>\n' +
+    '                              '));
+}

+ 7 - 9
whepi-web/src/main/java/com/bofeng/service/MsReportService.java

@@ -30,20 +30,18 @@ public class MsReportService {
     @Autowired
     private MsReportMapper msReportMapper;
 
-    public List<MsSuspected> getBySuspectedDateNow(Long userId) {
-        Date t = new Date();
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        String reportDate = df.format(t);
+    public List<MsSuspected> getByReportId(Long reportId) {
+        return msSuspectedMapper.selectByReportId(reportId);
+    }
+
+    public List<MsSuspected> getByReportReportDate(String reportDate) {
+
         List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate);
         List<MsSuspected> listSuspected = null;
         if (listReport != null && listReport.size() > 0) {
             listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport.get(0).getReportId().toString()));
         }
-        return listSuspected;
-    }
-
-    public List<MsSuspected> getByReportId(Long reportId) {
-        return msSuspectedMapper.selectByReportId(reportId);
+        return  listSuspected;
     }
 
     public MsReport getReportByDateNow(Long userId) {

+ 7 - 0
whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -64,4 +64,11 @@ public class MsReportController {
         msReportService.addReport(safetyNum);
         return new ModelAndView("/home/home.ftl");
     }
+
+    //获取家人
+    @GetMapping("/home/home/queryRibaoReportDate")
+    public Model<List<MsSuspected>> queryRibaoReportDate(@Pd(name = "reportDate") String reportDate) {
+        String report_date=reportDate;
+        return Model.newSuccess(msReportService.getByReportReportDate(reportDate));
+    }
 }