fix 学习定时sql

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -52,7 +52,7 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<ClassGradeUserGoodsVo> sendClassGradeUser();
 
-    Long checkSendClassGradeUser(@Param("userId") Long userId,@Param("gradeId") Long gradeId);
+    Long checkSendClassGradeUser(@Param("remindId") Integer remindId,@Param("userId") Long userId,@Param("gradeId") Long gradeId);
 
     List<ClassGradeUserGoodsVo> sendTenClassGradeUser();
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -1542,7 +1542,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         List<ClassGradeUserGoodsVo> userList = baseMapper.sendClassGradeUser();
         List<ClassGradeUserGoodsVo> newList = new ArrayList<>();
         for(ClassGradeUserGoodsVo vo : userList){
-            if(baseMapper.checkSendClassGradeUser(vo.getUserId(),vo.getGradeId()).longValue()<1){
+            if(baseMapper.checkSendClassGradeUser(5,vo.getUserId(),vo.getGradeId()).longValue()<1){
                 newList.add(vo);
             }
         }
@@ -1551,12 +1551,26 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public List<ClassGradeUserGoodsVo> sendTenClassGradeUser() {
-        return baseMapper.sendTenClassGradeUser();
+        List<ClassGradeUserGoodsVo> userList = baseMapper.sendTenClassGradeUser();
+        List<ClassGradeUserGoodsVo> newList = new ArrayList<>();
+        for(ClassGradeUserGoodsVo vo : userList){
+            if(baseMapper.checkSendClassGradeUser(6,vo.getUserId(),vo.getGradeId()).longValue()<1){
+                newList.add(vo);
+            }
+        }
+        return newList;
     }
 
     @Override
     public List<ClassGradeUserGoodsVo> sendFiveClassGradeUser() {
-        return baseMapper.sendFiveClassGradeUser();
+        List<ClassGradeUserGoodsVo> userList = baseMapper.sendFiveClassGradeUser();
+        List<ClassGradeUserGoodsVo> newList = new ArrayList<>();
+        for(ClassGradeUserGoodsVo vo : userList){
+            if(baseMapper.checkSendClassGradeUser(7,vo.getUserId(),vo.getGradeId()).longValue()<1){
+                newList.add(vo);
+            }
+        }
+        return newList;
     }
 
     @Override

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -1033,7 +1033,7 @@
     </select>
 
     <select id="checkSendClassGradeUser" parameterType="map"  resultType="long">
-        SELECT COUNT(1) FROM inform_user iu where 1=1 and iu.remind_id = 5 and #{userId} = iu.user_id and #{gradeId} = iu.grade_id and iu.system_status=3
+        SELECT COUNT(1) FROM inform_user iu where 1=1 and iu.remind_id = #{remindId} and #{userId} = iu.user_id and #{gradeId} = iu.grade_id and iu.system_status=3
 
     </select>
 
@@ -1055,7 +1055,6 @@
         and irb.remind_id =6
           and cgu.status = 1
         AND unix_timestamp(now()) BETWEEN cg.class_end_time-864000 and cg.class_end_time-777600
-        AND (SELECT COUNT(1) FROM inform_user iu where 1=1 and iu.remind_id = 6 and cgu.user_id = iu.user_id and cgu.grade_id = iu.grade_id and iu.system_status=3) &lt; 1
     </select>
 
 
@@ -1077,7 +1076,6 @@
         and irb.remind_id =7
           and cgu.status = 1
         AND unix_timestamp(now()) BETWEEN cg.class_end_time-432000 and cg.class_end_time-345600
-        AND (SELECT COUNT(1) FROM inform_user iu where 1=1 and iu.remind_id = 7 and cgu.user_id = iu.user_id and cgu.grade_id = iu.grade_id and iu.system_status=3) &lt; 1
     </select>
     <select id="selectUserCount" parameterType="com.zhongzheng.modules.user.domain.User" resultType="long">
         SELECT