凌云集团更改公司

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

@@ -161,16 +161,16 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
      * @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);
+    @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} ORDER BY a.time_create DESC LIMIT 1")
+    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);
+    @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 a.user_create=#{userId} and b.medical  = 4 and a.report_date > #{reportDate}")
+    List<MsReport> queryLateStatus(@Param("userId") Long userId, @Param("reportDate") String reportDate);
 
     /**
      * 最近去工作驻地的时间

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

@@ -138,10 +138,11 @@ 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) {
+                    MsReport msReport = msReportMapper.queryMsReportIsXG(userOpen.getUserId());
+                    if (msReport != null) {
+                        SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
+                        List<MsReport> msReports1 = msReportMapper.queryLateStatus(userOpen.getUserId(), s.format(msReport.getReportDate()));
+                        if (msReports1.size() == 0) {
                             model.put("collor", "red");
                             model.put("collor2", "red");
                             model.put("into", "不许进入");
@@ -424,10 +425,11 @@ public class ScanController {
                 model.put("name", uptownHomes.get(0).getLinkman());
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 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 == null || (status != null && status != 4)) {
+                MsReport msReport = msReportMapper.queryMsReportIsXG(userOpen.getUserId());
+                if (msReport != null) {
+                    SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
+                    List<MsReport> msReports1 = msReportMapper.queryLateStatus(userOpen.getUserId(), s.format(msReport.getReportDate()));
+                    if (msReports1.size() == 0) {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不可复工");