|
|
@@ -96,7 +96,7 @@ public class ScanController {
|
|
|
List<UptownHome> uptownHomes = uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
|
|
|
UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
|
|
|
if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
|
|
|
- model.put("tittle", "凌云");
|
|
|
+ model.put("tittle", "凌云集团");
|
|
|
ly = true;
|
|
|
}
|
|
|
if (ly) {
|
|
|
@@ -140,7 +140,7 @@ public class ScanController {
|
|
|
Integer status = msReportMapper.queryLateStatus(userOpen.getUserId());
|
|
|
if (status != 4) {
|
|
|
model.put("collor", "red");
|
|
|
- model.put("into", "禁止通行");
|
|
|
+ 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);
|
|
|
@@ -149,13 +149,13 @@ public class ScanController {
|
|
|
List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
|
|
|
if (msReports.size() == 0) {
|
|
|
model.put("collor", "red");
|
|
|
- model.put("into", "禁止进入");
|
|
|
+ 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) {
|
|
|
model.put("collor", "red");
|
|
|
- model.put("into", "禁止进入");
|
|
|
+ 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);
|
|
|
@@ -163,7 +163,7 @@ public class ScanController {
|
|
|
List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userOpen.getUserId());
|
|
|
if (msReports2.size() > 0) {
|
|
|
model.put("collor", "red");
|
|
|
- model.put("into", "禁止通行");
|
|
|
+ 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);
|
peiguo