merge

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

@@ -75,5 +75,5 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
 
     List<ClassGradeUserGoodsVo> selectGoodsGradeList(Long goodsId);
 
-    List<ClassGradeUserVo> queryCountList(@Param("projectId")Integer projectId, @Param("all") Integer all);
+    List<ClassGradeUserVo> queryCountList(@Param("projectId")Integer projectId, @Param("businessId")Integer businessId, @Param("all") Integer all);
 }

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

@@ -1685,7 +1685,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 vo.setProjectId(courseProjectTypeVo.getId().intValue());
                 vo.setEducationName(courseProjectTypeVo.getEducationName());
                 vo.setEducationTypeId(courseProjectTypeVo.getEducationId().longValue());
-                List<ClassGradeUserVo> countList = queryCountList(courseProjectTypeVo.getId().intValue(), 0);
+                List<ClassGradeUserVo> countList = baseMapper.queryCountList(courseProjectTypeVo.getId().intValue(), courseBusinessVo.getId().intValue(), 0);
                 for (ClassGradeUserVo classGradeUser : countList) {
                     if (Validator.isNotEmpty(classGradeUser.getLearnStatus())) {
                         //统计账号未开通数量
@@ -1728,7 +1728,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     }
                 }
                 //统计所有班级人数
-                vo.setUserNum(queryCountList(courseProjectTypeVo.getId().intValue(), null).size());
+                vo.setUserNum(baseMapper.queryCountList(courseProjectTypeVo.getId().intValue(), courseBusinessVo.getId().intValue(), null).size());
                 vo.setNotConfiguredNum(notConfiguredNum);
                 vo.setInterfaceNum(interfaceNum);
                 vo.setNoInterfaceNum(noInterfaceNum);
@@ -1749,11 +1749,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     }
 
 
-    private List<ClassGradeUserVo> queryCountList(Integer projectId, Integer all) {
-        return baseMapper.queryCountList(projectId, all);
-    }
-
-
     /**
      * 实体类转化成视图对象
      *

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

@@ -1204,19 +1204,20 @@
     </select>
     <select id="queryCountList" parameterType="java.lang.Integer" resultMap="ClassGradeUserVoResult">
         SELECT
-            cgu.*,
-            cg.interface_account_id,
-            cg.no_interface_account_id
+        cgu.*,
+        cg.interface_account_id,
+        cg.no_interface_account_id
         FROM
-            class_grade_user cgu
+        class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
-        LEFT JOIN class_grade_goods cgg ON cgu.grade_id = cgg.grade_id
-        LEFT JOIN goods g ON cgg.goods_id = g.goods_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
         WHERE
-          cgu.`status` = 1
-          and g.project_id = #{projectId}
-          <if test="all != null and all == 0">
+        cgu.`status` = 1
+        and g.project_id = #{projectId}
+        and g.business_id = #{businessId}
+        <if test="all != null and all == 0">
             and (cg.interface_account_id is not null or cg.no_interface_account_id is not null)
-          </if>
+        </if>
     </select>
 </mapper>