change %!s(int64=4) %!d(string=hai) anos
pai
achega
03b8c87143

+ 49 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/activity/ActivityGradeController.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.controller.activity;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.activity.bo.ActivityGradeAddBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradeEditBo;
+import com.zhongzheng.modules.activity.bo.ActivityGradeQueryBo;
+import com.zhongzheng.modules.activity.service.IActivityGradeService;
+import com.zhongzheng.modules.activity.vo.ActivityGradeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 等级积分Controller
+ * 
+ * @author change
+ * @date 2021-05-19
+ */
+@Api(value = "等级控制器", tags = {"等级管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/grade")
+public class ActivityGradeController extends BaseController {
+
+    private final IActivityGradeService iActivityGradeService;
+
+    /**
+     * 查询等级积分列表
+     */
+    @ApiOperation("查询等级管理列表")
+    @PreAuthorize("@ss.hasPermi('system:grade:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ActivityGradeVo> list(ActivityGradeQueryBo bo) {
+        startPage();
+        List<ActivityGradeVo> list = iActivityGradeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+}

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserBankRecordServiceImpl.java

@@ -81,6 +81,7 @@ public class UserBankRecordServiceImpl extends ServiceImpl<UserBankRecordMapper,
 
         //模拟考试获得用户积分
 
+
         if(this.save(add)){
             Long recordId =  add.getRecordId();
             for(UserBankQuestionRecordAddBo item : bo.getAnswerList()){

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java

@@ -785,6 +785,9 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         //获得当前课程最近一个考试计划  考生考生计划或者最近考试计划
         CoursePlanVo coursePlanVo = baseMapper.selectByCourse(bo);
         ExamArrangementTimeVo examArrangementTimeVo = baseMapper.selectByExam(coursePlanVo.getCategoryId());
+        if (examArrangementTimeVo == null){
+            throw new IllegalArgumentException("当前课程无考试时间");
+        }
         userPlanVo.setExamDate(examArrangementTimeVo.getStartTime());
         //最近考试时间七天前到现在的天数,学习视频时长
         Date date1 = new Date(examArrangementTimeVo.getStartTime()*1000L);