From 531f1adc7be783fba44bfa05f5f8b215a7a28ee8 Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 13 Feb 2023 10:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=94=B9=E4=B8=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 2 +- .../service/impl/ExamUserTaskServiceImpl.java | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index 048bdee3..71e9c396 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -116,7 +116,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { user.setDeleted(false); user.setDepartId(getNodeText(result.get("departId"))); user.setDepartName(getNodeText(result.get("departName")));//无此字段 - user.setGender(1);//少此字段 + user.setGender(result.get("gender").asInt());// user.setKid(getNodeText(result.get("kid"))); user.setLearningDuration(result.get("learningDuration").asInt()); user.setName(result.get("realName").asText()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java index 0ed9e8c8..6d39da06 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamUserTaskServiceImpl.java @@ -95,48 +95,22 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{ public void rePushTask(ExamTestDto task) { //执行推送，当前因为是固定人，所以这里直接添加处理，按受众添加到每个人中 //查询受众的信息，2022、11、30 这个的返回需要从接口获取人员信息，然后推送 - List items = ugroupDao.findList("groupId", task.getGroupId()); - if(items.size()>0) { - //防止加入两条的问题，应该是先查询，再添加 - Map amap= aloneExamDao.findMap("aid", "name",FieldFilters.eq("testId", task.getTestId())); - //这里应该是单独的线程去处理 - for(UserGroupItem item :items) { - if(amap.containsKey(item.getAid())) { - continue; - } - //检查是否存在 - AloneExam aloneExam = new AloneExam(); - aloneExam.setAid(item.getAid()); - aloneExam.setTestId(task.getTestId()); - aloneExam.setTestName(task.getTestName()); - aloneExam.setName(item.getName()); - aloneExam.setUcode(item.getUserNo()); - aloneExam.setTestDuration(task.getDuration()); - aloneExam.setTaskTime(LocalDateTime.now()); - aloneExam.setStartTime(task.getStartTime()); - aloneExam.setStatus(AloneExamAnswer.STATUS_NONE);//未考试过 - aloneExam.setScore(0f); - aloneExamDao.save(aloneExam); - } - } - - //调用用户服务的接口,在启用下面的代码前，需要 -// List sudienceUsers=outSideService.getUsersByAudienceId(task.getGroupId()); -// if(sudienceUsers.size()>0) { +// List items = ugroupDao.findList("groupId", task.getGroupId()); +// if(items.size()>0) { // //防止加入两条的问题，应该是先查询，再添加 // Map amap= aloneExamDao.findMap("aid", "name",FieldFilters.eq("testId", task.getTestId())); // //这里应该是单独的线程去处理 -// for(AudienceUser item :sudienceUsers) { -// if(amap.containsKey(item.getId())) { +// for(UserGroupItem item :items) { +// if(amap.containsKey(item.getAid())) { // continue; // } // //检查是否存在 // AloneExam aloneExam = new AloneExam(); -// aloneExam.setAid(item.getId()); +// aloneExam.setAid(item.getAid()); // aloneExam.setTestId(task.getTestId()); // aloneExam.setTestName(task.getTestName()); // aloneExam.setName(item.getName()); -// aloneExam.setUcode(item.getCode()); +// aloneExam.setUcode(item.getUserNo()); // aloneExam.setTestDuration(task.getDuration()); // aloneExam.setTaskTime(LocalDateTime.now()); // aloneExam.setStartTime(task.getStartTime()); @@ -146,8 +120,34 @@ public class ExamUserTaskServiceImpl implements IExamUserTaskService{ // } // } - //examUserTask.setStatus(ExamUserTask.STATUS_FINISH); - //dao.update(examUserTask); + //调用用户服务的接口,在启用下面的代码前，需要 + List sudienceUsers=outSideService.getUsersByAudienceId(task.getGroupId()); + if(sudienceUsers.size()>0) { + //防止加入两条的问题，应该是先查询，再添加 + Map amap= aloneExamDao.findMap("aid", "name",FieldFilters.eq("testId", task.getTestId())); + //这里应该是单独的线程去处理 + for(AudienceUser item :sudienceUsers) { + if(amap.containsKey(item.getId())) { + continue; + } + //检查是否存在 + AloneExam aloneExam = new AloneExam(); + aloneExam.setAid(item.getId()); + aloneExam.setTestId(task.getTestId()); + aloneExam.setTestName(task.getTestName()); + aloneExam.setName(item.getName()); + aloneExam.setUcode(item.getCode()); + aloneExam.setTestDuration(task.getDuration()); + aloneExam.setTaskTime(LocalDateTime.now()); + aloneExam.setStartTime(task.getStartTime()); + aloneExam.setStatus(AloneExamAnswer.STATUS_NONE);//未考试过 + aloneExam.setScore(0f); + aloneExamDao.save(aloneExam); + } + } + +// examUserTask.setStatus(ExamUserTask.STATUS_FINISH); +// dao.update(examUserTask); }