凌云集团更改公司

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -137,7 +137,9 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
             "union\n" +
             "select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 2 day) and user_create=#{userId}\n" +
             "union\n" +
-            "select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 3 day) and user_create=#{userId}")
+            "select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 3 day) and user_create=#{userId}\n" +
+            "union\n" +
+            "select * from ms_report where report_status=1 and report_date=curdate() and user_create=#{userId}")
     List<MsReport> selectMsReportLate(@Param("userId") Long userId);
 
     /**
@@ -151,7 +153,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
 
     @Select("select * from (select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 1 day) and user_create=#{userId}\n" +
             "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 2 day) and user_create=#{userId}\n" +
-            "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 3 day) and user_create=#{userId}) aa where aa.ms_status = 2")
+            "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 3 day) and user_create=#{userId} union select * from ms_report where report_status=1 and report_date=curdate() and user_create=#{userId}) aa where aa.ms_status = 2")
     List<MsReport> selectMsReportThereError(@Param("userId") Long userId);
 
     /**

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

@@ -185,11 +185,11 @@ public class ScanController {
                         }
                     }
                     List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
-                    if (msReports.size() < 3) {
+                    if (msReports.size() < 4) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "由于您近3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
+                        model.put("errorMsg", "由于您今日或前3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -254,11 +254,11 @@ public class ScanController {
                         }
                     }
                     List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
-                    if (msReports.size() < 3) {
+                    if (msReports.size() < 4) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "由于您近3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
+                        model.put("errorMsg", "由于您今日或前3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scanHC.ftl", model);
                     }
@@ -319,10 +319,10 @@ public class ScanController {
                     model.put("errorMsg", "您最近三日未上报健康日报，请说明原因，配合监测人员。");
                     scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                     return new ModelAndView("/user/scan.ftl", model);
-                } else if (msReports.size() < 3) {
+                } else if (msReports.size() < 4) {
                     model.put("collor", "orange");
                     model.put("into", "可以" + getMsg(inType));
-                    model.put("errorMsg", "您最近三日健康日报漏报，请说明原因并及时填报，配合监测人员。");
+                    model.put("errorMsg", "您今日或前3日未连续报告日报，请说明原因并及时填报，配合监测人员。");
                     scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                     return new ModelAndView("/user/scan.ftl", model);
                 }
@@ -381,7 +381,7 @@ public class ScanController {
                 return new ModelAndView("/user/scanEstate.ftl", model);
             }
             List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
-            if (msReports.size() != 3) {
+            if (msReports.size() != 4) {
                 model.put("collor", "red");
                 model.put("into", "禁止通行");
                 model.put("errorMsg", "您近期有漏报健康日报，无法判断您健康状态，请尽快返回住处。");
@@ -554,11 +554,11 @@ public class ScanController {
                 }
             }
             List<MsReport> msReports = msReportMapper.selectMsReportLate(userId);
-            if (msReports.size() < 3) {
+            if (msReports.size() < 4) {
                 model.put("collor", "red");
                 model.put("collor2", "red");
                 model.put("into", "不可复工");
-                model.put("errorMsg", "由于您近3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
+                model.put("errorMsg", "由于您今日或前3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
                 return new ModelAndView("/user/returnWork.ftl", model);
             }
             List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userId);
@@ -620,11 +620,11 @@ public class ScanController {
                 }
             }
             List<MsReport> msReports = msReportMapper.selectMsReportLate(userId);
-            if (msReports.size() < 3) {
+            if (msReports.size() < 4) {
                 model.put("collor", "red");
                 model.put("collor2", "red");
                 model.put("into", "不可复工");
-                model.put("errorMsg", "由于您近3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
+                model.put("errorMsg", "由于您今日或前3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
                 return new ModelAndView("/user/returnWorkHC.ftl", model);
             }
             List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userId);