merge

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

@@ -21,6 +21,7 @@ import com.zhongzheng.modules.grade.vo.*;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import io.swagger.models.auth.In;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.boot.SpringBootVersion;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -494,4 +495,51 @@ public class ClassGradeController extends BaseController {
         }
         return AjaxResult.success(username);
     }
+
+    /**
+     * 查询学习账号标记列表
+     */
+    @ApiOperation("查询学习账号标记列表")
+    //@PreAuthorize("@ss.hasPermi('grade:grade:list')")
+    @GetMapping("/listStudyAccountStatus")
+    public TableDataInfo<StudyAccountStatusVo> listStudyAccountStatus(StudyAccountStatusQueryBo bo) {
+        startPage();
+        List<StudyAccountStatusVo> list = iClassGradeUserService.listStudyAccountStatus(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出资料审核列表
+     */
+    @ApiOperation("导出学员学时列表")
+    @PreAuthorize("@ss.hasPermi('system:profile:export')")
+    @Log(title = "导出学员学时列表", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportStudyAccount")
+    public AjaxResult<Map<String,Object>> exportStudyAccount(ClassGradeUserQueryBo bo) {
+        bo.setUserPhoto(1);
+        Map<String,Object> map = new HashMap<>();
+        List<ClassGradeStudentVo> list = iClassGradeService.listGrade(bo);
+        List<StudyAccountStatusExportVo> newList = new ArrayList<>();
+        for (ClassGradeStudentVo classGradeStudent : list) {
+            StudyAccountStatusExportVo studyAccountStatusExportVo = new StudyAccountStatusExportVo();
+            BeanUtils.copyProperties(classGradeStudent, studyAccountStatusExportVo);
+            newList.add(studyAccountStatusExportVo);
+        }
+        map.put("list", newList);
+        ExcelUtil<StudyAccountStatusExportVo> util = new ExcelUtil<StudyAccountStatusExportVo>(StudyAccountStatusExportVo.class);
+        ExportParams deptExportParams = new ExportParams();
+        // 设置sheet得名称
+        deptExportParams.setSheetName("表1");
+        String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        Map<String, Object> deptExportMap = new HashMap<>();
+        deptExportMap.put("title", deptExportParams);
+        deptExportMap.put("entity", ClassPeriodStudentExportAllVo.class);
+        // sheet中要填充得数据
+        deptExportMap.put("data", list);
+        List<Map<String, Object>> sheetsList = new ArrayList<>();
+        sheetsList.add(deptExportMap);
+        map.put("excel",util.exportEasyExcel(sheetsList, "学习账号标记"+timeStr));
+        map.remove("list");
+        return AjaxResult.success(map);
+    }
 }

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

@@ -72,9 +72,12 @@ public class ClassGradeAddBo {
     /** 备注 */
     @ApiModelProperty("备注")
     private String remark;
-    /** 官方账号开通 */
-    @ApiModelProperty("官方账号开通")
+    /** 官方账号开通(有接口) */
+    @ApiModelProperty("官方账号开通(有接口)")
     private Long interfaceAccountId;
+    /** 官方账号开通(无接口) */
+    @ApiModelProperty("官方账号开通(无接口)")
+    private Long noInterfaceAccountId;
     /** 学时推送 */
     @ApiModelProperty("学时推送")
     private Long interfacePeriodId;

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

@@ -48,14 +48,14 @@ public class ClassGradeUserAddBo {
     /** 订单商品id */
     @ApiModelProperty("订单商品id")
     private Long orderGoodsId;
-    /** 结业状态 0 未结业 1结业 */
-    @ApiModelProperty("结业状态 0 未结业 1结业")
+    /** 学习完成状态 0 未学完 1已学完 */
+    @ApiModelProperty("学习完成状态 0 未学完 1已学完")
     private Integer finishStatus;
     /** 官方推送状态 1是 0否 */
     @ApiModelProperty("官方推送状态 1是 0否")
     private Integer officialStatus;
-    /** 官方学习账号推送状态 0否 1是 */
-    @ApiModelProperty("官方学习账号推送状态 0否 1是 ")
+    /** 官方学习账号标记状态 0未开通 1已开通 2标记失败 */
+    @ApiModelProperty("官方学习账号标记状态 0未开通 1已开通 2标记失败 ")
     private Integer learnStatus;
     /** 学时变为待审核时间 */
     @ApiModelProperty("学时变为待审核时间")

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

@@ -46,8 +46,8 @@ public class ClassGradeUserEditBo {
     @ApiModelProperty("学时审批状态 0 未通过 1通过 2待审核")
     private Integer periodStatus;
 
-    /** 结业状态 0 未结业 1结业 */
-    @ApiModelProperty("结业状态 0 未结业 1结业")
+    /** 学习完成状态 0 未学完 1已学完 */
+    @ApiModelProperty("学习完成状态 0 未学完 1已学完")
     private Integer finishStatus;
 
     /** 订单商品id */
@@ -58,8 +58,8 @@ public class ClassGradeUserEditBo {
     @ApiModelProperty("官方推送状态 1是 0否")
     private Integer officialStatus;
 
-    /** 官方学习账号推送状态 0否 1是 */
-    @ApiModelProperty("官方学习账号推送状态 0否 1是")
+    /** 官方学习账号标记状态 0未开通 1已开通 2标记失败 */
+    @ApiModelProperty("官方学习账号标记状态 0未开通 1已开通 2标记失败")
     private Integer learnStatus;
 
     /** 学时变为待审核时间 */
@@ -73,4 +73,8 @@ public class ClassGradeUserEditBo {
     /** 学时变为审核中时间 */
     @ApiModelProperty("学时变为审核中时间")
     private Long periodIngTime;
+
+    /** 失败原因 */
+    @ApiModelProperty("失败原因")
+    private Long reason;
 }

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

@@ -24,103 +24,157 @@ import com.zhongzheng.common.core.domain.BaseEntity;
 @ApiModel("学员记录分页查询对象")
 public class ClassGradeUserQueryBo extends BaseEntity {
 
-	/** 分页大小 */
+	/**
+	 * 分页大小
+	 */
 	@ApiModelProperty("分页大小")
 	private Integer pageSize;
-	/** 当前页数 */
+	/**
+	 * 当前页数
+	 */
 	@ApiModelProperty("当前页数")
 	private Integer pageNum;
-	/** 排序列 */
+	/**
+	 * 排序列
+	 */
 	@ApiModelProperty("排序列")
 	private String orderByColumn;
-	/** 排序的方向desc或者asc */
+	/**
+	 * 排序的方向desc或者asc
+	 */
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
 
-	/** 学员ID */
+	/**
+	 * 学员ID
+	 */
 	@ApiModelProperty("学员ID")
 	private Long userId;
 
-	/** 模塊ID */
+	/**
+	 * 模塊ID
+	 */
 	@ApiModelProperty("模塊ID")
 	private Long moduleId;
 
-	/** 章ID */
+	/**
+	 * 章ID
+	 */
 	@ApiModelProperty("章ID")
 	private Long chapterId;
 
-	/** 節ID */
+	/**
+	 * 節ID
+	 */
 	@ApiModelProperty("節ID")
 	private Long sectionId;
 
-	/** 試卷ID */
+	/**
+	 * 試卷ID
+	 */
 	@ApiModelProperty("試卷ID")
 	private Long examId;
 
-	/** 学员ID */
+	/**
+	 * 学员ID
+	 */
 	@Excel(name = "课程id")
 	@ApiModelProperty("课程id")
 	private Long courseId;
 
-	/** 商品id */
+	/**
+	 * 商品id
+	 */
 	@ApiModelProperty("商品id")
 	private Long goodsId;
-	/** 班级id */
+	/**
+	 * 班级id
+	 */
 	@ApiModelProperty("班级id")
 	private Long gradeId;
-	/** 1 进入 0移除 */
+	/**
+	 * 1 进入 0移除
+	 */
 	@ApiModelProperty("1 进入 0移除")
 	private List<Integer> status;
 
 	@ApiModelProperty("来源 1订单购买")
 	private Integer fromType;
-	/** 学时审批状态 0 未通过 1通过 2待审核 */
+	/**
+	 * 学时审批状态 0 未通过 1通过 2待审核
+	 */
 	@ApiModelProperty("学时审批状态 0 未通过 1通过 2待审核")
 	private Integer periodStatus;
-	/** 订单商品id */
+	/**
+	 * 订单商品id
+	 */
 	@ApiModelProperty("订单商品id")
 	private Long orderGoodsId;
-	/** 结业状态 0 未结业 1结业 */
-	@ApiModelProperty("结业状态 0 未结业 1结业")
+	/**
+	 * 学习完成状态 0 未学完 1学完
+	 */
+	@ApiModelProperty("学习完成状态 0 未学完 1学完")
 	private Integer finishStatus;
-	/** 官方推送状态 1是 0否 */
+	/**
+	 * 官方推送状态 1是 0否
+	 */
 	@ApiModelProperty("官方推送状态 1是 0否")
 	private Integer officialStatus;
-	/** 官方学习账号推送状态 0否 1是 */
-	@ApiModelProperty("官方学习账号推送状态 0否 1是")
+	/**
+	 * 官方学习账号标记状态 0未开通 1已开通 2标记失败
+	 */
+	@ApiModelProperty("官方学习账号标记状态 0未开通 1已开通 2标记失败")
 	private Integer learnStatus;
 
-	/** 獲得第幾條審核記錄 */
+	/**
+	 * 獲得第幾條審核記錄
+	 */
 	@ApiModelProperty("獲得第幾條審核記錄")
 	private Long numIndex;
 
-	/** 獲得第幾條審核記錄 */
+	/**
+	 * 獲得第幾條審核記錄
+	 */
 	@ApiModelProperty("1 无选班再次学习的学员 2有选班再次学习的学员 0全部")
 	private Long choice;
 
-	/** 班级有效期开始时间 */
+	/**
+	 * 班级有效期开始时间
+	 */
 	@ApiModelProperty("班级有效期开始时间")
 	private Long classStartTime;
-	/** 班级有效期结束时间 */
+	/**
+	 * 班级有效期结束时间
+	 */
 	@ApiModelProperty("班级有效期结束时间")
 	private Long classEndTime;
 	@ApiModelProperty("0剩余0 ，1 非商品下大于0 2商品下大于0")
 	private Integer studyCountMore;
-	/** 教育类型id */
+	/**
+	 * 教育类型id
+	 */
 	@ApiModelProperty("教育类型id")
 	private Long educationTypeId;
-	/** 业务层次id */
+	/**
+	 * 业务层次id
+	 */
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
-	/** 所属院校 */
+	/**
+	 * 所属院校
+	 */
 	@ApiModelProperty("所属院校")
 	private Long schoolId;
-	/** 所属专业 */
+	/**
+	 * 所属专业
+	 */
 	@ApiModelProperty("所属专业")
 	private Long majorId;
 	@ApiModelProperty("审核状态  1通过 3不通过 2待审")
 	private Integer profileStatus;
-	/** 是否已换班 0没有 1已换去新班 */
+	/**
+	 * 是否已换班 0没有 1已换去新班
+	 */
 	@ApiModelProperty("是否已换班 0没有 1已换去新班")
 	private Integer changeGrade;
 
@@ -147,4 +201,40 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 
 	@ApiModelProperty("是否学时推送 0未推送 1推送")
 	private Integer periodPlush;
+
+	/**
+	 * 官方账号开通（有接口）
+	 */
+	@ApiModelProperty("官方账号开通（有接口）")
+	private Long interfaceAccountId;
+
+	/**
+	 * 官方账号开通（无接口）
+	 */
+	@ApiModelProperty("官方账号开通（无接口）")
+	private Long noInterfaceAccountId;
+
+	/**
+	 * 学员姓名
+	 */
+	@ApiModelProperty("学员姓名")
+	private Long realName;
+
+	/**
+	 * 学员身份证
+	 */
+	@ApiModelProperty("学员身份证")
+	private Long idCard;
+
+	/**
+	 * 订单编号
+	 */
+	@ApiModelProperty("订单编号")
+	private Long orderSn;
+
+	/**
+	 * 商品名称
+	 */
+	@ApiModelProperty("商品名称")
+	private Long goodsName;
 }

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

@@ -0,0 +1,40 @@
+package com.zhongzheng.modules.grade.bo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 学习账号标记分页查询对象
+ *
+ * @author ruoyi
+ * @date 2022-5-5
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("学习账号标记分页查询对象")
+public class StudyAccountStatusQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+	/** 业务层次ID */
+	@ApiModelProperty("业务层次ID")
+	private Long educationTypeId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGradeUser.java

@@ -46,11 +46,11 @@ private static final long serialVersionUID=1L;
     private Integer periodStatus;
     /** 订单商品id */
     private Long orderGoodsId;
-    /** 结业状态 0 未结业 1结业 */
+    /** 学习完成状态 0 未学完 1已学完 */
     private Integer finishStatus;
     /** 官方推送状态 1是 0否 */
     private Integer officialStatus;
-    /** 官方学习账号推送状态 0否 1是 */
+    /** 官方学习账号标记状态 0未开通 1已开通 2标记失败 */
     private Integer learnStatus;
     /** 学时变为待审核时间 */
     private Long periodWaitTime;
@@ -76,6 +76,8 @@ private static final long serialVersionUID=1L;
     private Long periodIngTime;
     /** 审核用户名 */
     private String auditUserName;
+    /** 失败原因 */
+    private String reason;
 
 }
 

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

@@ -39,5 +39,9 @@ public interface ClassGradeMapper extends BaseMapper<ClassGrade> {
 
     List<Long> queryUser(Long gradeId);
 
+
     List<ClassGradeVo> getConsoleGradeList(ConsoleQueryBo bo);
+
+    List<ClassGradeVo> selectByBusinessId(Long businessId);
+
 }

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

@@ -62,5 +62,9 @@ public interface IClassGradeService extends IService<ClassGrade> {
 
     List<CourseUserEducationTypeVo> listGradeService(ClassGradeQueryBo bo);
 
+
 	List<ClassGradeVo> getConsoleGradeList(ConsoleQueryBo bo);
+
+    List<ClassGradeVo> selectByBusinessId(Long businessId);
+
 }

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

@@ -114,4 +114,5 @@ public interface IClassGradeUserService extends IService<ClassGradeUser> {
 
 	List<ClassGradeUserGoodsVo> selectPeriodNotPush(UserQueryBo bo);
 
+	List<StudyAccountStatusVo> listStudyAccountStatus(StudyAccountStatusQueryBo bo);
 }

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

@@ -481,6 +481,10 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     public List<ClassGradeVo> getConsoleGradeList(ConsoleQueryBo bo) {
         return baseMapper.getConsoleGradeList(bo);
     }
+    @Override
+    public List<ClassGradeVo> selectByBusinessId(Long businessId) {
+        return baseMapper.selectByBusinessId(businessId);
+    }
 
     /**
      * 实体类转化成视图对象

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

@@ -23,10 +23,16 @@ import com.zhongzheng.modules.alioss.service.OssService;
 import com.zhongzheng.modules.base.domain.UserProfile;
 import com.zhongzheng.modules.base.service.IUserProfileService;
 import com.zhongzheng.modules.course.domain.CourseBusiness;
+import com.zhongzheng.modules.course.domain.CourseMenuExam;
+import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import com.zhongzheng.modules.course.vo.CourseBusinessVo;
 import com.zhongzheng.modules.course.vo.CourseChapterVo;
+import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
+import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.*;
+import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.zhongzheng.modules.grade.domain.StudyCountLog;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.modules.grade.service.IStudyCountLogService;
@@ -123,6 +129,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     @Autowired
     private IUserProfileService iUserProfileService;
 
+    @Autowired
+    private ICourseBusinessService iCourseBusinessService;
+
     @Value("${aliyun.oss.endpoint}")
     private String ALIYUN_OSS_ENDPOINT;
 
@@ -1604,6 +1613,87 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         return baseMapper.selectPeriodNotPush(bo);
     }
 
+    @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);
+        List<Goods> goodsList = iGoodsService.list(lqw);
+
+        List<StudyAccountStatusVo> list = new ArrayList<>();
+        StudyAccountStatusVo vo = new StudyAccountStatusVo();
+        int notConfiguredNum = 0;
+        int interfaceNum = 0;
+        int noInterfaceNum = 0;
+        int openNum = 0;
+        int noOpenNum = 0;
+        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());
+                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) {
+                            //统计账号未开通数量
+                            if (classGradeUser.getLearnStatus() == 0) {
+                                noOpenNum++;
+                            }
+                            //统计账号未开通数量
+                            if (classGradeUser.getLearnStatus() == 1) {
+                                openNum++;
+                            }
+                            //统计账号标记失败数量
+                            if (classGradeUser.getLearnStatus() == 2) {
+                                failNum++;
+                            }
+                            //统计已学完数量
+                            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());
+                }
+                vo.setNotConfiguredNum(notConfiguredNum);
+                vo.setInterfaceNum(interfaceNum);
+                vo.setNoInterfaceNum(noInterfaceNum);
+                vo.setOpenNum(openNum);
+                vo.setNoOpenNum(noOpenNum);
+                vo.setFailNum(failNum);
+                vo.setFinishNum(finishNum);
+                vo.setNoFinishNum(noFinishNum);
+
+                list.add(vo);
+            }
+        }
+        return list;
+    }
+
 
     /**
      * 实体类转化成视图对象

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

@@ -90,8 +90,8 @@ public class ClassGradeStudentVo {
 	@ApiModelProperty("官方推送状态 1是 0否")
 	private Long officialStatus;
 
-	/** 官方学习账号推送状态 */
-	@ApiModelProperty("官方学习账号推送状态")
+	/** 官方学习账号标记状态 0未开通 1已开通 2标记失败 */
+	@ApiModelProperty("官方学习账号标记状态 0未开通 1已开通 2标记失败")
 	private Long learnStatus;
 
 
@@ -172,4 +172,19 @@ public class ClassGradeStudentVo {
 	@Excel(name = "服务有效期结束")
 	@ApiModelProperty("服务有效期结束")
 	private Long serviceEndTime;
+
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	/** 专业名称 */
+	@Excel(name = "专业名称")
+	@ApiModelProperty("专业名称")
+	private String categoryName;
 }

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

@@ -125,4 +125,16 @@ public class ClassGradeUserVo {
 	@Excel(name = "学时变为审核中时间")
 	@ApiModelProperty("学时变为审核中时间")
 	private Long periodIngTime;
+	/** 学习完成状态 0未学完 1学完 */
+	@Excel(name = "学习完成状态 0未学完 1学完")
+	@ApiModelProperty("学习完成状态 0未学完 1学完")
+	private Long finishStatus;
+	/** 官方学习账号标记状态 0未开通 1已开通 2标记失败 */
+	@Excel(name = "官方学习账号标记状态 0未开通 1已开通 2标记失败")
+	@ApiModelProperty("官方学习账号标记状态 0未开通 1已开通 2标记失败")
+	private Long learnStatus;
+	/** 失败原因 */
+	@Excel(name = "失败原因")
+	@ApiModelProperty("失败原因")
+	private Long reason;
 }

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

@@ -85,10 +85,14 @@ public class ClassGradeVo {
 	@Excel(name = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
-	/** 官方账号开通 */
-	@Excel(name = "官方账号开通")
-	@ApiModelProperty("官方账号开通")
+	/** 官方账号开通（有接口） */
+	@Excel(name = "官方账号开通（有接口）")
+	@ApiModelProperty("官方账号开通（有接口）")
 	private Long interfaceAccountId;
+	/** 官方账号开通（无接口） */
+	@Excel(name = "官方账号开通（无接口）")
+	@ApiModelProperty("官方账号开通（无接口）")
+	private Long noInterfaceAccountId;
 	/** 学时推送 */
 	@Excel(name = "学时推送")
 	@ApiModelProperty("学时推送")

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

@@ -0,0 +1,67 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.zhongzheng.modules.user.vo.UserUpdateVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+/**
+ * 学员记录视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("学员视图对象")
+public class StudyAccountStatusExportVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 订单编号 */
+	@Excel(name = "订单编号")
+	@ApiModelProperty("订单编号")
+	private String orderSn;
+
+	/** 学员姓名 */
+	@Excel(name = "学员姓名")
+	@ApiModelProperty("学员姓名")
+	private String realName;
+
+
+	/** 学员身份证 */
+	@Excel(name = "学员身份证")
+	@ApiModelProperty("学员身份证")
+	private String idCard;
+
+	/** 学员电话 */
+	@Excel(name = "学员电话")
+	@ApiModelProperty("学员电话")
+	private String telPhone;
+
+	/** 专业名称 */
+	@Excel(name = "专业名称")
+	@ApiModelProperty("专业名称")
+	private String categoryName;
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+
+	/** 官方学习账号标记状态 0未开通 1已开通 2标记失败 */
+	@ApiModelProperty("官方学习账号标记状态 0未开通 1已开通 2标记失败")
+	private Long learnStatus;
+
+	/** 学习完成状态 0 未学完 1已学完 */
+	@ApiModelProperty("学习完成状态 0 未学完 1已学完")
+	private Long finishStatus;
+
+}

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

@@ -0,0 +1,68 @@
+package com.zhongzheng.modules.grade.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 学习账号标记视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("学习账号标记视图对象")
+public class StudyAccountStatusVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 业务层次ID */
+	@Excel(name = "业务层次ID")
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+	/** 业务层次名称 */
+	@Excel(name = "业务层次名称")
+	@ApiModelProperty("业务层次名称")
+	private String businessName;
+	/** 未配置班级数量 */
+	@Excel(name = "未配置班级数量")
+	@ApiModelProperty("未配置班级数量")
+	private int notConfiguredNum;
+	/** 有接口班级数量 */
+	@Excel(name = "有接口班级数量")
+	@ApiModelProperty("有接口班级数量")
+	private int interfaceNum;
+	/** 无接口班级数量 */
+	@Excel(name = "无接口班级数量")
+	@ApiModelProperty("无接口班级数量")
+	private int noInterfaceNum;
+	/** 所有班级人数 */
+	@Excel(name = "所有班级人数")
+	@ApiModelProperty("所有班级人数")
+	private int userNum;
+	/** 账号已开通数量 */
+	@Excel(name = "账号已开通数量")
+	@ApiModelProperty("账号已开通数量")
+	private int openNum;
+	/** 账号未开通数量 */
+	@Excel(name = "账号未开通数量")
+	@ApiModelProperty("账号未开通数量")
+	private int noOpenNum;
+	/** 账号标记失败数量 */
+	@Excel(name = "账号标记失败数量")
+	@ApiModelProperty("账号标记失败数量")
+	private int failNum;
+	/** 已学完数量 */
+	@Excel(name = "已学完数量")
+	@ApiModelProperty("已学完数量")
+	private int finishNum;
+	/** 未学完数量 */
+	@Excel(name = "未学完数量")
+	@ApiModelProperty("未学完数量")
+	private int noFinishNum;
+}

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

@@ -154,6 +154,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="rebuyOrderGoodsId" column="rebuy_order_goods_id"/>
         <result property="serviceStartTime" column="service_start_time"/>
         <result property="serviceEndTime" column="service_end_time"/>
+        <result property="goodsName" column="goods_name"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="categoryName" column="category_name"/>
     </resultMap>
 
 
@@ -347,13 +350,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         og.order_goods_id,
         og.rebuy_order_goods_id,
         og.service_start_time,
-        og.service_end_time
+        og.service_end_time,
+        g.goods_name,
+        og.order_sn,
+        m.category_name
         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
         where 1=1
         and cgu.`status` =1
         <if test="gradeId != null and gradeId !='' ">
@@ -378,6 +385,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="studyCountMore != null and studyCountMore == 0 ">
             AND og.study_count = 0
         </if>
+        <if test="realname != null and realname != ''">
+            AND cgu.realname like concat('%', #{realname}, '%')
+        </if>
+        <if test="idCard != null and idCard != ''">
+            AND u.id_card = #{idCard}
+        </if>
+        <if test="orderSn != null and orderSn != ''">
+            AND og.order_sn = #{orderSn}
+        </if>
+        <if test="goodsName != null and goodsName != ''">
+            AND g.goods_name like concat('%', #{goodsName}, '%')
+        </if>
+        <if test="searchStartTime != null and searchStartTime != ''">
+            AND cgu.create_time &gt; #{searchStartTime}
+        </if>
+        <if test="searchEndTime != null and searchEndTime != ''">
+            AND cgu.create_time &lt; #{searchEndTime}
+        </if>
+        <if test="finishStatus != null and finishStatus != ''">
+            AND cgu.finish_status = #{finishStatus}
+        </if>
+        <if test="learnStatus != null and learnStatus != ''">
+            AND cgu.learn_status = #{learnStatus}
+        </if>
+        <if test="businessId != null and businessId != ''">
+            AND g.business_id = #{businessId}
+        </if>
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND g.education_type_id = #{educationTypeId}
+        </if>
+        <if test="interfaceAccountId != null and interfaceAccountId != ''">
+            AND cg.interface_account_id is not null
+        </if>
+        <if test="noInterfaceAccountId != null and noInterfaceAccountId != ''">
+            AND cg.no_interface_account_id is not null
+        </if>
         order by user_info_status desc ,user_status desc ,cgu.id desc
     </select>
 
@@ -533,6 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and `status` = 1
     </select>
 
+
     <select id="getConsoleGradeList" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultMap="ClassGradeVoResult">
         SELECT
         cg.grade_id,cg.class_status
@@ -551,4 +595,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND #{endTime} >= cg.create_time
         </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
+        <if test="businessId != null and businessId !=''">
+            AND g.business_id = #{businessId}
+        </if>
+
+    </select>
 </mapper>

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

@@ -55,6 +55,9 @@
         <result property="periodStatus" column="period_status"/>
         <result property="periodStatusNum" column="period_status_num"/>
         <result property="periodIngTime" column="period_ing_time"/>
+        <result property="finishStatus" column="finish_status"/>
+        <result property="learnStatus" column="learn_status"/>
+        <result property="reason" column="reason"/>
     </resultMap>