yuliang 5 years ago
parent
commit
fe7f27b026

+ 1 - 1
whepi-ui/templates/home/ribao.js

@@ -497,7 +497,7 @@ function addReport() {
       "userCreate": userId,
     },
     success: function (data) {
-      $.toast("操作成功");
+      $.toast(data.msg);
     },
   });
 }

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

@@ -5,6 +5,7 @@ import com.bofeng.entity.*;
 import com.bofeng.service.MsReportService;
 import com.bofeng.service.MsSuspectedService;
 import com.yvan.Model;
+import com.yvan.ModelOps;
 import com.yvan.mvc.Pd;
 import com.yvan.platform.Conv;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,10 +88,15 @@ public class MsReportController {
 
     //全家报平安
     @PostMapping("/home/addReport")
-    public Integer addReport(HttpServletRequest request) {
+    public ModelOps addReport(HttpServletRequest request) {
         Long userCreate = Long.parseLong(request.getParameter("userCreate"));
-        msReportService.addReport(userCreate);
-        return 1;
+        int re = msReportService.addReport(userCreate);
+        if (re == 1) {
+            return ModelOps.newSuccess();
+        } else if (re == 2) { //没有上报体温
+            return ModelOps.newFail("请填报今日体温!");
+        }
+        return ModelOps.newFail("上报错误");
     }
 
     //根据日期获取家人