成果详情修改

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/UserAchievementController.java

@@ -144,8 +144,6 @@ public class UserAchievementController {
     @Operation(summary = "获得自己的成果分页")
     @PreAuthorize("@ss.hasPermission('system:user-achievement:selfQuery')")
     public CommonResult<PageResult<UserAchievementRespVO>> getSelfAchievementPage(@Valid UserAchievementPageReqVO pageReqVO) {
-//        Long loginId =SecurityFrameworkUtils.getLoginUserId();
-//        pageReqVO.setUserId(loginId);
         PageResult<UserAchievementDO>pageResult = userAchievementService.getUserAchievementPage(pageReqVO);
 
         return success(BeanUtils.toBean(pageResult, UserAchievementRespVO.class));

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/vo/UserAchievementPageReqVO.java

@@ -51,4 +51,14 @@ public class UserAchievementPageReqVO extends PageParam {
     @Schema(description = "成果是否达成毕业条件")
     private Long isGraduate;
 
+    @Schema(description = "学号")
+    private String userNumber;
+    @Schema(description = "工作间名称")
+    private String deptName;
+    @Schema(description = "年级")
+    private String grade;
+
+    @Schema(description = "导师id")
+    private Integer supervisorId;
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/userAchievement/vo/UserAchievementRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.userAchievement.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -45,5 +46,16 @@ public class UserAchievementRespVO {
     @Schema(description = "成果是否达成毕业条件")
     private Long isGraduate;
 
+    @Schema(description = "姓名")
+    private String nickName;
+    @Schema(description = "导师姓名")
+    private String supervisor;
+    @Schema(description = "学号")
+    private String userNumber;
+    @Schema(description = "工作间名称")
+    private String deptName;
+    @Schema(description = "年级")
+    private String grade;
+
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/userAchievement/UserAchievementDO.java

@@ -64,13 +64,39 @@ public class UserAchievementDO extends BaseDO {
      */
     private String sort;
 
+    /**
+     *成果是都达成毕业条件，0达成，1未达成
+     */
+    private Long isGraduate;
+
+    /**
+     *用户类型
+     */
     @TableField(exist = false)
     private String userType;
+    /**
+     *导师id
+     */
+    @TableField(exist = false)
+    private Long supervisorId;
+    @TableField(exist = false)
+    private String supervisor;
+    /**
+     *学号
+     */
+    @TableField(exist = false)
+    private String userNumber;
 
     /**
-     *成果是都达成毕业条件，0达成，1未达成
+     *年级
      */
-    private Long isGraduate;
+    @TableField(exist = false)
+    private String grade;
+    /**
+     *工作间名称
+     */
+    @TableField(exist = false)
+    private String deptName;
 
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/userAchievement/UserAchievementMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.userAchievement.UserAchievementDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,6 +40,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .eqIfExists(UserAchievementDO::getSort,reqVO.getSort())
                 .eqIfExists(UserAchievementDO::getIsGraduate,reqVO.getIsGraduate())
                 .eq(AdminUserDO::getDeleted,0)//确保用户也还存在的成果
+                .in(AdminUserDO::getUserType,1,2)//找在校生学生或者毕业生
                 .eqIfExists(UserAchievementDO::getDeptId,reqVO.getDeptId())
                 //用户类型查
                 .orderByDesc(UserAchievementDO::getCreateTime);
@@ -55,7 +57,18 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .inIfPresent(UserAchievementDO::getUserType,reqVO.getUserType())
                 .selectAll(UserAchievementDO.class)
                 .selectAs(AdminUserDO::getUserType,UserAchievementDO::getUserType)
+                .selectAs(AdminUserDO::getSupervisorId,UserAchievementDO::getSupervisorId)
+                .selectAs(AdminUserDO::getUserNumber,UserAchievementDO::getUserNumber)
+                .selectAs(AdminUserDO::getGrade,UserAchievementDO::getGrade)
+                .selectAs(DeptDO::getName,UserAchievementDO::getDeptName)
+
                 .leftJoin(AdminUserDO.class,AdminUserDO::getId,UserAchievementDO::getUserId)
+                .leftJoin(DeptDO.class,DeptDO::getId,UserAchievementDO::getDeptId)
+                .likeIfExists(AdminUserDO::getUserNumber,reqVO.getUserNumber())
+                .eqIfExists(AdminUserDO::getGrade,reqVO.getGrade())
+                .likeIfExists(DeptDO::getName,reqVO.getDeptName())
+                .eqIfExists(AdminUserDO::getSupervisorId,reqVO.getSupervisorId())
+
                 .eqIfExists(UserAchievementDO::getUserId, reqVO.getUserId())
                 .likeIfExists(UserAchievementDO::getAchievementName, reqVO.getAchievementName())
                 .eqIfExists(UserAchievementDO::getAchievementType, reqVO.getAchievementType())
@@ -64,6 +77,7 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 .eqIfExists(UserAchievementDO::getSort,reqVO.getSort())
                 .eqIfExists(UserAchievementDO::getIsGraduate,reqVO.getIsGraduate())
                 .eq(AdminUserDO::getDeleted,0)//确保用户也还存在的成果
+                .in(AdminUserDO::getUserType,1,2)//找在校生学生或者毕业生
                 .eqIfExists(UserAchievementDO::getDeptId,reqVO.getDeptId())
                 //用户类型查
                 .orderByDesc(UserAchievementDO::getCreateTime);
@@ -81,12 +95,9 @@ public interface UserAchievementMapper extends BaseMapperX<UserAchievementDO> {
                 queryWrapper.eqIfExists(UserAchievementDO::getUserId, reqVO.getUserId());
             }
         }
-
-        // 执行分页查询
-        PageResult<UserAchievementDO> pageResult = selectPage(reqVO, queryWrapper);
-
-        return pageResult;
+        return selectPage(reqVO, queryWrapper);
     }
+
     default List<UserAchievementDO> selectList(UserAchievementPageReqVO reqVO) {
 
         MPJLambdaWrapperX<UserAchievementDO> queryWrapper =new MPJLambdaWrapperX<>();

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/userAchievement/UserAchievementServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.iocoder.yudao.module.system.service.userAchievement;
 
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.permission.PermissionService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -30,6 +32,8 @@ public class UserAchievementServiceImpl implements UserAchievementService {
     private UserAchievementMapper userAchievementMapper;
     @Resource
     private PermissionService permissionService;
+    @Resource
+    private AdminUserService adminUserService;
 
     @Override
     public Integer createUserAchievement(UserAchievementSaveReqVO createReqVO) {
@@ -89,7 +93,17 @@ public class UserAchievementServiceImpl implements UserAchievementService {
     public PageResult<UserAchievementDO> getUserAchievementPage(UserAchievementPageReqVO pageReqVO) {
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
         Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
-        return userAchievementMapper.selectAchievementPage(pageReqVO,roleIds,loginId);
+        PageResult<UserAchievementDO> result =userAchievementMapper.selectAchievementPage(pageReqVO,roleIds,loginId);
+        for (UserAchievementDO achievement : result.getList()) {
+                if (achievement.getSupervisorId() != null&&achievement.getSupervisorId()!=0L) {
+                    AdminUserDO supervisorUser = adminUserService.getUser(achievement.getSupervisorId());
+                    if (supervisorUser!=null) {
+                        String supervisor = supervisorUser.getNickname();
+                        achievement.setSupervisor(supervisor);
+                    }
+                }
+            }
+        return result;
     }
     @Override
     public List<UserAchievementDO> getUserAchievementList(UserAchievementPageReqVO reqVO) {