fix 控制台

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserMockSubscribeController.java

@@ -4,6 +4,7 @@ import java.text.ParseException;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.core.lang.Validator;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
@@ -130,6 +131,9 @@ public class UserMockSubscribeController extends BaseController {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         List<UserMockSubscribeVo> list = iUserMockSubscribeService.listSubscribe(bo);
+        if (Validator.isEmpty(bo.getPageNum()) || Validator.isEmpty(bo.getPageSize())) {
+            return getDataTable(list);
+        }
         return getDataTable(getPageInfo(bo.getPageNum(), bo.getPageSize(), list).getList());
     }
 

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

@@ -43,8 +43,6 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
 
     List<ClassGradeVo> getConsoleGradeList(ConsoleQueryBo bo);
 
-    List<ClassGradeVo> selectByBusinessId(Long businessId);
-
     Integer getConsoleGradeUserAccountNum(ConsoleQueryBo bo);
 
     Integer getConsoleGradeAccountNum(ConsoleQueryBo bo);
@@ -56,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/mapper/ClassGradeUserMapper.java

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

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

@@ -68,8 +68,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
 
 	List<ClassGradeVo> getConsoleGradeList(ConsoleQueryBo bo);
 
-    List<ClassGradeVo> selectByBusinessId(Long businessId);
-
 	Integer getConsoleGradeUserAccountNum(ConsoleQueryBo bo);
 
 	Integer getConsoleGradeAccountNum(ConsoleQueryBo bo);
@@ -83,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

@@ -503,11 +503,6 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         return baseMapper.getConsoleGradeList(bo);
     }
 
-    @Override
-    public List<ClassGradeVo> selectByBusinessId(Long businessId) {
-        return baseMapper.selectByBusinessId(businessId);
-    }
-
     @Override
     public Integer getConsoleGradeUserAccountNum(ConsoleQueryBo bo) {
         return baseMapper.getConsoleGradeUserAccountNum(bo);
@@ -711,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

@@ -1667,7 +1667,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                 finishNum = 0;
                 noFinishNum = 0;
                 StudyAccountStatusVo vo = new StudyAccountStatusVo();
-                List<ClassGradeVo> classGradeList = iClassGradeService.selectByBusinessId(businessId);
+                List<ClassGradeUserVo> countList = queryCountList(businessId);
                 vo.setBusinessId(businessId);
                 LambdaQueryWrapper<CourseBusiness> lqw2 = Wrappers.lambdaQuery();
                 lqw2.eq(CourseBusiness::getId, businessId);
@@ -1689,7 +1689,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     vo.setEducationName(courseEducationType.getEducationName());
                     vo.setEducationTypeId(courseEducationType.getId());
                 }
-                for (ClassGradeVo classGrade : classGradeList) {
+                for (ClassGradeUserVo classGrade : countList) {
                     LambdaQueryWrapper<ClassGradeUser> lq = Wrappers.lambdaQuery();
                     lq.eq(ClassGradeUser::getGradeId, classGrade.getGradeId());
                     List<ClassGradeUser> classGradeUsers = iClassGradeUserService.list(lq);
@@ -1710,30 +1710,33 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         }
                         if (Validator.isNotEmpty(classGradeUser.getFinishStatus())) {
                             //统计已学完数量
-                            if (classGradeUser.getFinishStatus() == 0) {
+                            if (classGradeUser.getFinishStatus() == 1) {
                                 finishNum++;
                             }
                             //统计未学完数量
-                            if (classGradeUser.getFinishStatus() == 1) {
+                            if (classGradeUser.getFinishStatus() == 0) {
                                 noFinishNum++;
                             }
                         }
                     }
+                }
+                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++;
                     }
                 }
                 //统计所有班级人数
-                vo.setUserNum(classGradeList.size());
+                vo.setUserNum(countList.size());
                 vo.setNotConfiguredNum(notConfiguredNum);
                 vo.setInterfaceNum(interfaceNum);
                 vo.setNoInterfaceNum(noInterfaceNum);
@@ -1755,6 +1758,11 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     }
 
 
+    private List<ClassGradeUserVo> queryCountList(Long businessId) {
+        return baseMapper.queryCountList(businessId);
+    }
+
+
     /**
      * 实体类转化成视图对象
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserVo.java

@@ -136,5 +136,14 @@ public class ClassGradeUserVo {
 	/** 失败原因 */
 	@Excel(name = "失败原因")
 	@ApiModelProperty("失败原因")
-	private Long reason;
+	private String reason;
+
+	/** 官方账号开通（有接口） */
+	@Excel(name = "官方账号开通（有接口）")
+	@ApiModelProperty("官方账号开通（有接口）")
+	private Long interfaceAccountId;
+	/** 官方账号开通（无接口） */
+	@Excel(name = "官方账号开通（无接口）")
+	@ApiModelProperty("官方账号开通（无接口）")
+	private Long noInterfaceAccountId;
 }

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

@@ -656,19 +656,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="selectByBusinessId" resultType="com.zhongzheng.modules.grade.vo.ClassGradeVo">
-        SELECT
-            cg.*
-        FROM class_grade cg
-			LEFT JOIN class_grade_goods cgu ON cg.grade_id = cgu.grade_id
-			LEFT JOIN goods g ON cgu.goods_id = g.goods_id
-			WHERE g.`status` = 1
-			  AND cg.`status` = 1
-        <if test="businessId != null and businessId !=''">
-            AND g.business_id = #{businessId}
-        </if>
-    </select>
-
     <select id="getConsoleGradeUserAccountNum" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultType="Integer">
         SELECT
         count(cgu.id)
@@ -814,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>

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

@@ -58,6 +58,8 @@
         <result property="finishStatus" column="finish_status"/>
         <result property="learnStatus" column="learn_status"/>
         <result property="reason" column="reason"/>
+        <result property="interfaceAccountId" column="interface_account_id"/>
+        <result property="noInterfaceAccountId" column="no_interface_account_id"/>
     </resultMap>
 
 
@@ -1198,4 +1200,20 @@
             cgg.goods_id = #{goodsId}
           AND cgu.user_id IS NOT NULL
     </select>
+    <select id="queryCountList" parameterType="java.lang.Long" resultMap="ClassGradeUserVoResult">
+        SELECT
+            cgu.*,
+            cg.interface_account_id,
+            cg.no_interface_account_id
+        FROM
+            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
+        WHERE
+          cgu.`status` = 1
+          and g.`status` = 1
+          and cg.`status` = 1
+          and g.business_id = #{businessId}
+    </select>
 </mapper>