瀏覽代碼

进入班级

change 3 年之前
父節點
當前提交
0462bcf983

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

@@ -102,7 +102,7 @@ public class ClassGradeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('grade:grade:edit')")
     @Log(title = "班级", businessType = BusinessType.INSERT)
     @PostMapping("/addUserGrade")
-    public AjaxResult<Void> editUserGrade(@RequestBody ClassGradeUserAddBo bo) {
+    public AjaxResult<Void> editUserGrade(@RequestBody ClassGradeUserAddQueryBo bo) {
         return toAjax(iClassGradeService.editUserGrade(bo) ? 1 : 0);
     }
 

+ 53 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserAddQueryBo.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.grade.bo;
+
+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;
+
+/**
+ * 学员记录分页查询对象 class_grade_user
+ *
+ * @author ruoyi
+ * @date 2021-11-10
+ */
+@Data
+@ApiModel("学员记录分页查询对象")
+public class ClassGradeUserAddQueryBo {
+
+
+	/** 学员ID */
+	@ApiModelProperty("学员ID")
+	private Long[] userId;
+
+	/** 商品id */
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+	/** 班级id */
+	@ApiModelProperty("班级id")
+	private Long gradeId;
+	/** 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;
+}

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

@@ -51,5 +51,5 @@ public interface IClassGradeService extends IService<ClassGrade> {
 
     List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo);
 
-    boolean editUserGrade(ClassGradeUserAddBo bo);
+    boolean editUserGrade(ClassGradeUserAddQueryBo bo);
 }

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

@@ -206,12 +206,19 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     }
 
     @Override
-    public boolean editUserGrade(ClassGradeUserAddBo bo) {
-        bo.setCreateBy(SecurityUtils.getUsername());
-        bo.setStatus(1);
-        bo.setCreateTime(DateUtils.getNowTime());
-        bo.setUpdateTime(DateUtils.getNowTime());
-        bo.setFromType(2);
-        return iClassGradeUserService.insertByAddBo(bo);
+    public boolean editUserGrade(ClassGradeUserAddQueryBo bo) {
+        for (Long aLong : bo.getUserId()) {
+            ClassGradeUserAddBo classGradeUserAddBo = new ClassGradeUserAddBo();
+            classGradeUserAddBo.setUserId(aLong);
+            classGradeUserAddBo.setGradeId(bo.getGradeId());
+            classGradeUserAddBo.setCreateBy(SecurityUtils.getUsername());
+            classGradeUserAddBo.setStatus(1);
+            classGradeUserAddBo.setCreateTime(DateUtils.getNowTime());
+            classGradeUserAddBo.setUpdateTime(DateUtils.getNowTime());
+            classGradeUserAddBo.setFromType(2);
+            iClassGradeUserService.insertByAddBo(classGradeUserAddBo);
+        }
+
+        return true;
     }
 }

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

@@ -269,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="gradeId != null and gradeId !='' ">
           and cgu.grade_id = #{gradeId}
         </if>
-        order by cgu.update_time
+        order by cgu.create_time desc
     </select>