Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/ribao.ftl

@@ -179,10 +179,10 @@
                             </div>
                         </div>
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 125%;">
+                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 140%;">
                                 家庭成员中有新冠肺炎疫情或有过病例接触史人员
                             </div>
-                            <div class="weui-cells_checkbox" style="width: 125%; margin-top: 2.5vh;">
+                            <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
                                 <label class="weui-radio weui-cell_active weui-check__label" for="s28">
                                     <input type="radio" name="radio1" value="0" class="weui-check" id="s28"
                                            style="width: 10%"/>

whepi-web/src/main/java/com/bofeng/controller/EpiAdminController.java

@@ -79,7 +79,7 @@ public class EpiAdminController {
         System.out.println("==============执行定时任务完毕================");
     }
 
-    @Scheduled(cron = "0 0 19 * * ?") //每天19点执行一次
+    @Scheduled(cron = "0 10 20 * * ?") //每天19点执行一次
     public void scheduledTaskByFixedDelay2() {
         System.out.println("==============执行定时任务开始================");
         Long start = 0L, count = 100L;

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

@@ -28,9 +28,9 @@ public interface UserOpenMapper extends BaseMapper<UserOpen> {
 //    @Select(
 //            "select user_id as userId, open_id as openId, nick_name as nickName from sys_user_open limit #{start}, #{count}"
 //    )
-    @Select("select user_id as userId, open_id as openId, nick_name as nickName from sys_user_open suo \n" +
-            "left join ms_report mr on mr.user_create=suo.user_id \n" +
-            "where (mr.report_status<1 or mr.report_status is null) and (mr.report_date = curdate() or mr.report_date is null) limit #{start}, #{count}"
+    @Select("select user_id as userId, open_id as openId, nick_name as nickName from sys_user_open where user_id not in ( select user_id from ( select user_id from sys_user_open suo \n" +
+            "inner join ms_report mr on mr.user_create=suo.user_id and mr.report_status=1 and mr.report_date=curdate()) h)" +
+            "limit #{start}, #{count}"
     )
     List<UserOpen> getOpenUser(@Param("start") Long start, @Param("count") Long count);