凌云集团更改公司

whepi-ui/templates/user/returnWork.ftl

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

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

@@ -73,6 +73,9 @@ 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")
     MsReport selectMsReportToday(@Param("userId") Long userId);
 
+    @Select("select * from ms_report where user_create=#{userId} and ms_status = 2 and report_status=1 order by report_date desc limit 3")
+    List<MsReport> selectMsReportThereError(@Param("userId") Long userId);
+
     /**
      * 最近15天确诊,疑似,密切接触者
      * @param userId
@@ -81,4 +84,20 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     @Select("select * from ms_report where report_status=1 and report_date > date_sub(curdate(),interval 15 day) and ms_status=2 and user_create=#{userId}")
     List<MsReport> queryMsReportBySure(@Param("userId") Long userId);
 
+    /**
+     * 最近是否填过确诊,疑似,密切接触者
+     * @param userId
+     * @return
+     */
+    @Select("select a.* from ms_report a LEFT JOIN ms_suspected b on a.report_id=b.report_id where a.report_status=1 and b.medical in (1,2,3) and a.user_create=#{userId}")
+    List<MsReport> queryMsReportIsXG(@Param("userId") Long userId);
+
+    /**
+     * 最近状态 0无,1确诊,2疑似,3密切接触者,4解除隔离
+     * @param userId
+     * @return
+     */
+    @Select("select b.medical from ms_report a LEFT JOIN ms_suspected b on a.report_id=b.report_id where a.report_status=1 and a.user_create=#{userId} ORDER BY report_date desc LIMIT 1")
+    Integer queryLateStatus(@Param("userId") Long userId);
+
 }

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

@@ -149,15 +149,28 @@ public class ScanAdminController {
     public Model<List<UptownDoor>> scanQrImg(HttpParameterParser parser, PageDb pagination) throws IOException, WriterException {
         List<UptownDoor> list = uptownDoorMapper.getAllUptownDoor(pagination, parser.getMap());
         for (UptownDoor door : list) {
-            if (door.getInImg().equals("")) {
-                String img = scan_qr(door.getDoorId(),1,door.getUptownName()+door.getDoorName()+getName(1));
-                uptownDoorMapper.updateDoorQc("in_img", img, door.getDoorId());
-                door.setInImg(img);
-            }
-            if (door.getOutImg().equals("")) {
-                String img = scan_qr(door.getDoorId(),2,door.getUptownName()+door.getDoorName()+getName(2));
-                uptownDoorMapper.updateDoorQc("out_img", img, door.getDoorId());
-                door.setOutImg(img);
+            if (door.getUptownId() == 1238790987234L || door.getUptownId() == 5) {
+                if (door.getInImg().equals("")) {
+                    String img = scan_qr(door.getDoorId(),1,door.getDoorName()+getName(1));
+                    uptownDoorMapper.updateDoorQc("in_img", img, door.getDoorId());
+                    door.setInImg(img);
+                }
+                if (door.getOutImg().equals("")) {
+                    String img = scan_qr(door.getDoorId(),2, door.getDoorName()+getName(2));
+                    uptownDoorMapper.updateDoorQc("out_img", img, door.getDoorId());
+                    door.setOutImg(img);
+                }
+            } else {
+                if (door.getInImg().equals("")) {
+                    String img = scan_qr(door.getDoorId(),1,door.getUptownName()+door.getDoorName()+getName(1));
+                    uptownDoorMapper.updateDoorQc("in_img", img, door.getDoorId());
+                    door.setInImg(img);
+                }
+                if (door.getOutImg().equals("")) {
+                    String img = scan_qr(door.getDoorId(),2,door.getUptownName()+door.getDoorName()+getName(2));
+                    uptownDoorMapper.updateDoorQc("out_img", img, door.getDoorId());
+                    door.setOutImg(img);
+                }
             }
         }
         return Model.newSuccess(pagination, list);

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

@@ -135,6 +135,17 @@ public class ScanController {
                     }
                 }
                 if (ly) {
+                    List<MsReport> msReports1 = msReportMapper.queryMsReportIsXG(userOpen.getUserId());
+                    if (msReports1.size() != 0) {
+                        Integer status = msReportMapper.queryLateStatus(userOpen.getUserId());
+                        if (status != 4) {
+                            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> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                     if (msReports.size() == 0) {
                         model.put("collor", "red");
@@ -149,19 +160,11 @@ public class ScanController {
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         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) {
+                    List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userOpen.getUserId());
+                    if (msReports2.size() > 0) {
                         model.put("collor", "red");
                         model.put("into", "禁止通行");
-                        model.put("errorMsg", "由于您新冠确诊、新冠疑似、密切接触者、健康异常，评估正常未满15日隔离规定，禁止进入。");
+                        model.put("errorMsg", "由于您健康或家人健康评估存在问题，禁止进入，如有疑问请联系直管领导。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -403,33 +406,43 @@ public class ScanController {
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
             model.put("uptownId", unit.getUptownId());
             if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
-                model.put("tittle", "凌云");
+                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> msReports1 = msReportMapper.queryMsReportIsXG(userOpen.getUserId());
+                if (msReports1.size() != 0) {
+                    Integer status = msReportMapper.queryLateStatus(userOpen.getUserId());
+                    if (status != 4) {
+                        model.put("collor", "red");
+                        model.put("into", "不可复工");
+                        model.put("errorMsg", "由于您是新冠确诊或新冠疑似或密切接触者，评估未解除隔离规定，禁止进入。");
+                        return new ModelAndView("/user/returnWork.ftl", model);
+                    }
+                }
                 List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
                 if (msReports.size() == 0) {
                     model.put("collor", "red");
-                    model.put("into", "禁止进入");
+                    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("into", "不可复工");
                     model.put("errorMsg", "您最近三日健康日报漏报，请说明原因并及时填报，配合监测人员。");
                     return new ModelAndView("/user/returnWork.ftl", model);
                 }
-                List<MsReport> msReports1 = msReportMapper.queryMsReportBySure(userOpen.getUserId());
-                if (msReports1.size() > 0) {
+                List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userOpen.getUserId());
+                if (msReports2.size() > 0) {
                     model.put("collor", "red");
-                    model.put("into", "禁止通行");
-                    model.put("errorMsg", "由于您新冠确诊、新冠疑似、密切接触者、健康异常，评估正常未满15日隔离规定，禁止进入。");
+                    model.put("into", "不可复工");
+                    model.put("errorMsg", "由于您健康或家人健康评估存在问题，禁止进入，如有疑问请联系直管领导。");
                     return new ModelAndView("/user/returnWork.ftl", model);
                 }
                 model.put("collor", "green");
-                model.put("into", "允许进入");
-                model.put("errorMsg", "欢迎归来，请注意遵守疫情期间工作安全规则，做好防护，安全工作，健康第一。");
+                model.put("into", "允许复工");
+                model.put("errorMsg", "欢迎您归来，请注意遵守抗击疫情期间工作安全规定，做好健康防护，安全工作，健康第一。");
                 return new ModelAndView("/user/returnWork.ftl", model);
                 //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
             } else {