Commit 02bf23fc authored by 刘帅阳's avatar 刘帅阳

修改bug

parent 290581d2
...@@ -108,5 +108,14 @@ public class PcManage extends CyIdIncreEntity<PcManage> { ...@@ -108,5 +108,14 @@ public class PcManage extends CyIdIncreEntity<PcManage> {
@TableField(exist = false) @TableField(exist = false)
private String endTime; private String endTime;
/**
* 分页
* */
@TableField(exist = false)
private Integer pageNum;
@TableField(exist = false)
private Integer pageSize;
} }
...@@ -196,6 +196,8 @@ public class PcManageServiceImpl extends ServiceImpl<PcManageRepository,PcManage ...@@ -196,6 +196,8 @@ public class PcManageServiceImpl extends ServiceImpl<PcManageRepository,PcManage
@Override @Override
public IPage<PcManage> findAllByPagination(CyPageInfo<PcManage> paginationUtility, public IPage<PcManage> findAllByPagination(CyPageInfo<PcManage> paginationUtility,
PcManage pcManage){ PcManage pcManage){
paginationUtility.setSize(pcManage.getPageSize());
paginationUtility.setCurrent(pcManage.getPageNum());
IPage<PcManage> pcManageIPage = baseMapper.queryPcManagesPaged(paginationUtility, pcManage); IPage<PcManage> pcManageIPage = baseMapper.queryPcManagesPaged(paginationUtility, pcManage);
return pcManageIPage; return pcManageIPage;
} }
......
...@@ -92,8 +92,8 @@ public class PostLessonUserController extends CyPaginationController<QuestionsEx ...@@ -92,8 +92,8 @@ public class PostLessonUserController extends CyPaginationController<QuestionsEx
@CyOpeLogAnno(title = "system-试题表管理-用户答题", businessType = CyLogTypeEnum.UPDATE) @CyOpeLogAnno(title = "system-试题表管理-用户答题", businessType = CyLogTypeEnum.UPDATE)
@ApiOperation(value="用户答题", notes="用户答题") @ApiOperation(value="用户答题", notes="用户答题")
@GetMapping("/submit/{businessId:\\w+}") @GetMapping("/submit")
public CyResult submit(@PathVariable Integer businessId) { public CyResult submit( Integer businessId) {
PostExamQuestionResultDto postExamQuestionResultDto = bLessonServiceImpl.selectByQuestionsId(businessId); PostExamQuestionResultDto postExamQuestionResultDto = bLessonServiceImpl.selectByQuestionsId(businessId);
return CyResultGenUtil.builder(new CyPersistModel(1), return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS, CyMessCons.MESSAGE_ALERT_SUCCESS,
......
...@@ -3,6 +3,7 @@ package org.rcisoft.business.postblesson.entity; ...@@ -3,6 +3,7 @@ package org.rcisoft.business.postblesson.entity;
import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import org.rcisoft.core.entity.CyIdEntity;
import org.rcisoft.core.entity.CyIdIncreEntity; import org.rcisoft.core.entity.CyIdIncreEntity;
/** /**
......
...@@ -74,6 +74,8 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P ...@@ -74,6 +74,8 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P
@Autowired @Autowired
private PostTeaExamQuestionsExaminationRepository teaExamQuestionsExaminationRepository; private PostTeaExamQuestionsExaminationRepository teaExamQuestionsExaminationRepository;
/** /**
* 分页查询用户数据 * 分页查询用户数据
* *
...@@ -457,6 +459,14 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P ...@@ -457,6 +459,14 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P
if (queryTeaExamOptionsDTO == null || queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.NOT_START.getStatus())) { if (queryTeaExamOptionsDTO == null || queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.NOT_START.getStatus())) {
//开始答题 //开始答题
answerStatus.setStatus(ItemStatus.NOT_START.getStatus()); answerStatus.setStatus(ItemStatus.NOT_START.getStatus());
PostTeaExamExaminationPaper postTeaExamExaminationPaper = new PostTeaExamExaminationPaper();
postTeaExamExaminationPaper.setFlag("1");
postTeaExamExaminationPaper.setCourseId(courseId);
postTeaExamExaminationPaper.setAnswerId(Integer.valueOf(CyUserUtil.getAuthenBusinessId()));
postTeaExamExaminationPaper.setStartTime(new Date());
postTeaExamExaminationPaper.setStatus(ItemStatus.LEARNING.getStatus());
teaExamExaminationPaperRepository.insert(postTeaExamExaminationPaper);
answerStatus.setBusinessId(postTeaExamExaminationPaper.getBusinessId());
} else { } else {
if (queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.FINISH.getStatus())) { if (queryTeaExamOptionsDTO.getStatus().equals(ItemStatus.FINISH.getStatus())) {
//重新答题 //重新答题
...@@ -487,15 +497,20 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P ...@@ -487,15 +497,20 @@ public class PostBLessonServiceImpl extends ServiceImpl<PostBLessonRepository, P
teaExamExaminationPaper.setStatus(ItemStatus.LEARNING.getStatus()); teaExamExaminationPaper.setStatus(ItemStatus.LEARNING.getStatus());
insert = teaExamExaminationPaperRepository.insert(teaExamExaminationPaper); insert = teaExamExaminationPaperRepository.insert(teaExamExaminationPaper);
} else { } else {
PostTeaExamExaminationPaper postTeaExamExaminationPaper =
teaExamExaminationPaperRepository.selectById(examPaperVO.getBusinessId()); PostTeaExamExaminationPaper postTeaExamExaminationPaper =
if (postTeaExamExaminationPaper == null || postTeaExamExaminationPaper.getStatus().equals(ItemStatus.FINISH.getStatus())) { teaExamExaminationPaperRepository.selectById(examPaperVO.getBusinessId());
teaExamExaminationPaper.setAnswerId(examPaperVO.getUserId()); if (examPaperVO.getStatus().equals(ItemStatus.LEARNING.getStatus())) {
teaExamExaminationPaper.setStartTime(new Date()); if (postTeaExamExaminationPaper == null || postTeaExamExaminationPaper.getStatus().equals(ItemStatus.FINISH.getStatus())) {
teaExamExaminationPaper.setCourseId(examPaperVO.getLessonId()); teaExamExaminationPaper.setAnswerId(examPaperVO.getUserId());
teaExamExaminationPaper.setStatus(ItemStatus.LEARNING.getStatus()); teaExamExaminationPaper.setStartTime(new Date());
insert = teaExamExaminationPaperRepository.insert(teaExamExaminationPaper); teaExamExaminationPaper.setCourseId(examPaperVO.getLessonId());
} else { teaExamExaminationPaper.setStatus(ItemStatus.LEARNING.getStatus());
insert = teaExamExaminationPaperRepository.insert(teaExamExaminationPaper);
} else {
teaExamExaminationPaper = postTeaExamExaminationPaper;
}
}else {
teaExamExaminationPaper = postTeaExamExaminationPaper; teaExamExaminationPaper = postTeaExamExaminationPaper;
} }
} }
......
...@@ -26,4 +26,9 @@ public class ExaminationPaperVO { ...@@ -26,4 +26,9 @@ public class ExaminationPaperVO {
* 用户id * 用户id
*/ */
private Integer userId; private Integer userId;
/**
* 接口状态 1 考试
*/
private String status;
} }
...@@ -195,11 +195,12 @@ ...@@ -195,11 +195,12 @@
<select id="querySysUnit" resultType="org.rcisoft.business.postblesson.entity.PostSysUnit"> <select id="querySysUnit" resultType="org.rcisoft.business.postblesson.entity.PostSysUnit">
SELECT sun.* SELECT sun.*
FROM (SELECT * FROM sys_user WHERE business_id = #{userId}) su FROM (SELECT * FROM sys_user WHERE business_id = #{userId}) su
LEFT JOIN sys_user su1 ON su.dept_id = su1.dept_id
LEFT JOIN sys_unit sun ON su1.business_id = sun.user_id LEFT JOIN sys_unit sun ON su.dept_id = sun.business_id
WHERE sun.user_id = #{userId}
</select> </select>
...@@ -221,7 +222,7 @@ ...@@ -221,7 +222,7 @@
from tea_post_exam_examination_paper from tea_post_exam_examination_paper
WHERE answer_id = #{userId} WHERE answer_id = #{userId}
and course_id = #{courseId} and course_id = #{courseId}
GROUP BY create_date DESC order BY create_date DESC
LIMIT 1 LIMIT 1
</select> </select>
......
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