Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/ribao.js

@@ -1509,9 +1509,9 @@ function helpValue1(v) {
       tripDet = "出行详细：" + v.tripDet + "；"
   }
 
-  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 15vh">\n' +
+  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 20vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + workLocal + todayLocal + isTrip + tripDet + '</p>\n' +
+    '                                      <div class="weui-media-box__desc" 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/MsTripService.java

@@ -229,6 +229,15 @@ public class MsTripService {
                 msTrip.setTodayLocal(todayLocal);
                 msTrip.setIsTrip(isTrip);
                 msTripMapper.updateById(msTrip);
+            } else {
+                msTrip = new MsTrip();
+                msTrip.setTripId(suspectedId);
+                msTrip.setIsTrip(isTrip);
+                msTrip.setTodayLocal(todayLocal);
+                msTrip.setTodayLocalOther(todayLocalOther);
+                msTrip.setWorkLocal(workLocal);
+                msTrip.setWorkLocalOther(workLocalOther);
+                msTripMapper.insert(msTrip);
             }
             //删除行程详细
             msTripDetMapper.deleteByTripId(suspectedId);