xielianghe

whepi-ui/templates/home/ribao.js

@@ -1249,6 +1249,11 @@ function ribaoCommit() {
         $.toast("家人姓名不能重复，如果重复，可以带上称呼");
         return;
       }
+      // if (data.msgReport == "4") {
+      //   cantijiao = true;
+      //   $.toast("是否出行，请如实填写！");
+      //   return;
+      // }
       if ($('#ribao')[0].style.display == 'none') {
         $('#notOpenRibao').toggle();
         $('#ribao')[0].style.display = '';

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

@@ -147,7 +147,7 @@ public class MsTripService {
             msSuspectedMapper.insert(msSuspected);
 
             //添加出行
-            if(todayLocal>0 && workLocal>0){
+            if (todayLocal > 0 && workLocal > 0) {
                 MsTrip msTrip = new MsTrip();
                 msTrip.setTripId(msSuspected.getSuspectedId());
                 msTrip.setIsTrip(isTrip);
@@ -265,10 +265,13 @@ public class MsTripService {
             }
             //更新今日日报,直接上报
             msSuspectedService.updateReport(reportId, medical, singleRoom, temperature);
-            msReportService.addReport(userCreate);
+            Integer rezuitNum = msReportService.addReport(userCreate);
+            if (rezuitNum == 4)
+                reportId = 4L;
         }
         return reportId;
     }
+
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Integer deleteTrip(Long suspectedId) {
         msTripDetMapper.deleteByTripId(suspectedId);
@@ -279,7 +282,7 @@ public class MsTripService {
 
     //上报
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Integer addReportTest(Long userCreate,String reportDate) {
+    public Integer addReportTest(Long userCreate, String reportDate) {
         List<MsReport> listReport = msReportMapper.selectByReportDate(reportDate, userCreate);
         if (listReport == null || listReport.size() == 0)
             return 0;