fix

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

@@ -213,13 +213,9 @@ public class ClassGradeController extends BaseController {
      */
     @ApiOperation("统计班级学员学时推送数量")
     @GetMapping("/count/periodPlush")
-    public AjaxResult getPeriodPlush(UserQueryBo bo) {
-        AjaxResult ajax = AjaxResult.success();
-        int notPlush = iClassGradeUserService.getNotPeriodNotPush(bo).size();
-        int plush = iClassGradeUserService.selectPeriodPush(bo).size();
-        ajax.put("notPlush",notPlush);
-        ajax.put("Plush",plush);
-        return ajax;
+    public AjaxResult getPeriodPlush(ClassGradeUserQueryBo bo) {
+        HashMap<String, Object> plush = iClassGradeService.getPlush(bo);
+        return AjaxResult.success(plush);
     }
     /**
      * 查询所有班级用户列表

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

@@ -28,6 +28,7 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
 
 //    @InterceptorIgnore(tenantLine = "true")
     List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo);
+    Integer getPlush(ClassGradeUserQueryBo bo);
 
     List<ClassGradeStudentVo> listGradeAll(ClassGradeUserQueryBo bo);
 

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

@@ -109,8 +109,6 @@ 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/IClassGradeService.java

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.grade.vo.*;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -55,6 +56,7 @@ public interface IClassGradeService extends IService<ClassGrade> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo);
+    HashMap<String,Object> getPlush(ClassGradeUserQueryBo bo);
 
 	List<ClassGradeStudentVo> listGradeAll(ClassGradeUserQueryBo bo);
 

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

@@ -144,8 +144,6 @@ 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);
 
 
 	List<StudyAccountStatusVo> listStudyAccountStatus(StudyAccountStatusQueryBo bo);

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

@@ -944,6 +944,18 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         return classGradeStudentVos;
     }
 
+    @Override
+    public HashMap<String, Object> getPlush(ClassGradeUserQueryBo bo) {
+        List<ClassGradeStudentVo> classGradeStudentVos = this.listGrade(bo);
+        bo.setPeriodPlush(1);
+        Integer plush = this.baseMapper.getPlush(bo);
+        HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+        stringObjectHashMap.put("plush",plush);
+        bo.setPeriodPlush(0);
+        stringObjectHashMap.put("notPlush",classGradeStudentVos.size()-plush);
+        return stringObjectHashMap;
+    }
+
     @Override
     public List<ClassGradeStudentVo> listGradeAll(ClassGradeUserQueryBo bo) {
         //身份证去重

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

@@ -3837,16 +3837,6 @@ 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);
-    }
-
     @Override
     public List<StudyAccountStatusVo> listStudyAccountStatus(StudyAccountStatusQueryBo bo) {
         /*LambdaQueryWrapper<Goods> lqw = Wrappers.lambdaQuery();

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

@@ -587,6 +587,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by user_info_status desc ,user_status desc ,cgu.id desc
     </select>
 
+
+    <select id="getPlush"  parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultType="integer">
+        SELECT
+        count(*) AS count
+        FROM
+        class_grade_user cgu
+        LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
+        LEFT JOIN `user` u ON u.user_id = cgu.user_id
+        LEFT JOIN order_goods og on cgu.order_goods_id = og.order_goods_id
+        LEFT JOIN goods g on og.goods_id = g.goods_id
+        LEFT JOIN major m ON g.major_id = m.id
+        LEFT JOIN course_business cb ON g.business_id = cb.id
+        LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+        LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
+        LEFT JOIN user_wx_follow uwf ON u.union_id = uwf.union_id
+        LEFT JOIN user_exam_goods ueg ON ueg.order_goods_id = og.order_goods_id
+        LEFT JOIN user_profile up on cgu.order_goods_id = up.order_goods_id and up.type_status=1 and up.current_status = 1
+        where 1=1 and cgu.`status` = 1
+        <if test="gradeId != null and gradeId !='' and (sevenCode == null or sevenCode =='')">
+            and cgu.grade_id = #{gradeId}
+        </if>
+        <if test="officialStatus != null and officialStatus == 1 ">
+            AND cgu.official_status = 1
+        </if>
+        <if test="officialStatus != null and officialStatus == 0 ">
+            AND (cgu.official_status is NULL or cgu.official_status=0)
+        </if>
+        <if test="periodPlush != null and periodPlush == 1 ">
+            AND cgu.period_plush = 1
+        </if>
+        <if test="periodPlush != null and periodPlush == 0 ">
+            AND (cgu.period_plush is NULL or cgu.period_plush=0)
+        </if>
+        order by user_info_status desc ,user_status desc ,cgu.id desc
+    </select>
+
     <select id="listGradeAll"  parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultMap="ClassGradeStudentVo">
         SELECT
         cgu.id,

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

@@ -2122,42 +2122,6 @@
             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.*
-        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_plush= 1
-        AND gu.period_status = 1
-        AND gu.official_status = 1
-        <if test="gradeId != null and gradeId != ''">
-            AND gu.grade_id = #{gradeId}
-        </if>
-    </select>
 
     <select id="selectGoodsGradeList" parameterType="Long" resultMap="ClassGradeUserGoodsVoResult">
         SELECT