diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java index bc0e3ff..243445a 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/TeacherEvaluationStatusController.java @@ -47,11 +47,23 @@ public class TeacherEvaluationStatusController extends BaseController { /** * 导出辅导员综合评价状态列表 */ - @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:export')") +// @PreAuthorize("@ss.hasPermi('comprehensive:teacherEvaluationStatus:export')") @Log(title = "辅导员综合评价状态", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, TeacherEvaluationStatus teacherEvaluationStatus) { List list = teacherEvaluationStatusService.selectTeacherEvaluationStatusList(teacherEvaluationStatus); + for (TeacherEvaluationStatus entity : list){ + if(entity.getIsCompleted()){ + entity.setCompleted("是"); + }else{ + entity.setCompleted("否"); + } + if(entity.getScoreImported()){ + entity.setIsScoreImported("是"); + }else{ + entity.setIsScoreImported("否"); + } + } ExcelUtil util = new ExcelUtil(TeacherEvaluationStatus.class); util.exportExcel(response, list, "辅导员综合评价状态数据"); } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java index d8cf1cc..1dd2aa0 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/TeacherEvaluationStatus.java @@ -8,7 +8,7 @@ import lombok.Data; /** * 辅导员综合评价状态对象 teacher_evaluation_status - * + * * @author srs * @date 2024-01-20 */ @@ -53,19 +53,26 @@ public class TeacherEvaluationStatus extends BaseEntity { private String stuYearName; /** 是否完成综合测评 */ - @Excel(name = "是否完成综合测评") private Boolean isCompleted; + /** 是否完成综合测评 */ + @Excel(name = "是否完成综合测评") + private String completed; + /** 待办事项数量 */ @Excel(name = "待办事项数量") @TableField(exist = false) private Integer todoCount; /** 成绩是否已导入 */ - @Excel(name = "成绩是否已导入") @TableField(exist = false) private Boolean scoreImported; + /** 成绩是否已导入 */ + @Excel(name = "成绩是否已导入") + @TableField(exist = false) + private String isScoreImported; + /** 备注 */ @Excel(name = "备注") private String remarks; @@ -177,4 +184,4 @@ public class TeacherEvaluationStatus extends BaseEntity { public void setLastUpdateTime(String lastUpdateTime) { this.lastUpdateTime = lastUpdateTime; } -} \ No newline at end of file +}