凌云集团更改公司

whepi-ui/templates/user/scan.ftl

@@ -26,7 +26,7 @@
                 </header>
                 <br/>
                 <br/>
-                <p class="user-title-long">${now!''}</p>
+                <p class="user-title-long ${collor2!''}">${now!''}</p>
             </div>
         </div>
     </div>

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

@@ -142,8 +142,9 @@ public class ScanController {
                         Integer status = msReportMapper.queryLateStatus(userOpen.getUserId());
                         if (status != 4) {
                             model.put("collor", "red");
+                            model.put("collor2", "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);
                         }
@@ -153,6 +154,7 @@ public class ScanController {
                         List<MsReport> msReports2 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
                         if (msReports2.size() < 15) {
                             model.put("collor", "red");
+                            model.put("collor2", "red");
                             model.put("into", "不许进入");
                             model.put("errorMsg", "您返回工作驻地后未满14日，不许进入。"+day15(msReports2, returnWork)+"起方可进入！");
                             scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
@@ -162,6 +164,7 @@ public class ScanController {
                     List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                     if (msReports.size() < 3) {
                         model.put("collor", "red");
+                        model.put("collor2", "red");
                         model.put("into", "不许进入");
                         model.put("errorMsg", "您最近三日健康日报漏报，不许进入，请说明原因并及时填报，配合监测人员。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
@@ -170,6 +173,7 @@ public class ScanController {
                     List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userOpen.getUserId());
                     if (msReports2.size() > 0) {
                         model.put("collor", "red");
+                        model.put("collor2", "red");
                         model.put("into", "不许进入");
                         model.put("errorMsg", "由于近期您健康评估存在问题，不许进入，如有疑问请联系直管领导。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
@@ -177,6 +181,7 @@ public class ScanController {
                     }
                     //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
                     model.put("collor", "green");
+                    model.put("collor2", "green");
                     model.put("into", "允许进入");
                     model.put("errorMsg", "欢迎归来，请注意遵守疫情期间工作安全规则，做好防护，安全工作，健康第一。");
                     scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
@@ -423,8 +428,9 @@ public class ScanController {
                     Integer status = msReportMapper.queryLateStatus(userOpen.getUserId());
                     if (status != 4) {
                         model.put("collor", "red");
+                        model.put("collor2", "red");
                         model.put("into", "不可复工");
-                        model.put("errorMsg", "由于您是新冠确诊或新冠疑似或密切接触者，评估未解除隔离规定，禁止进入。");
+                        model.put("errorMsg", "由于近期您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                         return new ModelAndView("/user/returnWork.ftl", model);
                     }
                 }
@@ -433,6 +439,7 @@ public class ScanController {
                     List<MsReport> msReports2 = msReportMapper.returnWorkTime(returnWork, userOpen.getUserId());
                     if (msReports2.size() < 15) {
                         model.put("collor", "red");
+                        model.put("collor2", "red");
                         model.put("into", "不可复工");
                         model.put("errorMsg", "您返回工作驻地后未满14日，不可复工。"+day15(msReports2, returnWork)+"起方可进入！");
                         return new ModelAndView("/user/returnWork.ftl", model);
@@ -441,6 +448,7 @@ public class ScanController {
                 List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                 if (msReports.size() < 3) {
                     model.put("collor", "red");
+                    model.put("collor2", "red");
                     model.put("into", "不可复工");
                     model.put("errorMsg", "由于您近3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
                     return new ModelAndView("/user/returnWork.ftl", model);
@@ -448,11 +456,13 @@ public class ScanController {
                 List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userOpen.getUserId());
                 if (msReports2.size() > 0) {
                     model.put("collor", "red");
+                    model.put("collor2", "red");
                     model.put("into", "不可复工");
                     model.put("errorMsg", "由于近期您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                     return new ModelAndView("/user/returnWork.ftl", model);
                 }
                 model.put("collor", "green");
+                model.put("collor2", "green");
                 model.put("into", "允许复工");
                 model.put("errorMsg", "欢迎您归来，请注意遵守抗击疫情期间工作安全规定，做好健康防护，安全工作，健康第一。");
                 return new ModelAndView("/user/returnWork.ftl", model);