Browse Source

凌云集团更改公司

peiguo 5 years ago
parent
commit
e7dd6fdbfd

BIN
whepi-ui/ly.png


+ 1 - 1
whepi-ui/templates/user/scan.ftl

@@ -1,4 +1,4 @@
-<#assign title="电子出入许可证"/>
+<#assign title="${tittle!''}电子出入许可证"/>
 <#include "/home/frag.head.ftl" />
 <#include "/home/frag.head.ftl" />
 
 
 <div class="weui-tab">
 <div class="weui-tab">

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

@@ -67,4 +67,12 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     @Select("select * from ms_report where user_create=#{userId} and report_status=1 order by report_date desc limit 1")
     @Select("select * from ms_report where user_create=#{userId} and report_status=1 order by report_date desc limit 1")
     MsReport selectMsReportToday(@Param("userId") Long userId);
     MsReport selectMsReportToday(@Param("userId") Long userId);
 
 
+    /**
+     * 最近15天确诊
+     * @param userId
+     * @return
+     */
+    @Select("select * from ms_report where report_status=1 and report_date > date_sub(curdate(),interval 15 day) and sure_num > 0 and user_create=#{userId}")
+    List<MsReport> queryMsReportBySure(@Param("userId") Long userId);
+
 }
 }

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

@@ -91,11 +91,20 @@ public class ScanController {
         if (list.size() == 0) {
         if (list.size() == 0) {
             return new ModelAndView("/user/home.ftl", model);
             return new ModelAndView("/user/home.ftl", model);
         } else {
         } else {
+            Boolean ly = false;
             UptownDoor uptownDoor = uptownDoorMapper.getUptownDoorById(doorId);
             UptownDoor uptownDoor = uptownDoorMapper.getUptownDoorById(doorId);
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
-            model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
-            model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
+            if (unit.getUptownId() == 1238790987234L) {
+                model.put("tittle", "凌云");
+                ly = true;
+            }
+            if (ly) {
+                model.put("doorplate", unit.getRidgepole() + unit.getUnit());
+            } else {
+                model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
+                model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
+            }
             model.put("name", uptownHomes.get(0).getLinkman());
             model.put("name", uptownHomes.get(0).getLinkman());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             model.put("now", sdf.format(new Date()));
             model.put("now", sdf.format(new Date()));
@@ -117,12 +126,52 @@ public class ScanController {
             if (inType == 1) {
             if (inType == 1) {
                 OutScan outScan = outScanMapper.getOutScanByUserlimit(userOpen.getUserId());
                 OutScan outScan = outScanMapper.getOutScanByUserlimit(userOpen.getUserId());
                 if (outScan != null && new Date(outScan.getDate().getMillis() + 3600L * 1000 * 24).compareTo(new Date()) == -1) {
                 if (outScan != null && new Date(outScan.getDate().getMillis() + 3600L * 1000 * 24).compareTo(new Date()) == -1) {
-                    model.put("collor", "orange");
-                    model.put("into", "允许进入");
-                    model.put("errorMsg", "您在外驻留时间超过1日,请尽快上报您的健康状况,防止在外长时间逗留。");
+                    if (!ly) {
+                        model.put("collor", "orange");
+                        model.put("into", "允许进入");
+                        model.put("errorMsg", "您在外驻留时间超过1日,请尽快上报您的健康状况,防止在外长时间逗留。");
+                    } else {
+                        model.put("collor", "orange");
+                        model.put("into", "允许进入");
+                        model.put("errorMsg", "欢迎归来,请注意遵守疫情期间工作安全规则,做好防护,安全工作,健康第一。");
+                    }
                     scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                     scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                     return new ModelAndView("/user/scan.ftl", model);
                     return new ModelAndView("/user/scan.ftl", model);
                 }
                 }
+                if (ly) {
+                    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) {
+                        model.put("collor", "orange");
+                        model.put("into", "可以" + getMsg(inType));
+                        model.put("errorMsg", "您最近三日健康日报漏报,请说明原因并及时填报,配合监测人员。");
+                        scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
+                        return new ModelAndView("/user/scan.ftl", model);
+                    }
+                    MsReport msReport = msReportMapper.selectMsReportToday(userOpen.getUserId());
+                    if (msReport != null && msReport.getMsStatus() == 2) {
+                        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);
+                    }
+                    List<MsReport> msReports1 = msReportMapper.queryMsReportBySure(userOpen.getUserId());
+                    if (msReports1.size() > 0) {
+                        model.put("collor", "red");
+                        model.put("into", "禁止通行");
+                        model.put("errorMsg", "由于您或家人曾确诊患冠状病毒肺炎,评估正常未满15日隔离规定,禁止进入。");
+                        scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+                        return new ModelAndView("/user/scan.ftl", model);
+                    }
+                    //您近期内离开过工作单位驻地,请遵守返回工作驻地15日隔离规定,您目前未满15日,禁止进入。
+
+                }
             }
             }
             if (inType == 2) {
             if (inType == 2) {
                 OutUser outUser = outUserMapper.getOutUserByPhone(uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
                 OutUser outUser = outUserMapper.getOutUserByPhone(uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));