Browse Source

进入班级

change 3 years ago
parent
commit
a90842f7fa

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

@@ -95,6 +95,19 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 学员进入新的班级
+     */
+    @ApiOperation("学员进入新的班级")
+    @PreAuthorize("@ss.hasPermi('grade:grade:edit')")
+    @Log(title = "班级", businessType = BusinessType.INSERT)
+    @PostMapping("/addUserGrade")
+    public AjaxResult<Void> editUserGrade(@RequestBody ClassGradeUserAddBo bo) {
+        return toAjax(iClassGradeService.editUserGrade(bo) ? 1 : 0);
+    }
+
+
+
     /**
      * 查询学时学员记录列表
      */

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamKnowledgeServiceImpl.java

@@ -83,8 +83,9 @@ public class ExamKnowledgeServiceImpl extends ServiceImpl<ExamKnowledgeMapper, E
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(ExamKnowledgeAddBo bo) {
         for (String s : bo.getKnowledgeName()) {
-            ExamKnowledge examKnowledge = BeanUtil.toBean(bo, ExamKnowledge.class);
+            ExamKnowledge examKnowledge = new ExamKnowledge();
             examKnowledge.setKnowledgeName(s);
+            examKnowledge.setStatus(bo.getStatus());
             examKnowledge.setEncoder(ServletUtils.getEncoded("ZSD"));
             examKnowledge.setCreateTime(DateUtils.getNowTime());
             examKnowledge.setUpdateTime(DateUtils.getNowTime());

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

@@ -1,5 +1,7 @@
 package com.zhongzheng.modules.grade.bo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -33,4 +35,26 @@ public class ClassGradeUserAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+
+    /** 指派操作者 */
+    @ApiModelProperty("指派操作者")
+    private String createBy;
+    /** 来源 1订单购买 2后台进入 */
+    @ApiModelProperty("来源 1订单购买 2后台进入")
+    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/domain/ClassGradeUser.java

@@ -40,7 +40,7 @@ private static final long serialVersionUID=1L;
     /** 指派操作者 */
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
-    /** 来源 1订单购买 */
+    /** 来源 1订单购买 2后台进入 */
     private Integer fromType;
     /** 学时审批状态 0 未通过 1通过 2待审核 */
     private Integer periodStatus;

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

@@ -1,12 +1,9 @@
 package com.zhongzheng.modules.grade.service;
 
-import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
+import com.zhongzheng.modules.grade.bo.*;
 import com.zhongzheng.modules.grade.domain.ClassGrade;
 import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
-import com.zhongzheng.modules.grade.bo.ClassGradeQueryBo;
-import com.zhongzheng.modules.grade.bo.ClassGradeAddBo;
-import com.zhongzheng.modules.grade.bo.ClassGradeEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Collection;
@@ -53,4 +50,6 @@ public interface IClassGradeService extends IService<ClassGrade> {
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     List<ClassGradeStudentVo> listGrade(ClassGradeUserQueryBo bo);
+
+    boolean editUserGrade(ClassGradeUserAddBo bo);
 }

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

@@ -14,6 +14,7 @@ import com.zhongzheng.modules.grade.domain.ClassGradeGoods;
 import com.zhongzheng.modules.grade.domain.ClassGradeSys;
 import com.zhongzheng.modules.grade.service.IClassGradeGoodsService;
 import com.zhongzheng.modules.grade.service.IClassGradeSysService;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeStudentVo;
 import com.zhongzheng.modules.system.domain.SysConfig;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
@@ -57,6 +58,9 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
     @Autowired
     private IUserStudyRecordService iUserStudyRecordService;
 
+    @Autowired
+    private IClassGradeUserService iClassGradeUserService;
+
     @Override
     public ClassGradeVo queryById(Long gradeId){
         ClassGradeQueryBo classGradeQueryBo = new ClassGradeQueryBo();
@@ -200,4 +204,14 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         }
         return classGradeStudentVos;
     }
+
+    @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);
+    }
 }