凌云集团更改公司

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

@@ -101,6 +101,7 @@ public class ScanController {
             }
             if (ly) {
                 model.put("doorplate", unit.getRidgepole() + unit.getUnit());
+                model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
             } else {
                 model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
                 model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
@@ -158,16 +159,10 @@ public class ScanController {
                         }
                     }
                     List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
-                    if (msReports.size() == 0) {
-                        model.put("collor", "red");
-                        model.put("into", "不许进入");
-                        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) {
+                    if (msReports.size() < 3) {
                         model.put("collor", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "您最近三日健康日报漏报，请说明原因并及时填报，配合监测人员。");
+                        model.put("errorMsg", "您最近三日健康日报漏报，不许进入，请说明原因并及时填报，配合监测人员。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -175,7 +170,7 @@ public class ScanController {
                     if (msReports2.size() > 0) {
                         model.put("collor", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "由于您健康评估存在问题，不许进入，如有疑问请联系直管领导。");
+                        model.put("errorMsg", "由于近期您健康评估存在问题，不许进入，如有疑问请联系直管领导。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -443,22 +438,17 @@ public class ScanController {
                     }
                 }
                 List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
-                if (msReports.size() == 0) {
+                if (msReports.size() < 3) {
                     model.put("collor", "red");
                     model.put("into", "不可复工");
-                    model.put("errorMsg", "您最近三日未上报健康日报，请说明原因，配合监测人员。");
-                    return new ModelAndView("/user/returnWork.ftl", model);
-                } else if (msReports.size() < 3) {
-                    model.put("collor", "red");
-                    model.put("into", "不可复工");
-                    model.put("errorMsg", "您最近三日健康日报漏报，请说明原因并及时填报，配合监测人员。");
+                    model.put("errorMsg", "由于您近3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
                     return new ModelAndView("/user/returnWork.ftl", model);
                 }
                 List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userOpen.getUserId());
                 if (msReports2.size() > 0) {
                     model.put("collor", "red");
                     model.put("into", "不可复工");
-                    model.put("errorMsg", "由于您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
+                    model.put("errorMsg", "由于近期您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                     return new ModelAndView("/user/returnWork.ftl", model);
                 }
                 model.put("collor", "green");