教师获奖

src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -14,6 +14,7 @@ import com.xjrsoft.module.teacher.dto.TeacherAwardDetailPageDto;
 import com.xjrsoft.module.teacher.dto.TeacherAwardStatisticsPageDto;
 import com.xjrsoft.module.teacher.entity.TeacherAward;
 import com.xjrsoft.module.teacher.entity.TeacherAwardItem;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.service.ITeacherAwardItemService;
 import com.xjrsoft.module.teacher.service.ITeacherAwardService;
 import com.xjrsoft.module.teacher.vo.TeacherAwardDetailPageVo;
@@ -68,11 +69,15 @@ public class TeacherAwardController {
         teacherAwardMPJLambdaWrapper
                 .disableSubLogicDel()
                 .selectAs(TeacherAwardItem::getIsThesis, TeacherAwardDetailPageVo::getIsThesis)
+                .selectAs(XjrUser::getName, TeacherAwardDetailPageVo::getApplicantUserIdCn)
                 .select(TeacherAward.class,x -> VoToColumnUtil.fieldsToColumns(TeacherAwardDetailPageVo.class).contains(x.getProperty()))
                 .leftJoin(TeacherAwardItem.class, TeacherAwardItem::getId, TeacherAward::getTeacherAwardItemId)
+                .leftJoin(XjrUser.class, XjrUser::getId, TeacherAward::getApplicantUserId)
                 .eq(dto.getApplicantUserId() != null && dto.getApplicantUserId() > 0,TeacherAward::getApplicantUserId, dto.getApplicantUserId())
                 .eq(dto.getIsThesis() != null,TeacherAwardItem::getIsThesis, dto.getIsThesis())
-                .like(dto.getCompetitionName() != null && !dto.getCompetitionName().equals(""),TeacherAward::getCompetitionName, dto.getCompetitionName())
+                .like(dto.getApplicantUserIdCn() != null && dto.getApplicantUserIdCn().equals(""), XjrUser::getName, dto.getApplicantUserIdCn())
+                .like(dto.getWholeCompetitionName() != null && !dto.getWholeCompetitionName().equals(""),TeacherAward::getWholeCompetitionName, dto.getWholeCompetitionName())
+                .eq(TeacherAward::getStatus, 1)
                 .orderByDesc(TeacherAward::getCreateDate)
         ;
         IPage<TeacherAwardDetailPageVo> page = teacherAwardService.selectJoinListPage(ConventPage.getPage(dto), TeacherAwardDetailPageVo.class, teacherAwardMPJLambdaWrapper);

src/main/java/com/xjrsoft/module/teacher/dto/TeacherAwardDetailPageDto.java

@@ -20,11 +20,16 @@ public class TeacherAwardDetailPageDto extends PageInput {
      */
     @ApiModelProperty("申请人")
     private Long applicantUserId;
+    /**
+     * 申请人
+     */
+    @ApiModelProperty("申请人")
+    private String applicantUserIdCn;
     /**
      * 奖项名称
      */
-    @ApiModelProperty("奖项名称")
-    private String competitionName;
+    @ApiModelProperty("完整的奖项名称")
+    private String wholeCompetitionName;
     /**
      * 是否论文（1：是 0：否）
      */

src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailPageVo.java

@@ -25,6 +25,11 @@ public class TeacherAwardDetailPageVo {
      */
     @ApiModelProperty("申请人")
     private Long applicantUserId;
+    /**
+     * 申请人
+     */
+    @ApiModelProperty("申请人")
+    private String applicantUserIdCn;
     /**
      * 获奖类型
      */