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

@@ -509,9 +509,9 @@ public class ClassGradeController extends BaseController {
     }
 
     /**
-     * 导出资料审核列表
+     * 导出学习账号标记列表
      */
-    @ApiOperation("导出学员学时列表")
+    @ApiOperation("导出学习账号标记列表")
     @PreAuthorize("@ss.hasPermi('system:profile:export')")
     @Log(title = "导出学员学时列表", businessType = BusinessType.EXPORT)
     @GetMapping("/exportStudyAccount")

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

@@ -218,23 +218,23 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	 * 学员姓名
 	 */
 	@ApiModelProperty("学员姓名")
-	private Long realName;
+	private String realName;
 
 	/**
 	 * 学员身份证
 	 */
 	@ApiModelProperty("学员身份证")
-	private Long idCard;
+	private String idCard;
 
 	/**
 	 * 订单编号
 	 */
 	@ApiModelProperty("订单编号")
-	private Long orderSn;
+	private String orderSn;
 
 	/**
 	 * 商品名称
 	 */
 	@ApiModelProperty("商品名称")
-	private Long goodsName;
+	private String goodsName;
 }

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

@@ -82,8 +82,8 @@ public class ClassGradeStudentVo {
 	@ApiModelProperty("学时审批状态 0 未通过 1通过 2待审核")
 	private Long periodStatus;
 
-	/** 结业状态 0 未结业 1结业 */
-	@ApiModelProperty("结业状态 0 未结业 1结业")
+	/** 学习完成状态 0 未学完 1学完 */
+	@ApiModelProperty("学习完成状态 0 未学完 1学完")
 	private Long finishStatus;
 
 	/** 官方推送状态 1是 0否 */

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"/>