Explorar el Código

获奖登记增加分数列

dzx hace 1 año
padre
commit
353943b1ec

+ 4 - 0
src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -130,6 +130,7 @@ public class TeacherAwardController {
             teacherAwardMPJLambdaWrapper
                     .disableSubLogicDel()
                     .selectAs(TeacherAwardItem::getIsThesis, TeacherAwardDetailPageVo::getIsThesis)
+                    .selectAs(TeacherAwardItem::getScore, TeacherAwardDetailPageVo::getTeacherAwardItemScore)
                     .selectAs(XjrUser::getName, TeacherAwardDetailPageVo::getApplicantUserIdCn)
                     .select(TeacherAward.class,x -> VoToColumnUtil.fieldsToColumns(TeacherAwardDetailPageVo.class).contains(x.getProperty()))
                     .leftJoin(TeacherAwardItem.class, TeacherAwardItem::getId, TeacherAward::getTeacherAwardItemId)
@@ -175,6 +176,9 @@ public class TeacherAwardController {
                 if(rowData.getMediaType() == null){
                     rowData.setMediaType("");
                 }
+                if(rowData.getTeacherAwardItemScore() == null){
+                    rowData.setTeacherAwardItemScore("");
+                }
 
 
                 if(el.getIsThesis() == 1){

+ 6 - 0
src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailExcelVo.java

@@ -56,7 +56,13 @@ public class TeacherAwardDetailExcelVo {
     @ApiModelProperty("备注")
     private String remark;
 
+    @ExcelProperty("奖项分数")
+    @ApiModelProperty("奖项分数")
+    private String teacherAwardItemScore;
+
     @ExcelProperty("附件名称")
     @ApiModelProperty("附件名称")
     private String fileName;
+
+
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailPageVo.java

@@ -129,4 +129,7 @@ public class TeacherAwardDetailPageVo {
 
     @ApiModelProperty("获奖日期")
     private LocalDate awardDate;
+
+    @ApiModelProperty("奖项分数")
+    private String teacherAwardItemScore;
 }