凌云集团更改公司

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

@@ -68,11 +68,11 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     MsReport selectMsReportToday(@Param("userId") Long userId);
 
     /**
-     * 最近15天确诊
+     * 最近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}")
+    @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);
 
 }

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

@@ -84,8 +84,8 @@ public class ScanController {
                              @RequestParam(value = "inType", required = false, defaultValue = "0") Integer inType) {
         UserOpen userOpen = homeService.getUserOpenByCode(request.getParameter("code"));
         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) {
@@ -95,7 +95,7 @@ public class ScanController {
             UptownDoor uptownDoor = uptownDoorMapper.getUptownDoorById(doorId);
             List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
             UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
-            if (unit.getUptownId() == 1238790987234L) {
+            if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
                 model.put("tittle", "凌云");
                 ly = true;
             }
@@ -147,25 +147,25 @@ public class ScanController {
                         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", "由于您健康或家人健康评估存在问题，禁止进入，如有疑问请联系直管领导。");
+                        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);
                     }
+//                    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日隔离规定，禁止进入。");
+                        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);
                     }