Skip to content

E
exam-project
Commit a7491c75 by wangxin
Options

首页滚动提示

parent cc3ee936
Showing with 422 additions and 0 deletions
cloud-exam-api/src/main/java/com/yizhi/exam/application/feign/MyExamClient.java
......@@ -11,6 +11,7 @@
package com.yizhi.exam.application.feign;
import com.yizhi.exam.application.vo.MyExamParameterVO;
import com.yizhi.exam.application.vo.MyExamVO;
import com.yizhi.exam.application.vo.exam.MyExamPageVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -33,6 +34,16 @@ public interface MyExamClient {
@PostMapping("/api/exam/list")
MyExamPageVO getMyExamList(@RequestBody MyExamParameterVO myExamParameterVO);
@PostMapping("/api/exam/list1")
MyExamPageVO getMyExamListNew(@RequestBody MyExamParameterVO myExamParameterVO);
/**
* 获取4天内创建的所有考试信息（不用分页）
* @param myExamParameterVO
* @return
*/
@PostMapping("/api/exam/listFour")
List<MyExamVO> getMyExamListFour(@RequestBody MyExamParameterVO myExamParameterVO);
/**
* pc端我的考试列表
......
cloud-exam-api/src/main/java/com/yizhi/exam/application/vo/MyExamVO.java
......@@ -64,4 +64,10 @@ public class MyExamVO {
@ApiModelProperty(value = "考试logo图片")
private String logoImg;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "创建人ID")
private Long createById;
@ApiModelProperty(value = "创建人姓名")
private String createByName;
}
cloud-exam/src/main/java/com/yizhi/application/controller/api/MyExamController.java
......@@ -54,6 +54,47 @@ public class MyExamController {
}
/**
* 我的考试
*
* @param myExamParameterVO
* @return
*/
@PostMapping("/list1")
public MyExamPageVO getMyExamList1(@RequestBody MyExamParameterVO myExamParameterVO) {
try {
MyExamPageVO myExamPageVO = new MyExamPageVO();
/*Map<String,Integer> page=new HashMap<String,Integer>();
page.put("pageSize",myExamParameterVO.getPageSize());
page.put("pageNo",myExamParameterVO.getPageNo());*/
List<MyExamVO> myExamVOS = iExamService.MyExam1(myExamParameterVO);
/* page.put("pageTotal",iExamService.selectTotal(myExamParameterVO));
map.put("list",myExamVOS);
map.put("page",page);*/
myExamPageVO.setExamVOS(myExamVOS);
myExamPageVO.setPageTotal(iExamService.selectTotal1(myExamParameterVO));
return myExamPageVO;
} catch (Exception e) {
LOG.error("", e);
e.printStackTrace();
return null;
}
}
/**
* 我的考试
*
* @param myExamParameterVO
* @return
*/
@PostMapping("/listFour")
public List<MyExamVO> getMyExamlistFour(@RequestBody MyExamParameterVO myExamParameterVO) {
return iExamService.MyExamFour(myExamParameterVO);
}
/**
* pc端我的考试列表
*
* @param myExamParameterVO
......
cloud-exam/src/main/java/com/yizhi/application/mapper/ExamMapper.java
......@@ -52,11 +52,26 @@ public interface ExamMapper extends BaseMapper<Exam> {
List<MyExamVO> selectMyExamInfo(@Param("start") Integer start, @Param("end") Integer end, @Param("ids") List<Long> ids,
@Param("state") Integer state, @Param("accountId") Long accountId, @Param("siteId") Long siteId);
List<MyExamVO> selectMyExamInfo1(@Param("start") Integer start, @Param("end") Integer end, @Param("ids") List<Long> ids,
@Param("state") Integer state, @Param("accountId") Long accountId, @Param("siteId") Long siteId);
/**
* 获取4天内创建的所有考试信息（不用分页）
* @param ids
* @param state
* @param accountId
* @param siteId
* @return
*/
List<MyExamVO> selectMyExamInfoFour(@Param("ids") List<Long> ids,
@Param("state") Integer state, @Param("accountId") Long accountId, @Param("siteId") Long siteId);
@Select("select count(*) from tr_exam_answer where exam_id= #{examId} and account_id = #{accountId}")
Integer submitCount(@Param("examId") Long examId, @Param("accountId") Long accountId);
Integer selectTotalInfo(@Param("ids") List<Long> ids, @Param("state") Integer state, @Param("accountId") Long accountId, @Param("siteId") Long siteId);
Integer selectTotalInfo1(@Param("ids") List<Long> ids, @Param("state") Integer state, @Param("accountId") Long accountId, @Param("siteId") Long siteId);
List<MyExamVO> selectMyExamnation(@Param("start") Integer start, @Param("end") Integer end, @Param("accountId") Long accountId);
......
cloud-exam/src/main/java/com/yizhi/application/service/IExamService.java
......@@ -146,6 +146,15 @@ public interface IExamService extends IService<Exam> {
*/
List<MyExamVO> MyExam(MyExamParameterVO myExamParameterVO);
List<MyExamVO> MyExam1(MyExamParameterVO myExamParameterVO);
/**
* 获取4天内创建的所有考试信息（不用分页）
* @param myExamParameterVO
* @return
*/
List<MyExamVO> MyExamFour(MyExamParameterVO myExamParameterVO);
/**
* 得到exam
* @param examId
......@@ -170,6 +179,7 @@ public interface IExamService extends IService<Exam> {
ExamDetailsVO examDetail(Long examId,Long accountId);
Integer selectTotal(MyExamParameterVO myExamParameterVO);
Integer selectTotal1(MyExamParameterVO myExamParameterVO);
List<MyExamVO> selectMyExamnation(Integer pageNo, Integer pageSize,Long accountId);
......
cloud-exam/src/main/java/com/yizhi/application/service/impl/ExamServiceImpl.java
......@@ -168,6 +168,60 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, com.yizhi.applicati
return list;
}
@Override
public List<MyExamVO> MyExam1(MyExamParameterVO myExamParameterVO) {
Integer strat = (myExamParameterVO.getPageNo() - 1) * myExamParameterVO.getPageSize();
Integer end = myExamParameterVO.getPageSize();
List<Long> examIds = getMyVisableExam(myExamParameterVO.getIds(), myExamParameterVO.getSiteId());
if (!CollectionUtils.isEmpty(examIds)) {
myExamParameterVO.setIds(examIds);
}
//获取所有考试信息
//查询
Long siteId = myExamParameterVO.getSiteId();
Long accountId = myExamParameterVO.getAccountId();
List<MyExamVO> list = examMapper.selectMyExamInfo1(strat, end, examIds, myExamParameterVO.getState(), accountId, siteId);
if (myExamParameterVO.getState() != null && myExamParameterVO.getState() == 1) {
for (MyExamVO myExamVO : list) {
List<ExamOnlineReadOverVo> examOnlineReadOverVos = trExamOnlineReadOverMapper.selectStateList(myExamVO.getId(), myExamParameterVO.getAccountId());
if (examOnlineReadOverVos.size() > 0) {
for (ExamOnlineReadOverVo examOnlineReadOverVo : examOnlineReadOverVos) {
if (examOnlineReadOverVo.getState() == 1) {
myExamVO.setIsQualified(2 + "");
}
}
}
}
}
return list;
}
@Override
public List<MyExamVO> MyExamFour(MyExamParameterVO myExamParameterVO) {
List<Long> examIds = getMyVisableExam(myExamParameterVO.getIds(), myExamParameterVO.getSiteId());
if (!CollectionUtils.isEmpty(examIds)) {
myExamParameterVO.setIds(examIds);
}
//获取所有考试信息
//查询
Long siteId = myExamParameterVO.getSiteId();
Long accountId = myExamParameterVO.getAccountId();
List<MyExamVO> list = examMapper.selectMyExamInfoFour(examIds, myExamParameterVO.getState(), accountId, siteId);
if (myExamParameterVO.getState() != null && myExamParameterVO.getState() == 1) {
for (MyExamVO myExamVO : list) {
List<ExamOnlineReadOverVo> examOnlineReadOverVos = trExamOnlineReadOverMapper.selectStateList(myExamVO.getId(), myExamParameterVO.getAccountId());
if (examOnlineReadOverVos.size() > 0) {
for (ExamOnlineReadOverVo examOnlineReadOverVo : examOnlineReadOverVos) {
if (examOnlineReadOverVo.getState() == 1) {
myExamVO.setIsQualified(2 + "");
}
}
}
}
}
return list;
}
/**
* 考试策略 更新 保存, 预览
*/
......@@ -1154,6 +1208,10 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, com.yizhi.applicati
public Integer selectTotal(MyExamParameterVO myExamParameterVO) {
return examMapper.selectTotalInfo(myExamParameterVO.getIds(), myExamParameterVO.getState(), myExamParameterVO.getAccountId(), myExamParameterVO.getSiteId());
}
@Override
public Integer selectTotal1(MyExamParameterVO myExamParameterVO) {
return examMapper.selectTotalInfo1(myExamParameterVO.getIds(), myExamParameterVO.getState(), myExamParameterVO.getAccountId(), myExamParameterVO.getSiteId());
}
@Override
public List<MyExamVO> selectMyExamnation(Integer pageNo, Integer pageSize, Long accountId) {
......
cloud-exam/src/main/resources/mapper/ExamMapper.xml
......@@ -14,6 +14,9 @@
<result column="description" property="description"></result>
<result column="isQualified" property="isQualified"></result>
<result column="image" property="logoImg"></result>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="create_by_id" property="createById" jdbcType="BIGINT"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
</resultMap>
<!-- 通用查询结果列 -->
......@@ -174,6 +177,175 @@
limit #{start},#{end}
</if>
</select>
<select id="selectMyExamInfo1" resultMap="myExamResult">
<if test="state == 0">
select a.name as name ,a.start_time as startTime,a.end_time as endTime,a.id as id,
a.training_project_id as trainingProjectId,a.description as description,a.image
from exam a where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
and a.start_time>now() and a.state = 2
limit #{start},#{end}
</if>
<if test="state == 1">
SELECT DISTINCT a.name AS NAME,a.start_time AS startTime,
a.end_time AS endTime,a.id AS id,null AS trainingProjectId,a.description as description,a.create_time
FROM exam a
LEFT JOIN (select exam_id, account_id
FROM tr_exam_answer
WHERE account_id=#{accountId}
GROUP BY exam_id, account_id
) b ON a.id=b.exam_id and b.account_id=#{accountId}
where NOW()>=a.start_time AND a.end_time>=NOW() AND a.state = 2 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
and a.id not in(select exam_id from tr_exam_answer where account_id=#{accountId} and state in(1,2))
ORDER BY a.create_time desc
limit #{start},#{end}
</if>
<if test="state == 2">
select a.name as name ,a.start_time as startTime,a.end_time as endTime,a.id as id,
a.training_project_id as trainingProjectId,a.description as description,
(SELECT MAX(score) FROM tr_exam_answer b WHERE a.id=b.exam_id AND b.account_id=#{accountId} AND b.state=2) AS score,
a.qualified_score,
CASE WHEN NOW() > a.end_time THEN 7 ELSE
(SELECT CASE WHEN IFNULL(MAX(score),-1)=-1 THEN 0 ELSE CASE WHEN MAX(score)>=a.qualified_score THEN 6 ELSE 5 END END AS score FROM tr_exam_answer b WHERE a.id=b.exam_id AND b.account_id=#{accountId} AND b.state=2)
END AS handle,a.image
from exam a where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
AND a.state = 2
ORDER BY a.start_time desc,a.end_time desc
limit #{start},#{end}
</if>
<if test="state == null">
select a.name as name ,a.start_time as startTime,a.end_time as endTime,a.id as id,
a.training_project_id as trainingProjectId,a.description as description,
(SELECT MAX(score) FROM tr_exam_answer b WHERE a.id=b.exam_id AND b.account_id=#{accountId} AND b.state=2) AS score,
CASE WHEN NOW() > a.end_time THEN 7 ELSE
(SELECT CASE WHEN IFNULL(MAX(score),-1)=-1 THEN 0 ELSE CASE WHEN MAX(score)>=a.qualified_score THEN 6 ELSE 5 END END AS score FROM tr_exam_answer b WHERE a.id=b.exam_id AND b.account_id=#{accountId} AND b.state=2)
END AS handle,a.image
from exam a where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
AND a.state = 2
ORDER BY a.start_time desc,a.end_time desc
limit #{start},#{end}
</if>
</select>
<select id="selectMyExamInfoFour" resultMap="myExamResult">
<if test="state == 0">
select a.name as name ,a.start_time as startTime,a.end_time as endTime,a.id as id,
a.training_project_id as trainingProjectId,a.description as description,a.image,create_time, a.create_by_id, a.create_by_name
from exam a where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
and a.start_time>now() and a.state = 2 and DATE_SUB(NOW(), INTERVAL 4 DAY) &lt;= a.create_time
ORDER BY a.create_time desc
</if>
<if test="state == 1">
SELECT DISTINCT a.name AS NAME,a.start_time AS startTime,
a.end_time AS endTime,a.id AS id,null AS trainingProjectId,a.description as description,a.create_time, a.create_by_id, a.create_by_name
FROM exam a
LEFT JOIN (select exam_id, account_id
FROM tr_exam_answer
WHERE account_id=#{accountId}
GROUP BY exam_id, account_id
) b ON a.id=b.exam_id and b.account_id=#{accountId}
where NOW()>=a.start_time AND a.end_time>=NOW() AND a.state = 2 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
and a.id not in(select exam_id from tr_exam_answer where account_id=#{accountId} and state in(1,2))
and DATE_SUB(NOW(), INTERVAL 4 DAY) &lt;= a.create_time
ORDER BY a.create_time desc
</if>
<if test="state == 2">
select a.name as name ,a.start_time as startTime,a.end_time as endTime,a.id as id,
a.training_project_id as trainingProjectId,a.description as description,
(SELECT MAX(score) FROM tr_exam_answer b WHERE a.id=b.exam_id AND b.account_id=#{accountId} AND b.state=2) AS score,
a.qualified_score,
CASE WHEN NOW() > a.end_time THEN 7 ELSE
(SELECT CASE WHEN IFNULL(MAX(score),-1)=-1 THEN 0 ELSE CASE WHEN MAX(score)>=a.qualified_score THEN 6 ELSE 5 END END AS score FROM tr_exam_answer b WHERE a.id=b.exam_id AND b.account_id=#{accountId} AND b.state=2)
END AS handle,a.image,a.create_time, a.create_by_id, a.create_by_name
from exam a where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
AND a.state = 2 and DATE_SUB(NOW(), INTERVAL 4 DAY) &lt;= a.create_time
ORDER BY a.create_time desc
</if>
<if test="state == null">
select a.name as name ,a.start_time as startTime,a.end_time as endTime,a.id as id,
a.training_project_id as trainingProjectId,a.description as description,
(SELECT MAX(score) FROM tr_exam_answer b WHERE a.id=b.exam_id AND b.account_id=#{accountId} AND b.state=2) AS score,
CASE WHEN NOW() > a.end_time THEN 7 ELSE
(SELECT CASE WHEN IFNULL(MAX(score),-1)=-1 THEN 0 ELSE CASE WHEN MAX(score)>=a.qualified_score THEN 6 ELSE 5 END END AS score FROM tr_exam_answer b WHERE a.id=b.exam_id AND b.account_id=#{accountId} AND b.state=2)
END AS handle,a.image,a.create_time, a.create_by_id, a.create_by_name
from exam a where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
AND a.state = 2 and DATE_SUB(NOW(), INTERVAL 4 DAY) &lt;= a.create_time
ORDER BY a.create_time desc
</if>
</select>
<select id="selectTotalInfo" resultType="java.lang.Integer">
<if test="state == 0">
......@@ -238,6 +410,115 @@
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
AND a.state = 2
AND ((NOW() > a.end_time and a.id in(select x.id from exam x left join tr_exam_answer b on x.id = b.exam_id where b.account_id =
#{accountId} ))
or ( a.id in(select exam_id from
(select DISTINCT(exam_id) as exam_id,COUNT(exam_id) as count from tr_exam_answer
where account_id = #{accountId} and state = 2 group by exam_id,account_id)x
left join exam y on x.exam_id= y.id where count >= y.answer_num AND y.answer_num > 0 and y.state = 2
and NOW()>y.start_time and y.end_time > NOW()
))))b)
+
(select count(*) from(
SELECT a.name
FROM exam a
WHERE 1=1
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
and (now() > a.end_time)
and a.state = 2
and a.id not in(select x.id from exam x left join tr_exam_answer b on x.id = b.exam_id where b.account_id =
#{accountId}) and a.site_id = #{siteId}
)c)
from dual
</if>
<if test="state == null">
select COUNT(*) from(
select a.id
from exam a where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
and a.state = 2)x
</if>
</select>
<select id="selectTotalInfo1" resultType="java.lang.Integer">
<if test="state == 0">
select COUNT(*) from(
select a.id
from exam a where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
and a.start_time>now() and a.state = 2)x
</if>
<if test="state == 1">
SELECT COUNT(*) FROM (
SELECT DISTINCT a.id
FROM exam a
LEFT JOIN (
select exam_id, account_id
FROM tr_exam_answer
WHERE account_id=#{accountId}
GROUP BY exam_id, account_id
) b ON a.id=b.exam_id and b.account_id=#{accountId}
where NOW()>=a.start_time AND a.end_time>=NOW() AND a.state = 2 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
AND (a.id in(SELECT exam_id FROM tr_exam_answer WHERE account_id=#{accountId} AND state in(0,1)
) or (a.id not in(select exam_id from tr_exam_answer WHERE account_id=#{accountId})))
) b
</if>
<if test="state == 2">
select
(SELECT COUNT(*) from(
SELECT DISTINCT a.id
FROM exam a left join (select exam_id, account_id,MAX(state) AS state,MAX(score) AS score,MIN(submit_time)
AS submit_time,
training_project_id
FROM tr_exam_answer
WHERE account_id=#{accountId}
GROUP BY exam_id, account_id) b on a.id = b.exam_id and b.account_id = #{accountId}
where 1=1 and a.site_id = #{siteId}
<if test="ids!=null">
AND a.id IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="ids==null or ids.size()==0">
AND a.visible_range=1
</if>
AND a.state = 2
AND ((NOW() > a.end_time and a.id in(select x.id from exam x left join tr_exam_answer b on x.id = b.exam_id where b.account_id =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment