xielianghe

whepi-ui/templates/home/ribao.js

@@ -1244,6 +1244,7 @@ function ribaoCommit() {
     contentType: "application/json; charset=utf-8",
     data: JSON.stringify(data),
     success: function (data) {
+
       if (data.msgReport == "2") {
         cantijiao = true;
         $.toast("家人姓名不能重复，如果重复，可以带上称呼");
@@ -1264,8 +1265,6 @@ function ribaoCommit() {
       cantijiao = true
       $('#ribao_jinrijujian').empty();
       $('#ribao_jinrijujian').append(data.safetyNum);
-
-      ribao_refrash();
       //修改
       var uptownId = $("#uptownId").val();
       //是凌云
@@ -1304,7 +1303,9 @@ function ribaoCommit() {
         $('#txt_shangbao').empty();
         $('#txt_shangbao').append("今日未上报");
         $('#txt_shangbaotime').empty();
+        // $.toast("请点击上报");
       }
+      ribao_refrash();
       clearShow();
     },
   });

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

@@ -207,7 +207,7 @@ public class MsReportService {
                     if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
                         //上一天的上报记录.3天内
                         List<MsSuspected> listSuspected1 = msSuspectedMapper.selectNext3Suspected(userCreate);
-                        if (listSuspected1 != null && listSuspected1.size() > 0) {
+                        if (listSuspected1 != null && listSuspected1.size() == 1) {
                             if (listSuspected1.get(0).getTodayLocal() != 0 && msSuspected.getTodayLocal() != 0) {
                                 if (listSuspected1.get(0).getTodayLocalOther() != msSuspected.getTodayLocalOther() && listSuspected1.get(0).getTodayLocal() != msSuspected.getTodayLocal() && msSuspected.getIsTrip() == 0) {
                                     return 4;