Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -46,6 +46,7 @@
     var xiaoquId = '1238790987234'; //1238790987234
     var ceshixiaoquId = '5';
     var canSahngbao = true;
+    var cantijiao = true;
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
     (function ($) {

whepi-ui/templates/home/ribao.js

@@ -1006,6 +1006,10 @@ function ribao_cancel() {
 }
 
 function ribaoCommit() {
+  if (cantijiao==false) {
+    return
+  }
+  cantijiao==false
   var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
   if (listcx.length == 0 && sf == 1) {
     $.alert("请添加出行");
@@ -1227,7 +1231,6 @@ function ribaoCommit() {
       }
       $('#ribao_jinrijujian').empty();
       $('#ribao_jinrijujian').append(data.safetyNum);
-
       ribao_refrash();
 
       clearShow();
@@ -1258,6 +1261,7 @@ function deleteSuspected(suspectedId) {
       document.getElementById("txt_shangbao").style['color'] = "red";
       $('#txt_shangbao').empty();
       $('#txt_shangbao').append("今日未上报");
+      $('#txt_shangbaotime').empty();
       ribao_refrash();
     },
   });
@@ -1474,7 +1478,7 @@ function addReport() {
         document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
         document.getElementById("txt_shangbaotime").style['color'] = "#0bb20c";
         $('#txt_shangbao').empty();
-        $('#txt_shangbao').append("今日已上报" );
+        $('#txt_shangbao').append("今日已上报");
         $('#txt_shangbaotime').empty();
         $('#txt_shangbaotime').append("上报时间：" + time);
       }

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

@@ -139,8 +139,8 @@ public class ScanController {
                 }
                 if (ly) {
                     MsReport msReport = msReportMapper.queryMsReportIsXG(userOpen.getUserId());
+                    SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
                     if (msReport != null) {
-                        SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
                         List<MsReport> msReports1 = msReportMapper.queryLateStatus(userOpen.getUserId(), s.format(msReport.getReportDate()));
                         if (msReports1.size() == 0) {
                             model.put("collor", "red");
@@ -172,11 +172,17 @@ public class ScanController {
                     String returnWork = msReportMapper.returnWork(userOpen.getUserId());
                     if (returnWork != null) {
                         List<MsReport> msReports3 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
-                        if (msReports3.size() < 15) {
+                        Date date = null;
+                        if (msReports3.size() != 0) {
+                            date = msReports3.get(0).getReportDate();
+                        } else {
+                            date = s.parse(returnWork);
+                        }
+                        if (s.parse(returnWork).getTime() + 1000L * 3600 * 15 > date.getTime()) {
                             model.put("collor", "red");
                             model.put("collor2", "red");
                             model.put("into", "不许进入");
-                            model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports3, returnWork)+"起方可进入！");
+                            model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(s.parse(returnWork))+"起方可进入！");
                             scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                             return new ModelAndView("/user/scan.ftl", model);
                         }
@@ -185,7 +191,7 @@ public class ScanController {
                     model.put("collor", "green");
                     model.put("collor2", "green");
                     model.put("into", "允许进入");
-                    model.put("errorMsg", "欢迎归来，请注意遵守疫情期间工作安全规则，做好防护，安全工作，健康第一。");
+                    model.put("errorMsg", "欢迎您归来，请注意遵守抗击疫情期间工作安全规定，做好健康防护，安全工作，健康第一。");
                     scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                     return new ModelAndView("/user/scan.ftl", model);
                 }
@@ -424,10 +430,10 @@ public class ScanController {
                 model.put("doorplate", unit.getRidgepole() + unit.getUnit());
                 model.put("name", uptownHomes.get(0).getLinkman());
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
                 model.put("now", sdf.format(new Date()));
                 MsReport msReport = msReportMapper.queryMsReportIsXG(userOpen.getUserId());
                 if (msReport != null) {
-                    SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
                     List<MsReport> msReports1 = msReportMapper.queryLateStatus(userOpen.getUserId(), s.format(msReport.getReportDate()));
                     if (msReports1.size() == 0) {
                         model.put("collor", "red");
@@ -456,11 +462,17 @@ public class ScanController {
                 String returnWork = msReportMapper.returnWork(userOpen.getUserId());
                 if (returnWork != null) {
                     List<MsReport> msReports3 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
-                    if (msReports3.size() < 15) {
+                    Date date = null;
+                    if (msReports3.size() != 0) {
+                        date = msReports3.get(0).getReportDate();
+                    } else {
+                        date = s.parse(returnWork);
+                    }
+                    if (s.parse(returnWork).getTime() + 1000L * 3600 * 15 > date.getTime()) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不可复工");
-                        model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。"+day15(msReports3, returnWork)+"起方可进入！");
+                        model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。"+day15(s.parse(returnWork))+"起方可进入！");
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
                 }
@@ -523,6 +535,11 @@ public class ScanController {
         return time.substring(0, time.length() - 1);
     }
 
+    public String day15(Date returnWork) {
+        SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
+        return sdf.format(new Date(returnWork.getTime() + 1000L*3600*24*15));
+    }
+
     public String day15(List<MsReport> list, String returnWork) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
         Date time1 = null;