|
@@ -189,7 +189,7 @@ public class ScanController {
|
|
|
model.put("collor", "red");
|
|
model.put("collor", "red");
|
|
|
model.put("collor2", "red");
|
|
model.put("collor2", "red");
|
|
|
model.put("into", "不许进入");
|
|
model.put("into", "不许进入");
|
|
|
- model.put("errorMsg", "由于您今日或前3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
|
|
|
|
|
|
|
+ model.put("errorMsg", "由于您今日和前3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
|
|
|
scanService.saveOutScan(userOpen.getUserId(), inType, coord, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
|
|
scanService.saveOutScan(userOpen.getUserId(), inType, coord, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
|
|
|
return new ModelAndView("/user/scan.ftl", model);
|
|
return new ModelAndView("/user/scan.ftl", model);
|
|
|
}
|
|
}
|
|
@@ -264,7 +264,7 @@ public class ScanController {
|
|
|
model.put("collor", "red");
|
|
model.put("collor", "red");
|
|
|
model.put("collor2", "red");
|
|
model.put("collor2", "red");
|
|
|
model.put("into", "不许进入");
|
|
model.put("into", "不许进入");
|
|
|
- model.put("errorMsg", "由于您今日或前3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
|
|
|
|
|
|
|
+ model.put("errorMsg", "由于您今日和前3日未连续报告日报，不许进入，如有疑问请联系直管领导。");
|
|
|
scanService.saveOutScan(userOpen.getUserId(), inType, coord, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
|
|
scanService.saveOutScan(userOpen.getUserId(), inType, coord, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
|
|
|
return new ModelAndView("/user/scanHC.ftl", model);
|
|
return new ModelAndView("/user/scanHC.ftl", model);
|
|
|
}
|
|
}
|
|
@@ -564,7 +564,7 @@ public class ScanController {
|
|
|
model.put("collor", "red");
|
|
model.put("collor", "red");
|
|
|
model.put("collor2", "red");
|
|
model.put("collor2", "red");
|
|
|
model.put("into", "不可复工");
|
|
model.put("into", "不可复工");
|
|
|
- model.put("errorMsg", "由于您今日或前3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
|
|
|
|
|
|
|
+ model.put("errorMsg", "由于您今日和前3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
|
|
|
return new ModelAndView("/user/returnWork.ftl", model);
|
|
return new ModelAndView("/user/returnWork.ftl", model);
|
|
|
}
|
|
}
|
|
|
List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userId);
|
|
List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userId);
|
|
@@ -630,7 +630,7 @@ public class ScanController {
|
|
|
model.put("collor", "red");
|
|
model.put("collor", "red");
|
|
|
model.put("collor2", "red");
|
|
model.put("collor2", "red");
|
|
|
model.put("into", "不可复工");
|
|
model.put("into", "不可复工");
|
|
|
- model.put("errorMsg", "由于您今日或前3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
|
|
|
|
|
|
|
+ model.put("errorMsg", "由于您今日和前3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
|
|
|
return new ModelAndView("/user/returnWorkHC.ftl", model);
|
|
return new ModelAndView("/user/returnWorkHC.ftl", model);
|
|
|
}
|
|
}
|
|
|
List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userId);
|
|
List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userId);
|
peiguo