cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1

dev-tmp1
luotaiqian 2026-08-27 10:58:22 +08:00
parent 5004254c45 affb0bbedd
commit fe9fc9dfec
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java
View File

@ -14,6 +14,7 @@ import org.qinan.cedu.model.query.ClassManagementPageQuery;
import org.qinan.cedu.model.vo.ClassManagementVO;
import org.qinan.cedu.model.vo.ClassStudentStatVO;
import org.qinan.cedu.service.ClassManagementService;
import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -42,12 +43,14 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
@Override
public IPage<ClassManagementVO> pageQuery(ClassManagementPageQuery query) {
Long orgId = ThreadLocalUserInfoAdapter.getOrgId();
IPage<ClassManagementVO> page = this.lambdaQuery()
.eq(ClassManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode())
.like(StringUtils.hasText(query.getClassCode()), ClassManagementDO::getClassCode, query.getClassCode())
.like(StringUtils.hasText(query.getClassName()), ClassManagementDO::getClassName, query.getClassName())
.eq(StringUtils.hasText(query.getTrainingType()), ClassManagementDO::getTrainingType, query.getTrainingType())
.eq(query.getStatus() != null, ClassManagementDO::getStatus, query.getStatus())
.eq(orgId != null, ClassManagementDO::getOrgId, orgId)
.ge(query.getStartDateBegin() != null, ClassManagementDO::getStartDate, query.getStartDateBegin())
.le(query.getEndDateEnd() != null, ClassManagementDO::getEndDate, query.getEndDateEnd())
.orderByDesc(ClassManagementDO::getCreateTime)

3
safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java
View File

@ -18,6 +18,7 @@ import org.qinan.cedu.model.entity.CourseRelCoursewareDO;
import org.qinan.cedu.model.query.CourseManagementPageQuery;
import org.qinan.cedu.model.vo.CourseManagementVO;
import org.qinan.cedu.service.CourseManagementService;
import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -52,11 +53,13 @@ public class CourseManagementServiceImpl extends ServiceImpl<CourseManagementMap
@Override
public IPage<CourseManagementVO> pageQuery(CourseManagementPageQuery query) {
Long orgId = ThreadLocalUserInfoAdapter.getOrgId();
IPage<CourseManagementDO> page = this.lambdaQuery()
.eq(CourseManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode())
.like(StringUtils.hasText(query.getCourseName()), CourseManagementDO::getCourseName, query.getCourseName())
.eq(query.getStatus() != null, CourseManagementDO::getStatus, query.getStatus())
.eq(query.getTrainingType() != null, CourseManagementDO::getTrainingType, query.getTrainingType())
.eq(orgId != null, CourseManagementDO::getOrgId, orgId)
.orderByDesc(CourseManagementDO::getCreateTime)
.page(new Page<>(query.getCurrent(), query.getSize()));
IPage<CourseManagementVO> convert = page.convert(courseManagementConvertor::convertEToVo);

3
safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CoursewareManagementServiceImpl.java
View File

@ -14,6 +14,7 @@ import org.qinan.cedu.model.entity.CoursewareManagementDO;
import org.qinan.cedu.model.entity.QuestionDO;
import org.qinan.cedu.model.query.CoursewareManagementPageQuery;
import org.qinan.cedu.service.CoursewareManagementService;
import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -39,11 +40,13 @@ public class CoursewareManagementServiceImpl extends ServiceImpl<CoursewareManag
@Override
public IPage<CoursewareManagementVO> pageQuery(CoursewareManagementPageQuery query) {
Long orgId = ThreadLocalUserInfoAdapter.getOrgId();
IPage<CoursewareManagementDO> page = this.lambdaQuery()
.eq(CoursewareManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode())
.like(StringUtils.hasText(query.getCoursewareName()), CoursewareManagementDO::getCoursewareName, query.getCoursewareName())
.eq(query.getStatus() != null, CoursewareManagementDO::getStatus, query.getStatus())
.eq(query.getTrainingType() != null, CoursewareManagementDO::getTrainingType, query.getTrainingType())
.eq(orgId != null, CoursewareManagementDO::getOrgId, orgId)
.orderByDesc(CoursewareManagementDO::getCreateTime)
.page(new Page<>(query.getCurrent(), query.getSize()));
IPage<CoursewareManagementVO> convert = page.convert(coursewareManagementConvertor::convertEToVo);

5
safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java
View File

@ -31,6 +31,7 @@ import org.qinan.cedu.model.entity.QuestionOptionDO;
import org.qinan.cedu.model.vo.*;
import org.qinan.cedu.service.PaperService;
import org.qinan.cedu.service.support.QuestionExcelImporter;
import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@ -44,6 +45,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -68,6 +70,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, PaperDO> implemen
@Override
public IPage<PaperPageVO> pageQuery(PaperPageQueryDTO query) {
Long orgId = ThreadLocalUserInfoAdapter.getOrgId();
LambdaQueryWrapper<PaperDO> wrapper = new LambdaQueryWrapper<PaperDO>()
.eq(PaperDO::getDeleteEnum, DeleteEnum.FALSE.getCode());
if (StringUtils.hasText(query.getPaperName())) {
@ -81,6 +84,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, PaperDO> implemen
}
if (StringUtils.hasText(query.getPaperType())) {
wrapper.eq(PaperDO::getPaperType, query.getPaperType());
}if (Objects.nonNull(orgId)) {
wrapper.eq(PaperDO::getOrgId, orgId);
}
wrapper.orderByDesc(PaperDO::getId);
IPage<PaperDO> page = this.page(new Page<>(query.getCurrent(), query.getSize()), wrapper);

5
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgInfoGatewayImpl.java
View File

@ -17,6 +17,7 @@ import org.qinan.safetyeval.domain.exception.ErrorCode;
import org.qinan.safetyeval.domain.gateway.OrgInfoGateway;
import org.qinan.safetyeval.domain.query.OrgInfoQuery;
import org.qinan.safetyeval.domain.query.PageResult;
import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter;
import org.qinan.safetyeval.infrastructure.adapter.gbs.GbsUserFacadeClient;
import org.qinan.safetyeval.infrastructure.dataobject.AccountDO;
@ -250,6 +251,10 @@ public class OrgInfoGatewayImpl implements OrgInfoGateway {
if (query.getFilingRecordStatusCode() != null) {
wrapper.eq(OrgInfoDO::getFilingRecordStatusCode, query.getFilingRecordStatusCode());
}
Long orgId = ThreadLocalUserInfoAdapter.getOrgId();
if (orgId != null) {
wrapper.eq(OrgInfoDO::getId, orgId);
}
wrapper.orderByDesc(OrgInfoDO::getId);
Page<OrgInfoDO> page = new Page<>(query.getPageNum(), query.getPageSize());