fix 学习账号标记

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

@@ -54,4 +54,6 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
     List<ClassGradeGoodsVo> listGoodsBatch(ClassGradeQueryBo bo);
 
     List<ClassGradeVo> listGradeSubjects();
+
+    List<ClassGradeVo> queryCountList(Long businessId);
 }

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

@@ -81,4 +81,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
     boolean sendCode();
 
     List<ClassGradeVo> listGradeSubjects();
+
+	List<ClassGradeVo> queryCountList(Long businessId);
 }

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

@@ -706,6 +706,11 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         return baseMapper.listGradeSubjects();
     }
 
+    @Override
+    public List<ClassGradeVo> queryCountList(Long businessId) {
+        return baseMapper.queryCountList(businessId);
+    }
+
     /**
      * 实体类转化成视图对象
      *

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

@@ -1719,16 +1719,19 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             }
                         }
                     }
+                }
+                List<ClassGradeVo> countClassGradeList = iClassGradeService.queryCountList(businessId);
+                for (ClassGradeVo classGradeVo : countClassGradeList) {
                     //统计未配置班级数量
-                    if (Validator.isEmpty(classGrade.getInterfaceAccountId()) && Validator.isEmpty(classGrade.getNoInterfaceAccountId())) {
+                    if (Validator.isEmpty(classGradeVo.getInterfaceAccountId()) && Validator.isEmpty(classGradeVo.getNoInterfaceAccountId())) {
                         notConfiguredNum++;
                     }
                     //统计有接口班级数量
-                    if (Validator.isNotEmpty(classGrade.getInterfaceAccountId())) {
+                    if (Validator.isNotEmpty(classGradeVo.getInterfaceAccountId())) {
                         interfaceNum++;
                     }
                     //统计无接口班级数量
-                    if (Validator.isNotEmpty(classGrade.getNoInterfaceAccountId())) {
+                    if (Validator.isNotEmpty(classGradeVo.getNoInterfaceAccountId())) {
                         noInterfaceNum++;
                     }
                 }

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

@@ -801,4 +801,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN class_grade_goods cgg ON cg.grade_id = cgg.grade_id
         LEFT JOIN goods g ON cgg.goods_id = g.goods_id
     </select>
+    <select id="queryCountList" parameterType="java.lang.Long" resultMap="ClassGradeVoResult">
+        SELECT
+            cg.*
+        FROM
+            class_grade cg
+        LEFT JOIN class_grade_goods cgg ON cg.grade_id = cgg.grade_id
+        LEFT JOIN goods g ON cgg.goods_id = g.goods_id
+        WHERE
+            cg.`status` != -1
+          and cg.`status` in (0,1)
+          and g.business_id = #{businessId}
+    </select>
 </mapper>