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

fix: 根据orgId查询

dev-tmp1
zhanglei 2026-08-27 09:23:23 +08:00
parent 1fb5839a02
commit 683a6ec9a8
4 changed files with 17 additions and 19 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);

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

@ -8,12 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.lowagie.text.Document;
import com.lowagie.text.DocumentException;
import com.lowagie.text.Element;
import com.lowagie.text.Font;
import com.lowagie.text.PageSize;
import com.lowagie.text.Paragraph;
import com.lowagie.text.*;
import com.lowagie.text.pdf.BaseFont;
import com.lowagie.text.pdf.PdfWriter;
import lombok.RequiredArgsConstructor;
@ -28,25 +23,15 @@ import org.qinan.cedu.mapper.PaperMapper;
import org.qinan.cedu.mapper.PaperQuestionRelMapper;
import org.qinan.cedu.mapper.QuestionMapper;
import org.qinan.cedu.mapper.QuestionOptionMapper;
import org.qinan.cedu.model.dto.PaperConfigRuleDTO;
import org.qinan.cedu.model.dto.PaperCopyDTO;
import org.qinan.cedu.model.dto.PaperCoursewareQuestionRuleDTO;
import org.qinan.cedu.model.dto.PaperImportDTO;
import org.qinan.cedu.model.dto.PaperOrgPageQueryDTO;
import org.qinan.cedu.model.dto.PaperPageQueryDTO;
import org.qinan.cedu.model.dto.PaperUpdateDTO;
import org.qinan.cedu.model.dto.*;
import org.qinan.cedu.model.entity.PaperDO;
import org.qinan.cedu.model.entity.PaperQuestionRelDO;
import org.qinan.cedu.model.entity.QuestionDO;
import org.qinan.cedu.model.entity.QuestionOptionDO;
import org.qinan.cedu.model.vo.PaperBasicInfoVO;
import org.qinan.cedu.model.vo.PaperExamInfoVO;
import org.qinan.cedu.model.vo.PaperImportVO;
import org.qinan.cedu.model.vo.PaperPageVO;
import org.qinan.cedu.model.vo.QuestionOptionVO;
import org.qinan.cedu.model.vo.QuestionVO;
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;
@ -60,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;
@ -84,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())) {
@ -97,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);