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-25 09:17:40 +08:00
parent 425d3a5e6b 47a0514b07
commit b452797eb2
5 changed files with 11 additions and 5 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/model/dto/ClassManagementDTO.java
View File

@ -2,7 +2,6 @@ package org.qinan.cedu.model.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.qinan.cedu.config.FlexibleLocalDateTimeDeserializer; import org.qinan.cedu.config.FlexibleLocalDateTimeDeserializer;
@ -34,6 +33,8 @@ public class ClassManagementDTO {
@ApiModelProperty("参训单位名称") @ApiModelProperty("参训单位名称")
private String unitName; private String unitName;
@ApiModelProperty("参训单位Id")
private String unitId;
@ApiModelProperty("记录人员") @ApiModelProperty("记录人员")
private String recorder; private String recorder;

1
safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassManagementDO.java
View File

@ -95,4 +95,5 @@ public class ClassManagementDO extends BaseEntity {
*/ */
@TableField("paper_id") @TableField("paper_id")
private Long paperId; private Long paperId;
private String unitId;
} }

2
safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java
View File

@ -30,6 +30,8 @@ public class ClassManagementVO extends BaseVO {
@ApiModelProperty("参训单位名称") @ApiModelProperty("参训单位名称")
private String unitName; private String unitName;
@ApiModelProperty("参训单位Id")
private String unitId;
@ApiModelProperty("记录人员") @ApiModelProperty("记录人员")
private String recorder; private String recorder;

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

@ -113,6 +113,7 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
if (entity.getShuffleQuestions() == null) { if (entity.getShuffleQuestions() == null) {
entity.setShuffleQuestions(0); entity.setShuffleQuestions(0);
} }
entity.setClassCode("C" + entity.getId());
this.save(entity); this.save(entity);
return entity.getId(); return entity.getId();
} }
@ -131,11 +132,12 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
@Override @Override
public Boolean complete(ClassManagementDTO dto) { public Boolean complete(ClassManagementDTO dto) {
LocalDate start = dto.getStartDate().toLocalDate(); ClassManagementDO classManagementDO = baseMapper.selectById(dto.getId());
LocalDate end = dto.getDelayTime().toLocalDate(); LocalDate start = classManagementDO.getStartDate().toLocalDate();
LocalDate end = classManagementDO.getDelayTime().toLocalDate();
; ;
if (Objects.isNull(end)) { if (Objects.isNull(end)) {
end = dto.getEndDate().toLocalDate(); end = classManagementDO.getEndDate().toLocalDate();
} }
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
ClassStatusEnum pendingStart; ClassStatusEnum pendingStart;

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

@ -61,7 +61,7 @@ public class CourseManagementServiceImpl extends ServiceImpl<CourseManagementMap
.page(new Page<>(query.getCurrent(), query.getSize())); .page(new Page<>(query.getCurrent(), query.getSize()));
IPage<CourseManagementVO> convert = page.convert(courseManagementConvertor::convertEToVo); IPage<CourseManagementVO> convert = page.convert(courseManagementConvertor::convertEToVo);
Map<Long, Integer> collectMap = classCourseMapper.selectList(new LambdaQueryWrapper<ClassCourseDO>() Map<Long, Integer> collectMap = classCourseMapper.selectList(new LambdaQueryWrapper<ClassCourseDO>()
.in(ClassCourseDO::getCourseId, convert.getRecords().stream().map(CourseManagementVO::getId))) .in(ClassCourseDO::getCourseId, convert.getRecords().stream().map(CourseManagementVO::getId).collect(Collectors.toList())))
.stream().map(ClassCourseDO::getCourseId).distinct().collect(Collectors.toMap(v -> v, v -> 1)); .stream().map(ClassCourseDO::getCourseId).distinct().collect(Collectors.toMap(v -> v, v -> 1));
convert.getRecords().forEach(vo -> { convert.getRecords().forEach(vo -> {
vo.setCourseRelCoursewareVOList(courseRelCoursewareConvertor.convertEListToVoList( vo.setCourseRelCoursewareVOList(courseRelCoursewareConvertor.convertEListToVoList(