凌云集团更改公司

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

@@ -156,6 +156,8 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
 //            "union select * from ms_report where report_status=1 and report_date=date_sub(curdate(),interval 3 day) and user_create=#{userId} union select * from ms_report where report_status=1 and report_date=curdate() and user_create=#{userId}) aa where aa.ms_status = 2")
     List<MsReport> selectMsReportThereError(@Param("userId") Long userId, @Param("reportDate") String reportDate);
 
+    List<MsReport> selectMsReportThereErrorFamily(@Param("userId") Long userId, @Param("reportDate") String reportDate);
+
     @Select("select * from ms_report where report_status=1 and report_date > date_sub(curdate(),interval 29 day) and user_create=#{userId} and ms_status = 2")
     List<MsReport> selectMsReportThirtyError(@Param("userId") Long userId);
 

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

@@ -265,6 +265,15 @@ public class ScanController {
                         scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
+                    List<MsReport> msReports3 = msReportMapper.selectMsReportThereErrorFamily(userOpen.getUserId(), startDate);
+                    if (msReports3.size() > 0) {
+                        model.put("collor", "red");
+                        model.put("collor2", "red");
+                        model.put("into", "不许进入");
+                        model.put("errorMsg", "由于近期您的家庭成员健康评估存在问题，不许进入，如有疑问请联系直管领导。");
+                        scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+                        return new ModelAndView("/user/scan.ftl", model);
+                    }
 //                    List<MsReport> msReports3 = msReportMapper.selectMsReportThirtyError(userOpen.getUserId());
 //                    if (msReports3.size() > 0) {
 //                        model.put("collor", "red");
@@ -377,6 +386,15 @@ public class ScanController {
                         scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scanHC.ftl", model);
                     }
+                    List<MsReport> msReports3 = msReportMapper.selectMsReportThereErrorFamily(userOpen.getUserId(), "");
+                    if (msReports3.size() > 0) {
+                        model.put("collor", "red");
+                        model.put("collor2", "red");
+                        model.put("into", "不许进入");
+                        model.put("errorMsg", "由于近期您的家庭成员健康评估存在问题，不许进入，如有疑问请联系直管领导。");
+                        scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
+                        return new ModelAndView("/user/scanHC.ftl", model);
+                    }
                     model.put("collor", "green");
                     model.put("collor2", "green");
                     model.put("into", "允许进入");
@@ -714,6 +732,14 @@ public class ScanController {
                 model.put("errorMsg", "由于近期您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                 return new ModelAndView("/user/returnWork.ftl", model);
             }
+            List<MsReport> msReports3 = msReportMapper.selectMsReportThereErrorFamily(userId, startDate);
+            if (msReports3.size() > 0) {
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不许进入");
+                model.put("errorMsg", "由于近期您的家庭成员健康评估存在问题，不许进入，如有疑问请联系直管领导。");
+                return new ModelAndView("/user/returnWork.ftl", model);
+            }
 //            List<MsReport> msReports3 = msReportMapper.selectMsReportThirtyError(userId);
 //            if (msReports3.size() > 0) {
 //                model.put("collor", "red");
@@ -806,6 +832,14 @@ public class ScanController {
                 model.put("errorMsg", "由于近期您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                 return new ModelAndView("/user/returnWorkHC.ftl", model);
             }
+            List<MsReport> msReports3 = msReportMapper.selectMsReportThereErrorFamily(userId, "");
+            if (msReports3.size() > 0) {
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不许进入");
+                model.put("errorMsg", "由于近期您的家庭成员健康评估存在问题，不许进入，如有疑问请联系直管领导。");
+                return new ModelAndView("/user/returnWorkHC.ftl", model);
+            }
             model.put("collor", "blue-ly");
             model.put("collor2", "blue-ly");
             model.put("into", "允许复工");

whepi-web/src/main/resources/mapper/MsReport.xml

@@ -100,4 +100,15 @@
             </if>
         </where>
     </select>
+
+    <select id="selectMsReportThereErrorFamily" resultType="com.bofeng.entity.MsReport">
+        select * from ms_report a INNER JOIN ms_suspected b on a.report_id=b.report_id
+        <where>
+            a.report_status=1 and a.user_create= #{userId} and b.is_suspected = 1
+            and a.report_date>date_sub(curdate(),interval 4 day)
+            <if test="reportDate!=null and reportDate!=''">
+                and a.report_date > #{reportDate}
+            </if>
+        </where>
+    </select>
 </mapper>