diff --git a/sql/20221012-xia-paper.sql b/sql/20221012-xia-paper.sql index a4f7f1d56..b83c59349 100644 --- a/sql/20221012-xia-paper.sql +++ b/sql/20221012-xia-paper.sql @@ -32,6 +32,7 @@ CREATE TABLE `rts_paper_composition` ( `valid_duration` int DEFAULT NULL COMMENT '完成考试有效最长时长,单位min', `pass_score` int DEFAULT NULL COMMENT '及格分', `full_score` int DEFAULT NULL COMMENT '满分', + `update_id` bigint DEFAULT NULL COMMENT '最后更新用户id', `creator_id` bigint DEFAULT NULL COMMENT '创建者id', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间', diff --git a/src/main/java/club/joylink/rtss/controller/competition/CompetitionUserLikesController.java b/src/main/java/club/joylink/rtss/controller/competition/CompetitionUserLikesController.java index 7c750ff9b..624336757 100644 --- a/src/main/java/club/joylink/rtss/controller/competition/CompetitionUserLikesController.java +++ b/src/main/java/club/joylink/rtss/controller/competition/CompetitionUserLikesController.java @@ -12,8 +12,8 @@ import javax.validation.constraints.PositiveOrZero; /** * 竞赛用户点赞 */ -@RestController -@RequestMapping(path = "/api/v1/likes") +//@RestController +//@RequestMapping(path = "/api/v1/likes") public class CompetitionUserLikesController { @Autowired diff --git a/src/main/java/club/joylink/rtss/services/completition/CompetitionUserLikeManager.java b/src/main/java/club/joylink/rtss/services/completition/CompetitionUserLikeManager.java index 99e2a2294..27d9fded9 100644 --- a/src/main/java/club/joylink/rtss/services/completition/CompetitionUserLikeManager.java +++ b/src/main/java/club/joylink/rtss/services/completition/CompetitionUserLikeManager.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 用户点赞数据 */ @Slf4j -@Component +//@Component public class CompetitionUserLikeManager extends CustomCommandLineRunner { @Autowired diff --git a/src/main/java/club/joylink/rtss/services/paper/PaperCompositionService.java b/src/main/java/club/joylink/rtss/services/paper/PaperCompositionService.java index 447874cb5..999d8f102 100644 --- a/src/main/java/club/joylink/rtss/services/paper/PaperCompositionService.java +++ b/src/main/java/club/joylink/rtss/services/paper/PaperCompositionService.java @@ -208,7 +208,7 @@ public class PaperCompositionService { } /** - * 将封存的试卷蓝图解封重新编辑 + * 将封存的试卷蓝图设置失效 */ @Transactional(rollbackFor = Exception.class) public void unlockPaperComposition(Long pcId, AccountVO user) { diff --git a/src/main/java/club/joylink/rtss/vo/paper/FindPcType.java b/src/main/java/club/joylink/rtss/vo/paper/FindPcType.java index e1b74aaaf..73f636c5e 100644 --- a/src/main/java/club/joylink/rtss/vo/paper/FindPcType.java +++ b/src/main/java/club/joylink/rtss/vo/paper/FindPcType.java @@ -25,6 +25,10 @@ public enum FindPcType { * 封存 */ Locked(4), + /** + * 失效 + */ + Invalid(5); /** * 已经被使用过 */ @@ -73,6 +77,9 @@ public enum FindPcType { case Editing: list.add(PaperCompositionState.Editing); break; + case Invalid: + list.add(PaperCompositionState.Invalid); + break; } return list; }