Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into dev

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

@@ -500,7 +500,7 @@ public class ClassGradeController extends BaseController {
      * 查询学习账号标记列表
      */
     @ApiOperation("查询学习账号标记列表")
-    //@PreAuthorize("@ss.hasPermi('grade:grade:list')")
+    @PreAuthorize("@ss.hasPermi('grade:grade:list')")
     @GetMapping("/listStudyAccountStatus")
     public TableDataInfo<StudyAccountStatusVo> listStudyAccountStatus(StudyAccountStatusQueryBo bo) {
         startPage();

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2021-10-12
  */
 public interface GoodsMapper extends BaseMapper<Goods> {
-    List<GoodsVo> selectList(GoodsQueryBo bo);
+    List<GoodsVo> selectAllList(GoodsQueryBo bo);
     GoodsVo selectDetail(Long goodsId);
 
     List<ExamNumberGoodsVo> listGoods(ExamNumberGoodsQueryBo bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -103,7 +103,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public List<GoodsVo> selectList(GoodsQueryBo bo) {
-        return baseMapper.selectList(bo);
+        return baseMapper.selectAllList(bo);
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -218,7 +218,7 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	 * 学员姓名
 	 */
 	@ApiModelProperty("学员姓名")
-	private String realName;
+	private String realname;
 
 	/**
 	 * 学员身份证

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.zhongzheng.common.config.RuoYiConfig;
@@ -1616,12 +1617,18 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     @Override
     public List<StudyAccountStatusVo> listStudyAccountStatus(StudyAccountStatusQueryBo bo) {
         LambdaQueryWrapper<Goods> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getEducationTypeId() != null, Goods::getEducationTypeId, bo.getEducationTypeId());
-        lqw.groupBy(Goods::getBusinessId);
+        lqw.eq(bo.getEducationTypeId() != null, Goods::getEducationTypeId, bo.getEducationTypeId())
+                .eq(Goods::getStatus, "1");
         List<Goods> goodsList = iGoodsService.list(lqw);
+        Set<Long> set = new HashSet<Long>();
+        //去重
+        if (!CollectionUtils.isEmpty(goodsList)) {
+            goodsList.stream().forEach(goods->{
+                set.add(goods.getBusinessId());
+            });
+        }
 
         List<StudyAccountStatusVo> list = new ArrayList<>();
-        StudyAccountStatusVo vo = new StudyAccountStatusVo();
         int notConfiguredNum = 0;
         int interfaceNum = 0;
         int noInterfaceNum = 0;
@@ -1630,18 +1637,19 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         int failNum = 0;
         int finishNum = 0;
         int noFinishNum = 0;
-        if (!CollectionUtils.isEmpty(goodsList)) {
-            for (Goods goods : goodsList) {
-                List<ClassGradeVo> classGradeList = iClassGradeService.selectByBusinessId(goods.getBusinessId());
-                vo.setBusinessId(goods.getBusinessId());
-                CourseBusinessVo courseBusinessVo = iCourseBusinessService.queryById(goods.getBusinessId());
+        if (!CollectionUtils.isEmpty(set)) {
+            for (Long businessId : set) {
+                StudyAccountStatusVo vo = new StudyAccountStatusVo();
+                List<ClassGradeVo> classGradeList = iClassGradeService.selectByBusinessId(businessId);
+                vo.setBusinessId(businessId);
+                CourseBusinessVo courseBusinessVo = iCourseBusinessService.queryById(businessId);
                 vo.setBusinessName(courseBusinessVo.getBusinessName());
-                if (goods.getStatus() == 1) {
-                    for (ClassGradeVo classGrade : classGradeList) {
-                        LambdaQueryWrapper<ClassGradeUser> lq = Wrappers.lambdaQuery();
-                        lq.eq(ClassGradeUser::getGradeId, classGrade.getGradeId());
-                        List<ClassGradeUser> classGradeUsers = iClassGradeUserService.list(lq);
-                        for (ClassGradeUser classGradeUser : classGradeUsers) {
+                for (ClassGradeVo classGrade : classGradeList) {
+                    LambdaQueryWrapper<ClassGradeUser> lq = Wrappers.lambdaQuery();
+                    lq.eq(ClassGradeUser::getGradeId, classGrade.getGradeId());
+                    List<ClassGradeUser> classGradeUsers = iClassGradeUserService.list(lq);
+                    for (ClassGradeUser classGradeUser : classGradeUsers) {
+                        if (Validator.isNotEmpty(classGradeUser.getLearnStatus())) {
                             //统计账号未开通数量
                             if (classGradeUser.getLearnStatus() == 0) {
                                 noOpenNum++;
@@ -1654,31 +1662,33 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             if (classGradeUser.getLearnStatus() == 2) {
                                 failNum++;
                             }
+                        }
+                        if (Validator.isNotEmpty(classGradeUser.getFinishStatus())) {
                             //统计已学完数量
                             if (classGradeUser.getFinishStatus() == 0) {
                                 finishNum++;
                             }
+                            //统计未学完数量
                             if (classGradeUser.getFinishStatus() == 1) {
                                 noFinishNum++;
                             }
-                            //统计未学完数量
-                        }
-                        //统计未配置班级数量
-                        if (Validator.isEmpty(classGrade.getInterfaceAccountId()) && Validator.isEmpty(classGrade.getNoInterfaceAccountId())) {
-                            notConfiguredNum++;
-                        }
-                        //统计有接口班级数量
-                        if (Validator.isNotEmpty(classGrade.getInterfaceAccountId())) {
-                            interfaceNum++;
-                        }
-                        //统计无接口班级数量
-                        if (Validator.isNotEmpty(classGrade.getNoInterfaceAccountId())) {
-                            noInterfaceNum++;
                         }
                     }
-                    //统计所有班级人数
-                    vo.setUserNum(classGradeList.size());
+                    //统计未配置班级数量
+                    if (Validator.isEmpty(classGrade.getInterfaceAccountId()) && Validator.isEmpty(classGrade.getNoInterfaceAccountId())) {
+                        notConfiguredNum++;
+                    }
+                    //统计有接口班级数量
+                    if (Validator.isNotEmpty(classGrade.getInterfaceAccountId())) {
+                        interfaceNum++;
+                    }
+                    //统计无接口班级数量
+                    if (Validator.isNotEmpty(classGrade.getNoInterfaceAccountId())) {
+                        noInterfaceNum++;
+                    }
                 }
+                //统计所有班级人数
+                vo.setUserNum(classGradeList.size());
                 vo.setNotConfiguredNum(notConfiguredNum);
                 vo.setInterfaceNum(interfaceNum);
                 vo.setNoInterfaceNum(noInterfaceNum);

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

@@ -52,7 +52,7 @@ public class ClassGradeStudentVo {
 	/** 学员编码 */
 	@Excel(name = "学员姓名")
 	@ApiModelProperty("学员姓名")
-	private String realName;
+	private String realname;
 
 
 	/** 学员编码 */

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

@@ -33,7 +33,7 @@ public class StudyAccountStatusExportVo {
 	/** 学员姓名 */
 	@Excel(name = "学员姓名")
 	@ApiModelProperty("学员姓名")
-	private String realName;
+	private String realname;
 
 
 	/** 学员身份证 */

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="selectStatus" column="select_status"/>
     </resultMap>
 
-    <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResultVo">
+    <select id="selectAllList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResultVo">
         SELECT
         g.*,
         ps.supply_name,

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

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="id"/>
         <result property="gradeId" column="grade_id"/>
         <result property="studentCode" column="user_account"/>
-        <result property="realName" column="realName"/>
+        <result property="realname" column="realname"/>
         <result property="idCard" column="id_card"/>
         <result property="telPhone" column="telphone"/>
         <result property="userStatus" column="user_status"/>
@@ -386,7 +386,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND og.study_count = 0
         </if>
         <if test="realname != null and realname != ''">
-            AND cgu.realname like concat('%', #{realname}, '%')
+            AND u.realname like concat('%', #{realname}, '%')
         </if>
         <if test="idCard != null and idCard != ''">
             AND u.id_card = #{idCard}