hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 02:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers

Browse Source
This commit is contained in:
dongruihua
2022-12-07 12:39:42 +08:00
parent 3c2a22ec37 8bb16396c0
commit 9faec1ecc1
7 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java
View File

@@ -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());

2
servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java
View File

@@ -29,7 +29,7 @@ public class StudyCourseDao extends BaseDao<StudyCourse> {
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对应

2
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
View File

@@ -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 {
//转为评估只有一条，所以这里显示一条,不能再增加

2
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
View File

@@ -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

2
servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
View File

@@ -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 {
//只是保留一条作业记录，不再保存多条记录了

7
servers/boe-server-basic/src/main/java/com/xboe/basic/service/impl/BasicDataSyncServiceImpl.java
View File

@@ -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());

1
servers/boe-server-basic/src/main/java/com/xboe/primary/service/impl/MainDbSyncServiceImpl.java
View File

@@ -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);
}