From 61a5cdb61ed9caab7f77c4b01e35d58bb68cfef6 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 24 七月 2024 11:24:35 +0800
Subject: [PATCH] feat：用户导入
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index b7b26f0..904e0e2 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -250,7 +250,7 @@
.eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId())
.one();
if (Objects.nonNull(hasJoin)) {
- //TODO锛氬紑鍙戠幆澧冨厛鍏抽棴
+ // 鍏佽鎻愪氦鍚庣户缁綔绛�
// if(ExamSubmitTempStatusEnum.finish.equals(hasJoin.getStatus())){
// throw new RuntimeException("鎮ㄥ凡鎻愪氦璇曞嵎锛岃鍕块噸澶嶄綔绛�");
// }
@@ -915,7 +915,9 @@
@Override
public Result monitorList(ExamQuery query) {
IPage<ExamSubmitTempVO> page = PageUtil.getPage(query, ExamSubmitTempVO.class);
- return Result.ok((examSubmitTempMapper.monitorList(page, query)));
+ IPage<ExamSubmitTempVO> vo = examSubmitTempMapper.monitorList(page, query);
+
+ return Result.ok(vo);
}
@Override
@@ -929,7 +931,7 @@
form.setAddTimeM(sed);
websocket.setData(form);
// 鍙戦�亀ebsocket娑堟伅
- websocketServer.sendOneMessage(form.getUserId(), JSON.toJSONString(form));
+ websocketServer.sendOneMessage(form.getUserId(), JSON.toJSONString(websocket));
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -942,7 +944,7 @@
websocket.setCommend(WebsocketCommendEnum.FORCE_SUBMIT.getCommand());
websocket.setData(form);
// 鍙戦�亀ebsocket娑堟伅
- websocketServer.sendOneMessage(form.getUserId(), JSON.toJSONString(form));
+ websocketServer.sendOneMessage(form.getUserId(), JSON.toJSONString(websocket));
return Result.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0