fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -215,7 +215,7 @@ public class ClassGradeController extends BaseController {
     @GetMapping("/count/periodPlush")
     public AjaxResult getPeriodPlush(UserQueryBo bo) {
         AjaxResult ajax = AjaxResult.success();
-        int notPlush = iClassGradeUserService.selectPeriodNotPush(bo).size();
+        int notPlush = iClassGradeUserService.getNotPeriodNotPush(bo).size();
         int plush = iClassGradeUserService.selectPeriodPush(bo).size();
         ajax.put("notPlush",notPlush);
         ajax.put("Plush",plush);

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

@@ -109,6 +109,7 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     List<ClassGradeUserGoodsVo> selectOfficialNotPush(UserQueryBo bo);
 
     List<ClassGradeUserGoodsVo> selectPeriodNotPush(UserQueryBo bo);
+    List<ClassGradeUserGoodsVo> getNotPeriodPush(UserQueryBo bo);
     List<ClassGradeUserGoodsVo> selectPeriodPush(UserQueryBo bo);
 
     List<ClassGradeUserGoodsVo> selectGoodsGradeList(Long goodsId);

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

@@ -144,6 +144,7 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 	List<ClassGradeUserGoodsVo> selectOfficialNotPush(UserQueryBo bo);
 
 	List<ClassGradeUserGoodsVo> selectPeriodNotPush(UserQueryBo bo);
+	List<ClassGradeUserGoodsVo> getNotPeriodNotPush(UserQueryBo bo);
 	List<ClassGradeUserGoodsVo> selectPeriodPush(UserQueryBo bo);
 
 

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

@@ -3837,6 +3837,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return baseMapper.selectPeriodNotPush(bo);
     }
 
+    @Override
+    public List<ClassGradeUserGoodsVo> getNotPeriodNotPush(UserQueryBo bo) {
+        return baseMapper.getNotPeriodPush(bo);
+    }
+
     @Override
     public List<ClassGradeUserGoodsVo> selectPeriodPush(UserQueryBo bo) {
         return baseMapper.selectPeriodPush(bo);

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

@@ -2122,6 +2122,24 @@
             AND gu.grade_id = #{gradeId}
         </if>
     </select>
+    <select id="getNotPeriodPush" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="ClassGradeUserGoodsVoResult">
+        SELECT
+        gu.*
+        FROM
+        class_grade g
+        LEFT JOIN class_grade_user gu ON g.grade_id = gu.grade_id
+        WHERE
+        g.interface_period_id > 0
+        AND g.`status` = 1
+        AND gu.`status` = 1
+        AND gu.change_grade = 0
+        AND gu.period_status = 1
+        AND gu.official_status = 1
+        AND (gu.period_plush is NULL or gu.period_plush=0)
+        <if test="gradeId != null and gradeId != ''">
+            AND gu.grade_id = #{gradeId}
+        </if>
+    </select>
     <select id="selectPeriodPush" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="ClassGradeUserGoodsVoResult">
         SELECT
         gu.*