学时审核

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

@@ -19,7 +19,7 @@ public class ClassGradeUserEditBo {
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
-    private Long id;
+    private Long[] id;
 
     /** 学员ID */
     @ApiModelProperty("学员ID")
@@ -38,4 +38,29 @@ public class ClassGradeUserEditBo {
     private Long updateTime;
 
 
+    /** 来源 1订单购买 */
+    @ApiModelProperty("来源 1订单购买")
+    private Integer fromType;
+
+    /** 学时审批状态 0 未通过 1通过 2待审核 */
+    @ApiModelProperty("学时审批状态 0 未通过 1通过 2待审核")
+    private Integer periodStatus;
+
+    /** 结业状态 0 未结业 1结业 */
+    @ApiModelProperty("结业状态 0 未结业 1结业")
+    private Integer finishStatus;
+
+    /** 订单商品id */
+    @ApiModelProperty("订单商品id")
+    private Long orderGoodsId;
+
+    /** 官方推送状态 1是 0否 */
+    @ApiModelProperty("官方推送状态 1是 0否")
+    private Integer officialStatus;
+
+    /** 官方学习账号推送状态 0否 1是 */
+    @ApiModelProperty("官方学习账号推送状态 0否 1是")
+    private Integer learnStatus;
+
+
 }

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

@@ -50,4 +50,22 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	/** 1 进入 0移除 */
 	@ApiModelProperty("1 进入 0移除")
 	private List<Integer> status;
+
+	@ApiModelProperty("来源 1订单购买")
+	private Integer fromType;
+	/** 学时审批状态 0 未通过 1通过 2待审核 */
+	@ApiModelProperty("学时审批状态 0 未通过 1通过 2待审核")
+	private Integer periodStatus;
+	/** 订单商品id */
+	@ApiModelProperty("订单商品id")
+	private Long orderGoodsId;
+	/** 结业状态 0 未结业 1结业 */
+	@ApiModelProperty("结业状态 0 未结业 1结业")
+	private Integer finishStatus;
+	/** 官方推送状态 1是 0否 */
+	@ApiModelProperty("官方推送状态 1是 0否")
+	private Integer officialStatus;
+	/** 官方学习账号推送状态 0否 1是 */
+	@ApiModelProperty("官方学习账号推送状态 0否 1是")
+	private Integer learnStatus;
 }

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

@@ -22,7 +22,6 @@ import com.zhongzheng.common.annotation.Excel;
 public class ClassGradeUser implements Serializable {
 
 private static final long serialVersionUID=1L;
-
     /** $column.columnComment */
     @TableId(value = "id")
     private Long id;
@@ -38,12 +37,20 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-
     /** 指派操作者 */
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
     /** 来源 1订单购买 */
     private Integer fromType;
+    /** 学时审批状态 0 未通过 1通过 2待审核 */
+    private Integer periodStatus;
     /** 订单商品id */
     private Long orderGoodsId;
+    /** 结业状态 0 未结业 1结业 */
+    private Integer finishStatus;
+    /** 官方推送状态 1是 0否 */
+    private Integer officialStatus;
+    /** 官方学习账号推送状态 0否 1是 */
+    private Integer learnStatus;
 }
+

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

@@ -84,10 +84,20 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
 
     @Override
     public Boolean updateByEditBo(ClassGradeUserEditBo bo) {
-        ClassGradeUser update = BeanUtil.toBean(bo, ClassGradeUser.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
+        for (Long aLong : bo.getId()) {
+            ClassGradeUser update = BeanUtil.toBean(bo, ClassGradeUser.class);
+            update.setUpdateTime(DateUtils.getNowTime());
+            update.setId(aLong);
+            if (bo.getStatus() != null) {
+                update.setStatus(bo.getStatus());
+            }
+            if (bo.getStatus() != null) {
+                update.setFinishStatus(bo.getFinishStatus());
+            }
+            this.updateById(update);
+        }
+
+        return true;
     }
 
     /**

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

@@ -99,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeStudentVo" id="ClassGradeStudentVo">
         <result property="userId" column="user_id"/>
+        <result property="id" column="id"/>
         <result property="gradeId" column="grade_id"/>
         <result property="studentCode" column="student_code"/>
         <result property="realName" column="realname"/>
@@ -238,6 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="listGrade"  parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo" resultMap="ClassGradeStudentVo">
         SELECT
+        cgu.id,
         u.student_code,
         u.user_id,
         cgu.`status`,