From a491941cece9a90d72c9c6b0aab0e718e39dbd3c Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Mon, 22 Aug 2022 15:54:22 +0800
Subject: [PATCH] 从业记录新增同步sql 修改，用户新增审查逻辑修改，外网部门只更新状态，不更新审查明细，内网状态和明细都更新
---
src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
index d424f65..bdd172f 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
@@ -156,10 +156,10 @@
//查询下一题题目详情
ExamSubjectChoicesVO detail = examSubjectChoicesService.selectExamSubjectChoicesInfo(examSubjectChoices);
//判断当前题目的答题结果
- if (examSubjectChoices.getPreSubJectId()!=null) {
- if (null!=examSubjectChoices.getPreResult() && examSubjectChoices.getPreResult()!="" && !examSubjectChoices.getPreResult().equals("")) {
- detail.setResult(examSubjectChoicesService.getAnswerResult(examSubjectChoices.getPreSubJectId(),examSubjectChoices.getPreResult(),examSubjectChoices.getScoreId()));
- }else {
+ if (examSubjectChoices.getPreSubJectId() != null) {
+ if (null != examSubjectChoices.getPreResult() && examSubjectChoices.getPreResult() != "" && !examSubjectChoices.getPreResult().equals("")) {
+ detail.setResult(examSubjectChoicesService.getAnswerResult(examSubjectChoices.getPreSubJectId(), examSubjectChoices.getPreResult(), examSubjectChoices.getScoreId()));
+ } else {
//无
detail.setResult(3);
}
@@ -181,12 +181,13 @@
* 修改单项题目分值
*/
@PostMapping("/updateChoicesValue")
- public R updateChoicesValue(String id,String value) {
- return R.status(examSubjectChoicesService.updateChoicesValue(id,value));
+ public R updateChoicesValue(String id, String value) {
+ return R.status(examSubjectChoicesService.updateChoicesValue(id, value));
}
/**
* 导入题库
+ *
* @param isCovered 1 覆盖 0不覆盖
* @return
*/
@@ -219,10 +220,10 @@
//查询下一题题目详情
ExamSubjectChoicesVO detail = examSubjectChoicesService.selectExamSubjectChoicesInfo(examSubjectChoices);
//判断当前题目的答题结果
- if (examSubjectChoices.getPreSubJectId()!=null) {
- if (null!=examSubjectChoices.getPreResult() && examSubjectChoices.getPreResult()!="" && !examSubjectChoices.getPreResult().equals("")) {
- detail.setResult(examSubjectChoicesService.getAnswerResultBySimulate(examSubjectChoices.getPreSubJectId(),examSubjectChoices.getPreResult(),examSubjectChoices.getSimulateExamId()));
- }else {
+ if (examSubjectChoices.getPreSubJectId() != null) {
+ if (null != examSubjectChoices.getPreResult() && examSubjectChoices.getPreResult() != "" && !examSubjectChoices.getPreResult().equals("")) {
+ detail.setResult(examSubjectChoicesService.getAnswerResultBySimulate(examSubjectChoices.getPreSubJectId(), examSubjectChoices.getPreResult(), examSubjectChoices.getSimulateExamId()));
+ } else {
//无
detail.setResult(3);
}
--
Gitblit v1.9.3