he2802 3 年之前
父節點
當前提交
bdb0cce440

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

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

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

@@ -1539,7 +1539,14 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
 
     @Override
     @Override
     public List<ClassGradeUserGoodsVo> sendTwentyClassGradeUser() {
     public List<ClassGradeUserGoodsVo> sendTwentyClassGradeUser() {
-        return baseMapper.sendClassGradeUser();
+        List<ClassGradeUserGoodsVo> userList = baseMapper.sendClassGradeUser();
+        List<ClassGradeUserGoodsVo> newList = new ArrayList<>();
+        for(ClassGradeUserGoodsVo vo : userList){
+            if(baseMapper.checkSendClassGradeUser(vo.getUserId(),vo.getGradeId()).longValue()<1){
+                newList.add(vo);
+            }
+        }
+        return newList;
     }
     }
 
 
     @Override
     @Override

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

@@ -1033,6 +1033,10 @@
         AND (SELECT COUNT(1) FROM inform_user iu where 1=1 and iu.remind_id = 5 and cgu.user_id = iu.user_id and cgu.grade_id = iu.grade_id and iu.system_status=3) &lt; 1
         AND (SELECT COUNT(1) FROM inform_user iu where 1=1 and iu.remind_id = 5 and cgu.user_id = iu.user_id and cgu.grade_id = iu.grade_id and iu.system_status=3) &lt; 1
     </select>
     </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>
 
 
     <select id="sendTenClassGradeUser"  resultMap="ClassGradeUserGoodsVoResult">
     <select id="sendTenClassGradeUser"  resultMap="ClassGradeUserGoodsVoResult">