考试科目和定向科目

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontStudentController.java

@@ -6,11 +6,15 @@ import com.google.common.collect.Lists;
 import com.ruoyi.common.core.content.VistorContextHolder;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.AjaxResult2;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.ExamType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.dz.domain.DzControl;
+import com.ruoyi.dz.domain.DzSubject;
 import com.ruoyi.dz.service.IDzControlService;
+import com.ruoyi.dz.service.IDzSubjectService;
 import com.ruoyi.ie.domain.AEnrollUniversity;
 import com.ruoyi.ie.domain.AMarjorPlan;
 import com.ruoyi.ie.service.IAEnrollUniversityService;
@@ -51,9 +55,10 @@ public class FrontStudentController extends BaseController {
     private final IAMarjorPlanService marjorPlanService;
     private final ILearnDirectedKnowledgeService learnDirectedKnowledgeService;
     private final StudentService studentService;
+    private final IDzSubjectService dzSubjectService;
 
     public FrontStudentController(IDzControlService dzControlService, IAEnrollUniversityService universityService, ISyMajorService syMajorService, ISysUserService sysUserService,
-                                  ILearnPlanService learnPlanService, ILearnPlanStudyService learnPlanStudyService, IAMarjorPlanService marjorPlanService, ILearnDirectedKnowledgeService learnDirectedKnowledgeService, StudentService studentService) {
+                                  ILearnPlanService learnPlanService, ILearnPlanStudyService learnPlanStudyService, IAMarjorPlanService marjorPlanService, ILearnDirectedKnowledgeService learnDirectedKnowledgeService, StudentService studentService, IDzSubjectService dzSubjectService) {
         this.dzControlService = dzControlService;
         this.universityService = universityService;
         this.syMajorService = syMajorService;
@@ -63,6 +68,18 @@ public class FrontStudentController extends BaseController {
         this.marjorPlanService = marjorPlanService;
         this.learnDirectedKnowledgeService = learnDirectedKnowledgeService;
         this.studentService = studentService;
+        this.dzSubjectService = dzSubjectService;
+    }
+
+    @ApiOperation("02 考试科目")
+    @GetMapping(value = "subject")
+    public AjaxResult2<List<DzSubject>> getSubject() {
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        DzSubject sCond = new DzSubject();
+        sCond.setLocations(sysUser.getLocation());
+        sCond.setExamTypes(sysUser.getExamType().name());
+        List<DzSubject> list = dzSubjectService.selectDzSubjectList(sCond);
+        return AjaxResult2.success(list);
     }
 
     @ApiOperation("试卷作业统计")
@@ -120,6 +137,21 @@ public class FrontStudentController extends BaseController {
         return CollectionUtils.isNotEmpty(result) ? AjaxResult.success(result.get(0)) : AjaxResult.error("无计划");
     }
 
+    @ApiOperation("03 查询学生定向院校")
+    @GetMapping(value = "simulated/info")
+    public AjaxResult getSimulateInfo() {
+        JSONObject result = new JSONObject();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        if(ExamType.OHS.name().equals(user.getUserType())) {
+            result.put("subjects", Lists.newArrayList("职业技能", "语数外"));
+        } else {
+            result.put("subjects", Lists.newArrayList("职业技能"));
+        }
+        SysUser sysUser = sysUserService.selectUserById(SecurityUtils.getUserId());
+        result.put("evalCount", sysUser.getEvalCount());
+        return AjaxResult.success(result);
+    }
+
     @ApiOperation("03 查询学生定向院校")
     @GetMapping(value = "directed/school")
     public AjaxResult getDirectionSchools() {

ie-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java

@@ -159,6 +159,7 @@ public class SysRegisterService
                 if(!CardStatus.Paid.getVal().equals(card.getStatus())) {
                     throw new RuntimeException("无效卡");
                 }
+                user.setEvalCount(1);
                 user.setCardId(card.getCardId());
                 user.setRegStatus(UserRegStatus.Student);
                 card.setStatus(CardStatus.Active.getVal());

ie-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -134,6 +134,9 @@ public class SysUser extends BaseEntity
 
     private String directedStudy;
 
+    @Excel(name = "模拟做卷次数")
+    private Integer evalCount;
+
     private Long cardId;
 
 
@@ -475,6 +478,13 @@ public class SysUser extends BaseEntity
         this.cardId = cardId;
     }
 
+    public Integer getEvalCount() {
+        return evalCount;
+    }
+
+    public void setEvalCount(Integer evalCount) {
+        this.evalCount = evalCount;
+    }
 
     public String getCode() {
         return String.valueOf(userId);

ie-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="scores"        column="scores" typeHandler="com.ruoyi.system.handlers.SubjectScoreTypeHandler"        />
 		<result property="selectSubject" column="select_subject"       />
 		<result property="directedStudy" column="directed_study"       />
+		<result property="evalCount"     column="eval_count"       />
 		<result property="cardId"        column="card_id"         />
         <result property="status"        column="status"          />
         <result property="delFlag"       column="del_flag"        />
@@ -60,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
-		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.select_subject,u.directed_study,u.card_id,
+		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.select_subject,u.directed_study,u.eval_count,u.card_id,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, u.user_type, u.user_type_id
         from sys_user u