Merge remote-tracking branch 'origin/master'

whepi-ui/templates/user/returnWork.ftl

@@ -0,0 +1,36 @@
+<#assign title="${tittle!''}电子出入许可证"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="weui-tab">
+    <div class="weui-tab__bd">
+        <div class="weui-tab__bd-item weui-tab__bd-item--active">
+            <div class="page__bd">
+                <header class="user-header">
+                    <br/>
+                    <br/>
+                    <#if (uptownId??) && (uptownId == 1238790987234 || uptownId == 5 )>
+                        <img class="user-title" style="height: 60px;width: 70px;" id="qr" src="/ly.png"/>
+                    </#if>
+                    <p class="user-title-long">${doorplate!''}</p>
+                    <br/>
+                    <p class="user-title-long">${name!''}</p>
+                    <br/>
+                    <h1 class="user-title-big ${collor!''}">${into!""}</h1>
+                    <br/>
+                    <br/>
+                    <p class="user-title-long">${errorMsg!""}</p>
+                    <br/>
+                    <br/>
+                </header>
+                <br/>
+                <br/>
+                <p class="user-title-long">${now!''}</p>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+</body>
+<#include "/home/frag.foot.ftl" />
+<script>
+</script>

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -130,24 +130,29 @@ public class WxController {
                                 "/user/home.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
-
-//        val btnDesc = new WxMenuButton();
-//        btnDesc.setName("平台简介");
-//        btnDesc.setType(WxConsts.MenuButtonType.VIEW);
-//        btnDesc.setUrl(
-//                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
-//                                "/home/desc.html",
-//                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
-//        );
-
         val bt2 = new WxMenuButton();
-        bt2.setName("外出查询");
-        bt2.setType(WxConsts.MenuButtonType.VIEW);
-        bt2.setUrl(
+        bt2.setName("相关查询");
+        val bt21 = new WxMenuButton();
+        bt21.setName("外出查询");
+        bt21.setType(WxConsts.MenuButtonType.VIEW);
+        bt21.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
                                 "/user/goOut.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
+        val bt22 = new WxMenuButton();
+        bt22.setName("复工查询");
+        bt22.setType(WxConsts.MenuButtonType.VIEW);
+        bt22.setUrl(
+                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
+                                "/user/returnWork.html",
+                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
+        );
+        bt2.getSubButtons().add(bt21);
+        bt2.getSubButtons().add(bt22);
+
+
+
 
         val btnDesc = new WxMenuButton();
         btnDesc.setName("平台简介");

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

@@ -130,13 +130,9 @@ public class ScanController {
                         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, "");
+                        return new ModelAndView("/user/scan.ftl", model);
                     }
-                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
-                    return new ModelAndView("/user/scan.ftl", model);
                 }
                 if (ly) {
                     List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
@@ -165,12 +161,16 @@ public class ScanController {
                     if (msReports1.size() > 0) {
                         model.put("collor", "red");
                         model.put("into", "禁止通行");
-                        model.put("errorMsg", "由于您新冠确诊、新冠疑似、密切接触者，评估正常未满15日隔离规定，禁止进入。");
+                        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日，禁止进入。
-
+                    model.put("collor", "green");
+                    model.put("into", "允许进入");
+                    model.put("errorMsg", "欢迎归来，请注意遵守疫情期间工作安全规则，做好防护，安全工作，健康第一。");
+                    scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
+                    return new ModelAndView("/user/scan.ftl", model);
                 }
             }
             if (inType == 2) {
@@ -325,8 +325,8 @@ public class ScanController {
     public ModelAndView goOut(HttpServletRequest request, ModelMap model) throws ParseException {
         UserOpen userOpen = homeService.getUserOpen();
         List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
-//        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1234L);
+//        UserOpen userOpen = userOpenMapper.selectByUserId(1234L);
         model.put("user", userOpen);
         model.put("user_id", "\"" + userOpen.getUserId() + "\"");
         if (list.size() == 0) {
@@ -334,50 +334,109 @@ public class ScanController {
         } else {
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
-            model.put("doorplate", unit.getUptownName() + "小区" +unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
-            model.put("name", uptownHomes.get(0).getLinkman());
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            model.put("now", sdf.format(new Date()));
-            OutUser outUser = outUserMapper.getOutUserByPhone(uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
-            if (outUser != null) {
+            if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+                model.put("into", "此功能暂位开放");
+                model.put("errorMsg", "外出请佩戴口罩，避免近距离接触，不得长时间在外逗留。");
+                return  new ModelAndView("/user/goOut.ftl", model);
+            } else {
+                model.put("doorplate", unit.getUptownName() + "小区" +unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate() + "号");
+                model.put("name", uptownHomes.get(0).getLinkman());
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                model.put("now", sdf.format(new Date()));
+                OutUser outUser = outUserMapper.getOutUserByPhone(uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
+                if (outUser != null) {
+                    model.put("collor", "green");
+                    model.put("into", "允许外出");
+                    model.put("errorMsg", "外出请佩戴口罩，避免近距离接触，保生产同时注意自身安全。");
+                    return new ModelAndView("/user/goOut.ftl", model);
+                }
+                OutScanConf outScanConf = outScanConfMapper.getOutScanConfByUptown(unit.getUptownId());
+                if (outScanConf.getGoOutFre() == 0) {
+                    model.put("collor", "red");
+                    model.put("into", "禁止外出");
+                    model.put("errorMsg", "根据武汉市小区封闭管理规定，非特殊人员禁止出行！");
+                    return new ModelAndView("/user/goOut.ftl", model);
+                }
+                List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
+                if (msReports.size() == 0) {
+                    model.put("collor", "red");
+                    model.put("into", "禁止外出");
+                    model.put("errorMsg", "您近期未提交健康日报，无法判断您健康状态，请提交健康日报。");
+                    return new ModelAndView("/user/goOut.ftl", model);
+                }
+                MsReport msReport = msReportMapper.selectMsReportToday(userOpen.getUserId());
+                if (msReport != null && msReport.getMsStatus() == 2) {
+                    model.put("collor", "red");
+                    model.put("into", "禁止外出");
+                    model.put("errorMsg", "健康日报提示您存在健康问题，禁止外出，请配合。");
+                    return new ModelAndView("/user/goOut.ftl", model);
+                }
+                OutScan outScan = outScanMapper.getOutScanThreeday(userOpen.getUserId(), 2, outScanConf.getGoOutFre());
+                if (outScan != null) {
+                    model.put("collor", "red");
+                    model.put("into", "禁止外出");
+                    model.put("errorMsg", "您今日健康状态评估正常，最近可外出时间"+sdf.format(new Date(outScan.getDayDate().getTime() + 1000L  *3600*24 * outScanConf.getGoOutFre()))+
+                            "，距今日还差"+differentDays(outScan.getDayDate(), sdf.parse(sdf.format(new Date())), outScanConf.getGoOutFre())+"天。");
+                    return new ModelAndView("/user/goOut.ftl", model);
+                }
                 model.put("collor", "green");
                 model.put("into", "允许外出");
-                model.put("errorMsg", "外出请佩戴口罩，避免近距离接触，保生产同时注意自身安全。");
+                model.put("errorMsg", "外出请佩戴口罩，避免近距离接触，不得长时间在外逗留。");
                 return new ModelAndView("/user/goOut.ftl", model);
             }
-            OutScanConf outScanConf = outScanConfMapper.getOutScanConfByUptown(unit.getUptownId());
-            if (outScanConf.getGoOutFre() == 0) {
-                model.put("collor", "red");
-                model.put("into", "禁止外出");
-                model.put("errorMsg", "根据武汉市小区封闭管理规定，非特殊人员禁止出行！");
-                return new ModelAndView("/user/goOut.ftl", model);
-            }
-            List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
-            if (msReports.size() == 0) {
-                model.put("collor", "red");
-                model.put("into", "禁止外出");
-                model.put("errorMsg", "您近期未提交健康日报，无法判断您健康状态，请提交健康日报。");
-                return new ModelAndView("/user/goOut.ftl", model);
-            }
-            MsReport msReport = msReportMapper.selectMsReportToday(userOpen.getUserId());
-            if (msReport != null && msReport.getMsStatus() == 2) {
-                model.put("collor", "red");
-                model.put("into", "禁止外出");
-                model.put("errorMsg", "健康日报提示您存在健康问题，禁止外出，请配合。");
-                return new ModelAndView("/user/goOut.ftl", model);
-            }
-            OutScan outScan = outScanMapper.getOutScanThreeday(userOpen.getUserId(), 2, outScanConf.getGoOutFre());
-            if (outScan != null) {
-                model.put("collor", "red");
-                model.put("into", "禁止外出");
-                model.put("errorMsg", "您今日健康状态评估正常，最近可外出时间"+sdf.format(new Date(outScan.getDayDate().getTime() + 1000L  *3600*24 * outScanConf.getGoOutFre()))+
-                        "，距今日还差"+differentDays(outScan.getDayDate(), sdf.parse(sdf.format(new Date())), outScanConf.getGoOutFre())+"天。");
-                return new ModelAndView("/user/goOut.ftl", model);
+        }
+    }
+
+    @ApiOperation("复工查询")
+    @GetMapping("/user/returnWork.html")
+    public ModelAndView returnWork(HttpServletRequest request, ModelMap model) throws ParseException {
+        UserOpen userOpen = homeService.getUserOpen();
+        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1234L);
+//        UserOpen userOpen = userOpenMapper.selectByUserId(1234L);
+        model.put("user", userOpen);
+        model.put("user_id", "\"" + userOpen.getUserId() + "\"");
+        if (list.size() == 0) {
+            return new ModelAndView("/user/home.ftl", model);
+        } else {
+            List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
+            UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
+            model.put("uptownId", unit.getUptownId());
+            if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
+                model.put("tittle", "凌云");
+                model.put("doorplate", unit.getRidgepole() + unit.getUnit());
+                model.put("name", uptownHomes.get(0).getLinkman());
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                model.put("now", sdf.format(new Date()));
+                List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
+                if (msReports.size() == 0) {
+                    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", "您最近三日健康日报漏报，请说明原因并及时填报，配合监测人员。");
+                    return new ModelAndView("/user/returnWork.ftl", model);
+                }
+                List<MsReport> msReports1 = msReportMapper.queryMsReportBySure(userOpen.getUserId());
+                if (msReports1.size() > 0) {
+                    model.put("collor", "red");
+                    model.put("into", "禁止通行");
+                    model.put("errorMsg", "由于您新冠确诊、新冠疑似、密切接触者、健康异常，评估正常未满15日隔离规定，禁止进入。");
+                    return new ModelAndView("/user/returnWork.ftl", model);
+                }
+                model.put("collor", "green");
+                model.put("into", "允许进入");
+                model.put("errorMsg", "欢迎归来，请注意遵守疫情期间工作安全规则，做好防护，安全工作，健康第一。");
+                return new ModelAndView("/user/returnWork.ftl", model);
+                //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
+            } else {
+                model.put("into", "此功能暂位开放");
+                model.put("errorMsg", "复工期间请请注意安全。");
+                return  new ModelAndView("/user/returnWork.ftl", model);
             }
-            model.put("collor", "green");
-            model.put("into", "允许外出");
-            model.put("errorMsg", "外出请佩戴口罩，避免近距离接触，不得长时间在外逗留。");
-            return new ModelAndView("/user/goOut.ftl", model);
         }
     }