From 159cff7323db0a919ca318d6e4cfab40c6a3f97f Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 7 Dec 2022 12:32:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=BF=9B=E5=BA=A6=E5=9B=A0?= =?UTF-8?q?=E4=B8=BA=E8=AF=BE=E7=A8=8B=E5=86=85=E5=AE=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/data/api/UserDataSyncApi.java | 2 +- .../src/main/java/com/xboe/school/study/dao/StudyCourseDao.java | 2 +- .../xboe/school/study/service/impl/StudyAssessServiceImpl.java | 2 +- .../xboe/school/study/service/impl/StudyExamServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java b/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java index 1ffca469..f27f3cf3 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java @@ -86,7 +86,7 @@ public class UserDataSyncApi extends ApiBaseController { u.setDepartId(user.getDepartId()); u.setDepartName(user.getDepartName()); u.setDynamic(0); - u.setGender(u.getGender()); + u.setGender(user.getGender()); u.setName(user.getName()); u.setSign(""); u.setUserNo(user.getCode()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java index 9c5d156d..be5b2f05 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java @@ -29,7 +29,7 @@ public class StudyCourseDao extends BaseDao { public void finishCheck(String studyId,String courseId,Integer total){ int n=scItemDao.count(FieldFilters.eq("studyId",studyId)); if(total==null) { - total=courseContentDao.count(FieldFilters.eq("courseId", courseId)); + total=courseContentDao.count(FieldFilters.eq("courseId", courseId),FieldFilters.eq("deleted",false)); } //以下注意，float类型，是否等于100对应 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java index 23953499..804a8a3c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java @@ -58,7 +58,7 @@ public class StudyAssessServiceImpl implements IStudyAssessService{ assess.setStudyItemId(sci.getId()); dao.save(assess); //检查是否全部学习完成 - int totalContent=courseContentDao.count(FieldFilters.eq("courseId", assess.getCourseId())); + int totalContent=courseContentDao.count(FieldFilters.eq("courseId", assess.getCourseId()),FieldFilters.eq("deleted",false)); scDao.finishCheck(assess.getStudyId(),assess.getCourseId(),totalContent); }else { //转为评估只有一条，所以这里显示一条,不能再增加 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java index 14093b4c..65a2c521 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java @@ -70,7 +70,7 @@ public class StudyExamServiceImpl implements IStudyExamService{ //更新最终成绩 //if(exam.get) //检查是否全部学习完成 - int totalContent=courseContentDao.count(FieldFilters.eq("courseId", exam.getCourseId())); + int totalContent=courseContentDao.count(FieldFilters.eq("courseId", exam.getCourseId()),FieldFilters.eq("deleted",false)); scDao.finishCheck(exam.getStudyId(),exam.getCourseId(),totalContent); }else { exam.setStudyItemId(obj.toString());//此项就是学习条目的id