Sfoglia il codice sorgente

课程考试添加

pans 6 mesi fa
parent
commit
ab64439d7d

+ 1 - 3
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/TExamController.java

@@ -22,7 +22,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.exam.base.BaseApiController;
 import vip.xiaonuo.exam.domain.exam.TExamIdParam;
@@ -60,8 +59,7 @@ public class TExamController extends BaseApiController {
     @SaCheckPermission("/api/admin/s_exam/page")
     @GetMapping("/page")
     public CommonResult<Page<TExamVo>> page(TExamPageParam tExamPageParam) {
-         tExamPageParam.setUserId(StpLoginUserUtil.getLoginUser().getId());
-        return CommonResult.data(tExamService.page(tExamPageParam));
+        return CommonResult.data(tExamService.studentPage(tExamPageParam));
     }
 
     /**

+ 4 - 0
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/domain/exam/TExamPageParam.java

@@ -86,4 +86,8 @@ public class TExamPageParam {
 
     @ApiModelProperty(value = "学期id", position = 15)
     private String semesterId;
+
+    private String createUser;
+
+
 }

+ 2 - 0
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/mapper/TExamMapper.java

@@ -34,4 +34,6 @@ public interface TExamMapper extends BaseMapper<TExam> {
     TExamVo detail(String id);
 
     List<TExamPaperStastic> stasticByPaperId(String paperId);
+
+    Page<TExamVo> queryStudentList(Page<Object> objectPage, TExamPageParam tExamPageParam);
 }

+ 48 - 0
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/mapper/mapping/TExamMapper.xml

@@ -37,11 +37,59 @@
         <if test="tExamPageParam.examType != null and tExamPageParam.examType != ''">
             and a.EXAM_TYPE = #{tExamPageParam.examType}
         </if>
+        <if test="tExamPageParam.createUser != null and tExamPageParam.createUser != ''">
+            and a.CREATE_USER = #{tExamPageParam.createUser}
+        </if>
         and  a.DELETED=0
     </where>
     order by a.CREATE_TIME desc
    </select>
 
+
+    <select id="queryStudentList" resultType="vip.xiaonuo.exam.vo.TExamVo">
+        SELECT
+        a.ID id,
+        a.EXAM_NAME examName,
+        a.STUDENT_IDS studentIds,
+        a.EXAM_STATUS examStatus,
+        a.CREATE_TIME createTime,
+        a.CREATE_USER createUser,
+        a.UPDATE_TIME updateTime,
+        a.CHAPTER_ID chapterId,
+        a.START_TIME startTime,
+        a.END_TIME endTime,
+        a.PAPER_ID paperId,
+        a.DELETED deleted,
+        a.START_JOB_ID startJobId,
+        a.END_JOB_ID endJobId,
+        a.EXAM_TYPE examType,
+        a.SEMESTER_ID semesterId,
+        c.name semesterName,
+        a.course_id courseId
+        FROM
+        ONLINEEDU.T_EXAM a
+        LEFT JOIN  SEMESTER c ON a.SEMESTER_ID =c.ID
+        <where>
+            <if test="tExamPageParam.examName != null and tExamPageParam.examName != ''">
+                a.EXAM_NAME like '%'||#{tExamPageParam.examName}||'%'
+            </if>
+            <if test="tExamPageParam.examStatus != null and tExamPageParam.examStatus != ''">
+                and a.EXAM_STATUS = #{tExamPageParam.examStatus}
+            </if>
+            <if test="tExamPageParam.semesterId != null and tExamPageParam.semesterId != ''">
+                and a.SEMESTER_ID = #{tExamPageParam.semesterId}
+            </if>
+            <if test="tExamPageParam.examType != null and tExamPageParam.examType != ''">
+                and a.EXAM_TYPE = #{tExamPageParam.examType}
+            </if>
+            <if test="tExamPageParam.createUser != null and tExamPageParam.createUser != ''">
+                and a.STUDENT_IDS like concat('%',#{tExamPageParam.createUser},'%')
+            </if>
+            and  a.DELETED=0
+        </where>
+        order by a.CREATE_TIME desc
+    </select>
+
     <select id="detail" resultType="vip.xiaonuo.exam.vo.TExamVo">
         SELECT
             a.ID id,

+ 2 - 0
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/TExamService.java

@@ -81,4 +81,6 @@ public interface TExamService extends IService<TExam> {
     TExam queryEntity(String id);
 
     List<TExamPaperStastic> stasticByPaperId(String paperId);
+
+    Page<TExamVo> studentPage(TExamPageParam tExamPageParam);
 }

+ 16 - 0
snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/TExamServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.dev.api.DevJobApi;
@@ -84,10 +85,24 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
 
     @Override
     public Page<TExamVo> page(TExamPageParam tExamPageParam) {
+        if(!StpLoginUserUtil.getLoginUser().getAccount().equals("superAdmin")){
+            tExamPageParam.setCreateUser(StpLoginUserUtil.getLoginUser().getId());
+        }
         Page<TExamVo> page = tExamMapper.queryList(CommonPageRequest.defaultPage(), tExamPageParam);
         return page;
     }
 
+
+    @Override
+    public Page<TExamVo> studentPage(TExamPageParam tExamPageParam) {
+        if(!StpLoginUserUtil.getLoginUser().getAccount().equals("superAdmin")){
+            tExamPageParam.setCreateUser(StpLoginUserUtil.getLoginUser().getAccount());
+        }
+        Page<TExamVo> page = tExamMapper.queryStudentList(CommonPageRequest.defaultPage(), tExamPageParam);
+        return page;
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(TExamAddParam tExamAddParam) {
@@ -279,6 +294,7 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
     }
 
 
+
     public TExam addJob(TExam tExam, String startOnEnd){
         JSONObject jobParam = new JSONObject();
         jobParam.put("name", tExam.getId()+"-"+tExam.getExamName()+"-"+tExam.getPaperId());