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 diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java index a13baa0e..48cabc20 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java @@ -60,7 +60,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{ homework.setStudyItemId(sci.getId()); dao.save(homework); //检查是否全部学习完成 - int totalContent=courseContentDao.count(FieldFilters.eq("courseId", homework.getCourseId())); + int totalContent=courseContentDao.count(FieldFilters.eq("courseId", homework.getCourseId()),FieldFilters.eq("deleted",false)); scDao.finishCheck(homework.getStudyId(),homework.getCourseId(),totalContent); }else { //只是保留一条作业记录，不再保存多条记录了 diff --git a/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java b/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java index 4a7c18d0..1dc80111 100644 --- a/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java +++ b/servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java @@ -168,6 +168,10 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ } //同一个用户工号对应 多个kid的情况,所以直接根据kid查询是不对的,所以这里按工号查询,不使用kid User user = userDao.findOne(FieldFilters.eq("userNo", dto.getUserNo())); + //2022-12-16 增加kid的判断 + if(user==null){ + user = userDao.findOne(FieldFilters.eq("kid",dto.getKid())); + } if(user==null) { //人员基本信息 Person person=new Person(); @@ -230,8 +234,6 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ user.setPayrollPlaceId(dto.getPayrollPlaceId()); user.setPayrollPlaceName(dto.getPayrollPlaceName()); user.setEmployeeStatus(dto.getEmployeeStatus()); - - if(user.getStatus()==null) { user.setStatus(1);//如果为空，就是正常 } @@ -253,6 +255,7 @@ public class BasicDataSyncServiceImpl implements IBasicDataSyncService{ }else { //更新时不更新用户基本信息和账户信息 user.setDescription(dto.getDescription()); + user.setUserNo(dto.getUserNo());//同时更新UserNo; user.setKid(dto.getKid()); user.setDomainId(dto.getDomainId()); user.setDuty(dto.getDuty()); diff --git a/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java b/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java index 1a3fabc5..1c5aa14b 100644 --- a/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java +++ b/servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java @@ -177,6 +177,7 @@ public class MainDbSyncServiceImpl implements IMainDbSyncService { user.setNationality(dto.getNationality()); user.setOnline(true); user.setDeleted(false); + user.setUserType(0); accountDao.save(a); userDao.save(user); }