xiatian 1 年之前
父節點
當前提交
021e8d6965

+ 18 - 4
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/ScoreVerify.java

@@ -51,8 +51,14 @@ public class ScoreVerify implements Serializable {
 	/**
 	 * 是否被标记
 	 */
-	@Column(name = "flagged")
-	private Boolean flagged;
+	@Column(name = "flagged",nullable = false)
+	private boolean flagged;
+	
+	/**
+	 * 是否被查看
+	 */
+	@Column(name = "viewed",nullable = false)
+	private boolean viewed;
 
 	/**
 	 * 校验时间
@@ -100,11 +106,11 @@ public class ScoreVerify implements Serializable {
 		this.studentId = studentId;
 	}
 
-	public Boolean getFlagged() {
+	public boolean getFlagged() {
 		return flagged;
 	}
 
-	public void setFlagged(Boolean flagged) {
+	public void setFlagged(boolean flagged) {
 		this.flagged = flagged;
 	}
 
@@ -124,4 +130,12 @@ public class ScoreVerify implements Serializable {
 		this.createTime = createTime;
 	}
 
+	public boolean getViewed() {
+		return viewed;
+	}
+
+	public void setViewed(boolean viewed) {
+		this.viewed = viewed;
+	}
+
 }

+ 2 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/ScoreVerifyService.java

@@ -27,4 +27,6 @@ public interface ScoreVerifyService {
 	void reset(Integer examId, Integer userId);
 
 	Boolean existByExamIdAndUserId(Integer examId, Integer userId);
+
+	void view(Integer examId, Integer userId, Integer studentId);
 }

+ 10 - 2
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ScoreVerifyServiceImpl.java

@@ -80,7 +80,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		StringBuilder sql = new StringBuilder();
 		sql.append("select count(1) ");
 		sql.append(
-				"from eb_score_verify t where t.exam_id=" + examId+" and t.user_id="+userId + " and t.flagged is null ");
+				"from eb_score_verify t where t.exam_id=" + examId+" and t.user_id="+userId + " and t.viewed =0 ");
 		Query query = entityManager.createNativeQuery(sql.toString());
 		return Integer.valueOf(query.getResultList().get(0).toString());
 	}
@@ -299,7 +299,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		sql.append(" u.name scoreVerifyUserName,t.score_verify_time scoreVerifyTime ");
 		sql.append(" from eb_score_verify r left join eb_exam_student t on r.student_id=t.id ");
 		sql.append(" left join b_user u on t.score_verify_user=u.id where  r.exam_id=" + examId+" and r.user_id="+userId
-				+ " and r.flagged is null ");
+				+ " and r.viewed =0 ");
 		sql.append(" order by t.student_code,t.subject_code ");
 		Query query = entityManager.createNativeQuery(sql.toString());
 		query.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(ScoreVerifyVo.class));
@@ -321,6 +321,14 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		scoreVerifyDao.save(sd);
 		examStudentService.scoreVerifyTag(userId, studentId, isTag);
 	}
+	
+	@Transactional
+	@Override
+	public void view(Integer examId, Integer userId, Integer studentId) {
+		ScoreVerify sd = scoreVerifyDao.findByExamIdAndUserIdAndStudentId(examId, userId, studentId);
+		sd.setViewed(true);
+		scoreVerifyDao.save(sd);
+	}
 
 	@Override
 	public ScoreVerify findByExamIdAndUserIdAndStudentId(Integer examId, Integer userId, Integer studentId) {

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ScoreVerifyController.java

@@ -214,7 +214,7 @@ public class ScoreVerifyController extends BaseExamController {
             info.setFlagged(student.getScoreVerifyFlagged());
             int examId = getSessionExamId(request);
             WebUser wu = RequestUtils.getWebUser(request);
-            scoreVerifyService.tag(examId,wu.getId(),studentId,false);
+            scoreVerifyService.view(examId,wu.getId(),studentId);
         }
         return info;
     }

+ 0 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/inspectedInfo.jsp

@@ -76,7 +76,6 @@
 					</c:if>
 					<c:if test="${!result.subject.selective}">
-					否
 					</c:if>
 				</td>
 				<td>${result.totalPaperCount}</td>

+ 2 - 1
stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -1192,7 +1192,8 @@ CREATE TABLE `eb_score_verify`
     `exam_id`		int(11)     NOT NULL COMMENT '考试ID',
   	`user_id`		int(11) 	NOT NULL COMMENT '操作人ID',
     `student_id`	int(11)     NOT NULL COMMENT '考生ID',
-  	`flagged`		tinyint(1)  DEFAULT NULL COMMENT '是否被标记',
+  	`flagged`		tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否被标记',
+  	`viewed`		tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否被查看',
   	`create_time`	datetime    NOT NULL COMMENT '创建时间',
   	`verify_time`	datetime    DEFAULT NULL COMMENT '校验时间',
   PRIMARY KEY (`id`),

+ 2 - 1
stmms-web/src/main/webapp/sql/upgrade/1.3.14.sql

@@ -65,7 +65,8 @@ CREATE TABLE `eb_score_verify`
     `exam_id`			int(11)     NOT NULL COMMENT '考试ID',
   	`user_id`		int(11) 	NOT NULL COMMENT '操作人ID',
     `student_id`			int(11)     NOT NULL COMMENT '考生ID',
-  	`flagged`		tinyint(1)  DEFAULT NULL COMMENT '是否被标记',
+  	`flagged`		tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否被标记',
+  	`viewed`		tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否被查看',
   	`create_time`  		datetime     NOT NULL COMMENT '创建时间',
   	`verify_time`  		datetime     DEFAULT NULL COMMENT '校验时间',
   PRIMARY KEY (`id`),