|
|
@@ -188,20 +188,20 @@ public class ScheduledTask implements InitializingBean {
|
|
|
@Transactional
|
|
|
public void repairRepeatTask(Long workId) {
|
|
|
try {
|
|
|
- String sql = "select * from (select mt.random_seq_new, count(mt.random_seq_new) as seq from mark_task mt where mt.work_id = ? group by mt.random_seq_new) temp where temp.seq > 1 LIMIT 500";
|
|
|
+ String sql = "select * from (select mt.secret_number, count(mt.secret_number) as seq from mark_task mt where mt.work_id = ? group by mt.secret_number) temp where temp.seq > 1 LIMIT 500";
|
|
|
List list = sqlUtil.execSqlForMapNative(sql, workId);
|
|
|
Set tasks = new HashSet();
|
|
|
if (Objects.nonNull(list) && list.size() > 0) {
|
|
|
this.repairTask = true;
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
Map map = (Map) list.get(i);
|
|
|
- Long randomSeq = Long.parseLong(String.valueOf(map.get("random_seq_new")));
|
|
|
- List<MarkTask> markTaskList = markTaskRepo.findByRandomSeqNew(randomSeq);
|
|
|
+ String randomSeq = String.valueOf(map.get("secret_number"));
|
|
|
+ List<MarkTask> markTaskList = markTaskRepo.findByWorkIdAndSecretNumber(workId, randomSeq);
|
|
|
markTaskList.remove(0);//删除一条
|
|
|
for (MarkTask markTask : markTaskList) {
|
|
|
Long randomNew = this.getRandomTask(markTask.getMarkerId(), markTask.getPaper().getId(), markTask.getWorkId(), markTask.getPaper().getExamNumber());
|
|
|
String secretNumberNew = markTask.getMarkerId() + markTask.getSubject().ordinal() + markTask.getPaper().getAreaCode() + randomNew;
|
|
|
- markTask.setRandomSeqNew(randomNew);
|
|
|
+// markTask.setRandomSeqNew(randomNew);
|
|
|
markTask.setSecretNumber(secretNumberNew);
|
|
|
tasks.add(markTask);
|
|
|
}
|
xiaof