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

PaperBasicInfo

dev-tmp1
luotaiqian 2026-08-21 17:21:06 +08:00
parent e17af6a4a7
commit 2e89f7244c
7 changed files with 69 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
safety-cedu-service/src/main/java/org/qinan/cedu/controller/ClassManagementController.java
View File

@ -27,8 +27,8 @@ public class ClassManagementController {
@ApiOperation("新增班级")
@PostMapping("/save")
public SingleResponse<Boolean> save(@RequestBody ClassManagementDTO dto) {
return SingleResponse.success(classManagementService.saveClass(dto));
public SingleResponse<String> save(@RequestBody ClassManagementDTO dto) {
return SingleResponse.success(String.valueOf(classManagementService.saveClass(dto)));
}
@ApiOperation("完成")

11
safety-cedu-service/src/main/java/org/qinan/cedu/controller/ClassStudentController.java
View File

@ -14,6 +14,8 @@ import org.qinan.safetyeval.infrastructure.dataobject.base.Req;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 班级学员
*/
@ -31,6 +33,15 @@ public class ClassStudentController {
return SingleResponse.success(classStudentService.saveStudent(dto));
}
/**
* 批量新增班级学员
*/
@ApiOperation("批量新增班级学员")
@PostMapping("/batchSave")
public SingleResponse<Boolean> batchSave(@RequestBody List<ClassStudentDTO> dtoList) {
return SingleResponse.success(classStudentService.saveStudentBatch(dtoList));
}
@ApiOperation("班级学员详情")
@GetMapping("/get")
public SingleResponse<ClassStudentVO> get(@ApiParam("主键ID") @RequestParam Long id) {

11
safety-cedu-service/src/main/java/org/qinan/cedu/model/query/ClassStudentPageQuery.java
View File

@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
/**
* 班级学员分页查询
*/
@ -25,4 +27,13 @@ public class ClassStudentPageQuery extends BasePageQuery {
@ApiModelProperty("考试状态")
private Integer examStatus;
@ApiModelProperty("参训单位")
private String unitName;
@ApiModelProperty("入班时间起（学员创建时间）")
private LocalDateTime entryTimeStart;
@ApiModelProperty("入班时间止（学员创建时间）")
private LocalDateTime entryTimeEnd;
}

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

@ -16,7 +16,7 @@ public interface ClassManagementService extends IService<ClassManagementDO> {
ClassManagementVO getDetail(Long id);
boolean saveClass(ClassManagementDTO dto);
Long saveClass(ClassManagementDTO dto);
boolean updateClass(ClassManagementDTO dto);

10
safety-cedu-service/src/main/java/org/qinan/cedu/service/ClassStudentService.java
View File

@ -7,6 +7,8 @@ import org.qinan.cedu.model.entity.ClassStudentDO;
import org.qinan.cedu.model.query.ClassStudentPageQuery;
import org.qinan.cedu.model.vo.ClassStudentVO;
import java.util.List;
/**
* 班级学员服务
*/
@ -18,6 +20,14 @@ public interface ClassStudentService extends IService<ClassStudentDO> {
boolean saveStudent(ClassStudentDTO dto);
/**
* 批量新增班级学员
*
* @param dtoList 学员信息列表
* @return 是否全部保存成功
*/
boolean saveStudentBatch(List<ClassStudentDTO> dtoList);
boolean updateStudent(ClassStudentDTO dto);
boolean deleteById(Long id);

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

@ -93,7 +93,7 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
}
@Override
public boolean saveClass(ClassManagementDTO dto) {
public Long saveClass(ClassManagementDTO dto) {
ClassManagementDO entity = classManagementConvertor.convertDtoToE(dto);
InsertFieldDefaults.applyIgnoreOrgId(entity);
entity.setUpdateTime(LocalDateTime.now());
@ -112,7 +112,8 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
if (entity.getShuffleQuestions() == null) {
entity.setShuffleQuestions(0);
}
return this.save(entity);
this.save(entity);
return entity.getId();
}
@Override
@ -130,7 +131,8 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
@Override
public Boolean complete(ClassManagementDTO dto) {
LocalDate start = dto.getStartDate().toLocalDate();
LocalDate end = dto.getDelayTime().toLocalDate();;
LocalDate end = dto.getDelayTime().toLocalDate();
;
if (Objects.isNull(end)) {
end = dto.getEndDate().toLocalDate();
}
@ -140,7 +142,7 @@ public class ClassManagementServiceImpl extends ServiceImpl<ClassManagementMappe
pendingStart = ClassStatusEnum.PENDING_START;
} else if (now.isAfter(start) && now.isBefore(end)) {
pendingStart = ClassStatusEnum.IN_PROGRESS;
} else if (now.isAfter(end)){
} else if (now.isAfter(end)) {
pendingStart = ClassStatusEnum.FINISHED;
} else {
pendingStart = ClassStatusEnum.NOT_APPLIED;

29
safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassStudentServiceImpl.java
View File

@ -18,6 +18,8 @@ import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
/**
* 班级学员服务实现
@ -38,6 +40,9 @@ public class ClassStudentServiceImpl extends ServiceImpl<ClassStudentMapper, Cla
.like(StringUtils.hasText(query.getPhone()), ClassStudentDO::getPhone, query.getPhone())
.eq(query.getStudyStatus() != null, ClassStudentDO::getStudyStatus, query.getStudyStatus())
.eq(query.getExamStatus() != null, ClassStudentDO::getExamStatus, query.getExamStatus())
.like(StringUtils.hasText(query.getUnitName()), ClassStudentDO::getUnitName, query.getUnitName())
.ge(query.getEntryTimeStart() != null, ClassStudentDO::getCreateTime, query.getEntryTimeStart())
.le(query.getEntryTimeEnd() != null, ClassStudentDO::getCreateTime, query.getEntryTimeEnd())
.orderByDesc(ClassStudentDO::getCreateTime)
.page(new Page<>(query.getCurrent(), query.getSize()))
.convert(classStudentConvertor::convertEToVo);
@ -54,6 +59,28 @@ public class ClassStudentServiceImpl extends ServiceImpl<ClassStudentMapper, Cla
@Override
public boolean saveStudent(ClassStudentDTO dto) {
return this.save(buildEntity(dto));
}
/**
* 批量新增班级学员
*
* @param dtoList 学员信息列表
* @return 是否全部保存成功
*/
@Override
public boolean saveStudentBatch(List<ClassStudentDTO> dtoList) {
List<ClassStudentDO> entities = dtoList.stream().map(this::buildEntity).collect(Collectors.toList());
return this.saveBatch(entities);
}
/**
* 将 DTO 转换为实体并填充默认值
*
* @param dto 学员信息
* @return 学员实体
*/
private ClassStudentDO buildEntity(ClassStudentDTO dto) {
ClassStudentDO entity = classStudentConvertor.convertDtoToE(dto);
InsertFieldDefaults.applyIgnoreOrgId(entity);
entity.setUpdateTime(LocalDateTime.now());
@ -69,7 +96,7 @@ public class ClassStudentServiceImpl extends ServiceImpl<ClassStudentMapper, Cla
if (entity.getExamStatus() == null) {
entity.setExamStatus(0);
}
return this.save(entity);
return entity;
}
@Override