xielianghe

whepi-ui/templates/home/home.ftl

@@ -62,7 +62,7 @@
         ribao_cancel();
 
         <#if msReport ??>var msReport = ${msReport}</#if>;
-        $('#ribao_safety_num').val(msReport.safetyNum);
+        $('#ribao_jinrijujian').append(msReport.safetyNum);
         ribaoInitialization(msReport.reportId);
         /*submit_back();*/
         familyClick();

whepi-ui/templates/home/ribao.ftl

@@ -16,12 +16,12 @@
                             <div class="weui-cell__hd">
                                 <label class="weui-label">今日居家</label>
                             </div>
-                            <div class="weui-cell__bd">
-                                <input id="ribao_safety_num" class="weui-input" type="number" pattern="[0-2]*" placeholder="请输入今日家庭成员数量">
+                            <div class="weui-cell__bd" id="ribao_jinrijujian">
+
                             </div>
                             <div class="weui-cell__ft">
                                 <a id="btnAdd" href="javascript:"
-                                   class="weui-btn weui-btn_mini weui-btn_primary">病情描述</a>
+                                   class="weui-btn weui-btn_mini weui-btn_primary">添加人员</a>
                             </div>
                         </div>
                     </div>
@@ -35,7 +35,7 @@
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！
                     </span></div>
                     <div class="weui-btn-area">
-                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" onclick="addReport()">全家报平安</a>
+                        <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" onclick="addReport()">上报</a>
                     </div>
                 </div>
                 <div id="ribao" class="weui-btn-area" style="display: none">

whepi-ui/templates/home/ribao.js

@@ -216,7 +216,7 @@ function ribaoInitialization(reportId) {
           ribao_cell(v);
         });
       } else {
-        $('#btn_shangbao').text('全家报平安');
+        $('#btn_shangbao').text('上报');
       }
     },
     error: function () {
@@ -336,7 +336,7 @@ function ribaoCommit() {
   var chest = $("#js_input_user_xiongmen").attr("data-values") == undefined ? 0 : $("#js_input_user_xiongmen").attr("data-values");
   var fatigue = $("#js_input_user_fali").attr("data-values") == undefined ? 0 : $("#js_input_user_fali").attr("data-values");
   var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
-  var diarrheaNum = $("#js_input_user_cishu").val()== "" ? 0 : $("#jibenmiaoshu").val();
+  var diarrheaNum = 0;
   var others = $("#shuruqita").val()== undefined ? "" : $("#jibenmiaoshu").val();
   $.ajax({
     url: '/home/addRibao',
@@ -356,7 +356,7 @@ function ribaoCommit() {
       "chest": chest,
       "fatigue": fatigue,
       "diarrhea": diarrhea,
-      "diarrheaNum": diarrheaNum,
+      "singleRoom": diarrheaNum,
       "others": others,
     },
     success: function (data) {
@@ -388,17 +388,11 @@ function deleteSuspected(suspectedId) {
 
 function addReport() {
   var userId = $("#userId").val();
-  var safety_num = $("#ribao_safety_num").val();
-  if (safety_num == "") {
-    alert("请填写居家人数");
-    return;
-  }
   $.ajax({
     url: '/home/addReport',
     type: "post",
     data: {
       "userCreate": userId,
-      "safetyNum": safety_num,
     },
     success: function (data) {
       $.toast("操作成功");

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

@@ -32,11 +32,11 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     Integer selectSingleRoomNum(@Param("reportId") Long reportId, @Param("singleRoom") Integer singleRoom);
 
     //正常
-    @Select("select count(*) from ms_suspected where report_id=#{reportId} and  36&lt;=#{temperature} and #{temperature}&lt;=37.3")
+    @Select("select count(*) from ms_suspected where report_id=#{reportId} and  36 &lt;= #{temperature} and #{temperature} &lt;= 37.3")
     Integer selectisSuspectedNum(@Param("reportId") Long reportId, @Param("temperature") BigDecimal temperature);
 
     //疑似
-    @Select("select count(*) from ms_suspected where report_id=#{reportId} and (#{temperature}&lt;36 or 37.3&lt;#{temperature})")
+    @Select("select count(*) from ms_suspected where report_id=#{reportId} and (#{temperature} &lt; 36 or 37.3 &lt; #{temperature})")
     Integer selectisNoSuspectedNum(@Param("reportId") Long reportId, @Param("temperature") BigDecimal temperature);
 
 }

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

@@ -60,8 +60,12 @@ public class MsReportService {
 
     //上报
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addReport(long reportId, Long userCreate) {
-        MsReport msReport = msReportMapper.selectById(reportId);
+    public void addReport(Long userCreate) {
+        Date t = new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+        String reportDate = df.format(t);
+        List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate, userCreate);
+        MsReport msReport = msReportMapper.selectById(Long.parseLong(listReport.get(0).getReportId().toString()));
         if (msReport != null) {
             msReport.setReportStatus(1);
             msReport.setUserUpdate(userCreate);

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

@@ -110,8 +110,7 @@ public class MsReportController {
     @PostMapping("/home/addReport")
     public Integer addReport(HttpServletRequest request) {
         Long userCreate = Long.parseLong(request.getParameter("userCreate"));
-        Long reportId = Long.parseLong(request.getParameter("reportId"));
-        msReportService.addReport(reportId, userCreate);
+        msReportService.addReport(userCreate);
         return 1;
     }