12.22LSQ

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectSupervisorRecord/studentSelectSupervisorRecordController.java

@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.system.service.studentSelectionProject.studentSel
 import cn.iocoder.yudao.module.system.service.supervisorSelectionSetting.supervisorSelectionSettingService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.alibaba.druid.sql.visitor.functions.If;
+import com.baomidou.mybatisplus.generator.IFill;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -110,22 +111,33 @@ public class studentSelectSupervisorRecordController {
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:create')")
     public CommonResult<String> createStudentSelectSupervisorRecord(@Valid @RequestBody studentSelectSupervisorRecordSaveReqVO createReqVO) {
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
+        AdminUserDO loginUser =adminUserService.getUser(loginId);
+
+        Integer  occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(Math.toIntExact(createReqVO.getSupervisorId()),1);//占用学硕
+        Integer  occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(Math.toIntExact(createReqVO.getSupervisorId()),2);//占用专硕
+        supervisorSelectionSettingDO supervisorSelectionSetting = supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(createReqVO.getSupervisorId(),createReqVO.getProjectId());
+
+        if (loginUser.getMasterType()==1&&supervisorSelectionSetting.getAcademicSlots().equals(occupiedAcademicSlots)){
+            return error(1,"学硕名额已经满了");
+        }
+        if (loginUser.getMasterType()==2&&supervisorSelectionSetting.getProfessionalSlots().equals(occupiedProfessionalSlots)){
+            return error(1,"专硕名额已经满了");
+        }
+
         studentSelectSupervisorRecordDO record1 =studentSelectSupervisorRecordService.getRecordByStudentIdAndSupervisorId(loginId,null,2);//同意
         studentSelectSupervisorRecordDO record2 =studentSelectSupervisorRecordService.getRecordByStudentIdAndSupervisorId(loginId,null,1);//待处理
-        studentSelectSupervisorRecordDO record3 =studentSelectSupervisorRecordService.getRecordByStudentIdAndSupervisorId(loginId,null,0);//编辑
-
+        studentSelectSupervisorRecordDO record3 =studentSelectSupervisorRecordService.getRecordByStudentIdAndSupervisorId(loginId,null,0);//撤回
 
         if (record1!=null){
             return error(1,"请求已通过了");
         }else if (record2!=null){
             return error(1,"还有请求在待处理中");
         }else if (record3!=null){
-            return error(1,"还有请求处于编辑状态");
+            return error(1,"还有请求在编辑中");
         }
+
         createReqVO.setStudentId(loginId);
         createReqVO.setSelectType(1);//待处理
-        String StudentSignature =createReqVO.getStudentSignature();
-        System.out.println("电子签名"+StudentSignature);
         studentSelectSupervisorRecordService.createStudentSelectSupervisorRecord(createReqVO);
         return success("请求提交成功");
     }
@@ -170,8 +182,10 @@ public class studentSelectSupervisorRecordController {
     public CommonResult<PageResult<studentSelectSupervisorRecordRespVO>> getStudentSelectSupervisorRecordPage(@Valid studentSelectSupervisorRecordPageReqVO pageReqVO) {
         LocalDateTime dateTime = LocalDateTime.now();
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(dateTime.getYear()), studentSelectionProjectSaveReqVO.class);
-        if (project.getSupervisorConfirmDeadline().isBefore(dateTime)){
-            return error(1,"该项目已过截至日期");
+        Long loginId = SecurityFrameworkUtils.getLoginUserId();
+        Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
+        if ((roleIds.contains(112L) || roleIds.contains(113L)) && project.getSupervisorConfirmDeadline().isBefore(dateTime)) {
+            return error(1, "该项目已过截至日期");
         }else {
             PageResult<studentSelectSupervisorRecordDO> pageResult = studentSelectSupervisorRecordService.getStudentSelectSupervisorRecordPage(pageReqVO);
             return success(BeanUtils.toBean(pageResult, studentSelectSupervisorRecordRespVO.class));
@@ -326,14 +340,19 @@ public class studentSelectSupervisorRecordController {
         return success("填写成功");
     }
 
+
     @GetMapping("/getRecordList")
     @Operation(summary = "获取选择记录列表")
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:getRecordList')")
     public CommonResult<List<studentSelectSupervisorRecordRespVO>> getRecordSelectSupervisorRecordList(@Valid studentSelectSupervisorRecordPageReqVO listReqVO) {
-//        LocalDate date =LocalDate.now();
-//        studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(date.getYear()),studentSelectionProjectSaveReqVO.class);
-//        listReqVO.setProjectId(project.getId());
-        return success(BeanUtils.toBean(studentSelectSupervisorRecordService.getStudentSelectSupervisorRecordList(listReqVO),studentSelectSupervisorRecordRespVO.class));
+        LocalDateTime dateTime = LocalDateTime.now();
+        studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(dateTime.getYear()), studentSelectionProjectSaveReqVO.class);
+        Long loginId = SecurityFrameworkUtils.getLoginUserId();
+        Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
+        if ((roleIds.contains(112L) || roleIds.contains(113L)) && project.getSupervisorConfirmDeadline().isBefore(dateTime)) {
+            return error(1, "该项目已过截至日期");
+        }else
+            return success(BeanUtils.toBean(studentSelectSupervisorRecordService.getStudentSelectSupervisorRecordList(listReqVO),studentSelectSupervisorRecordRespVO.class));
     }
 
 //    @GetMapping("/getStudentRecordList")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectSupervisorRecord/vo/selectionBookRespVO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.time.LocalDate;
 import java.util.Date;
 
-@Schema(description = "管理后台 - 师生互选项目 Response VO")
+@Schema(description = "管理后台 - 互许表 Response VO")
 @Data
 @ExcelIgnoreUnannotated
 public class selectionBookRespVO {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/studentSelectionProject/studentSelectionProjectController.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.studentSelectionProject;
 import cn.iocoder.yudao.module.system.controller.admin.supervisorSelectionSetting.vo.supervisorSelectionSettingSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.supervisorSelectionSetting.supervisorSelectionSettingDO;
 import cn.iocoder.yudao.module.system.service.supervisorSelectionSetting.supervisorSelectionSettingService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supervisorSelectionSetting/supervisorSelectionSettingController.java

@@ -1,7 +1,12 @@
 package cn.iocoder.yudao.module.system.controller.admin.supervisorSelectionSetting;
 
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.system.controller.admin.studentSelectionProject.vo.studentSelectionProjectSaveReqVO;
+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.studentSelectionProject.studentSelectionProjectService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -45,6 +50,10 @@ public class supervisorSelectionSettingController {
     private supervisorSelectionSettingService supervisorSelectionSettingService;
     @Resource
     private studentSelectionProjectService studentSelectionProjectService;
+    @Resource
+    private AdminUserService adminUserService;
+    @Resource
+    private PermissionService permissionService;
 
     @PostMapping("/create")
     @Operation(summary = "创建导师学硕专硕名额设置")
@@ -57,10 +66,24 @@ public class supervisorSelectionSettingController {
     @Operation(summary = "更新导师学硕专硕名额设置")
     @PreAuthorize("@ss.hasPermission('system:supervisor-selection-setting:update')")
     public CommonResult<Boolean> updateSupervisorSelectionSetting(@Valid @RequestBody supervisorSelectionSettingSaveReqVO updateReqVO) {
+
+        supervisorSelectionSettingDO setting = supervisorSelectionSettingService.getSupervisorSelectionSetting(updateReqVO.getId());
+
+        Integer  occupiedAcademicSlots =adminUserService.countStudentListBySupervisorId(Math.toIntExact(setting.getSupervisorId()),1);//占用学硕
+        Integer  occupiedProfessionalSlots =adminUserService.countStudentListBySupervisorId(Math.toIntExact(setting.getSupervisorId()),2);//占用专硕
+
+        if (updateReqVO.getAcademicSlots()<occupiedAcademicSlots){
+            return error(1,"占用学硕名额大于更新学硕名额");
+        }
+        if (updateReqVO.getProfessionalSlots()<occupiedProfessionalSlots){
+            return error(1,"占用专硕名额大于更新专硕名额");
+        }
+
         supervisorSelectionSettingService.updateSupervisorSelectionSetting(updateReqVO);
         return success(true);
     }
 
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除导师学硕专硕名额设置")
     @Parameter(name = "id", description = "编号", required = true)
@@ -75,8 +98,6 @@ public class supervisorSelectionSettingController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:supervisor-selection-setting:query')")
     public CommonResult<supervisorSelectionSettingRespVO> getSupervisorSelectionSetting(@RequestParam("id") Integer id) {
-        LocalDate date = LocalDate.now();
-        studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(date.getYear()), studentSelectionProjectSaveReqVO.class);
         supervisorSelectionSettingDO supervisorSelectionSetting = supervisorSelectionSettingService.getSupervisorSelectionSetting(id);
         return success(BeanUtils.toBean(supervisorSelectionSetting, supervisorSelectionSettingRespVO.class));
     }
@@ -88,8 +109,10 @@ public class supervisorSelectionSettingController {
     public CommonResult<PageResult<supervisorSelectionSettingRespVO>> getSupervisorSelectionSettingPage(@Valid supervisorSelectionSettingPageReqVO pageReqVO) {
         LocalDateTime dateTime = LocalDateTime.now();
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(dateTime.getYear()), studentSelectionProjectSaveReqVO.class);
-        if (project.getSupervisorConfirmDeadline().isBefore(dateTime)){
-            return error(1,"该项目已过截至日期");
+        Long loginId = SecurityFrameworkUtils.getLoginUserId();
+        Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(loginId);
+        if ((roleIds.contains(112L) || roleIds.contains(113L)) && project.getSupervisorConfirmDeadline().isBefore(dateTime)) {
+            return error(1, "该项目已过截至日期");
         }else {
             PageResult<supervisorSelectionSettingDO> pageResult = supervisorSelectionSettingService.getSupervisorSelectionSettingPage(pageReqVO);
             return success(BeanUtils.toBean(pageResult, supervisorSelectionSettingRespVO.class));
@@ -109,4 +132,10 @@ public class supervisorSelectionSettingController {
                         BeanUtils.toBean(list, supervisorSelectionSettingRespVO.class));
     }
 
+    @GetMapping("/getSupervisorInfo")
+    @Operation(summary = "导师这个项目的信息")
+    public CommonResult<supervisorSelectionSettingDO> getSupervisorInfo(@RequestParam("supervisorId") Integer supervisorId,@RequestParam("projectId") Integer projectId) {
+        return success(supervisorSelectionSettingService.getSettingBySupervisorIdAndProjectId(Long.valueOf(supervisorId),projectId));
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supervisorSelectionSetting/vo/supervisorBookRespVO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.system.controller.admin.supervisorSelectionSetting.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Schema(description = "管理后台 - 师生互选导师信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class supervisorBookRespVO {
+
+    @Schema(description = "项目")
+    private Integer projectId;
+
+    @Schema(description = "导师Id")
+    private String supervisorId;
+
+    @Schema(description = "导师名称")
+    private String supervisor;
+
+    @Schema(description = "学生专业//导师研究方向")
+    private String major;
+
+    @Schema(description = "导师类型/校内或校外")
+    private String supervisorType;
+
+    @Schema(description = "学生成果要求")
+    private String studentAchievementRequirement;
+
+    @Schema(description = "导师电子签名")
+    private String supervisorSignature;
+
+    @Schema(description = "导师同意日期")
+    private LocalDate agreeDate;
+
+    @Schema(description = "简介")
+    private String introduction;
+
+    @Schema(description = "职称")
+    private String title;
+
+//    @Schema(description = "学硕名额")
+//    private Integer academicSlots;
+//
+//    @Schema(description = "专硕名额")
+//    private Integer professionalSlots;
+
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/supervisorSelectionSetting/vo/supervisorSelectionSettingRespVO.java

@@ -48,6 +48,12 @@ public class supervisorSelectionSettingRespVO {
     @Schema(description = "导师类型")
     private String userType;
 
+    @Schema(description = "导师研究方向")
+    private  Integer major;
+
+    @Schema(description = "导师职称")
+    private  String title;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
@@ -59,4 +65,6 @@ public class supervisorSelectionSettingRespVO {
     @Schema(description = "选择状态")
     private  Integer selectType;
 
+
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -307,10 +307,10 @@ public class UserController {
     @PreAuthorize("@ss.hasPermission('system:user:query')")
     public CommonResult<UserRespVO> getUser(@RequestParam("id") Long id) {
         AdminUserDO user = userService.getUser(id);
-        //添加导师名称
         if (user == null) {
             return success(null);
         }
+        //添加导师名称
         if (user.getSupervisorId() != null && (Objects.equals(user.getUserType(), "1") || Objects.equals(user.getUserType(), "2"))) {
             AdminUserDO supervisorUser = userService.getUser(user.getSupervisorId());
             if (supervisorUser!=null) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java

@@ -135,5 +135,4 @@ public class UserRespVO{
     @Schema(description = "职称")
     private String title;
 
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/supervisorSelectionSetting/supervisorSelectionSettingDO.java

@@ -55,6 +55,18 @@ public class supervisorSelectionSettingDO extends BaseDO {
     @TableField(exist = false)
     private String supervisorName;
 
+    /**
+     * 导师研究方向
+     */
+    @TableField(exist = false)
+    private  String major;
+
+    /**
+     * 导师职称
+     */
+    @TableField(exist = false)
+    private  String title;
+
     /**
      * 导师类型
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/studentSelectSupervisorRecord/studentSelectSupervisorRecordMapper.java

@@ -43,12 +43,14 @@ public interface studentSelectSupervisorRecordMapper extends BaseMapperX<student
                 .orderByDesc(studentSelectSupervisorRecordDO::getId);
 
         if (roleIds.contains(113L)){
-            queryWrapperX.eqIfPresent(studentSelectSupervisorRecordDO::getSupervisorId,loginUser.getId());
+            queryWrapperX.eqIfPresent(studentSelectSupervisorRecordDO::getSupervisorId,loginUser.getId())
+                    .inIfPresent(studentSelectSupervisorRecordDO::getSelectType,1,2,3)
+                    .orderBy(true, true, studentSelectSupervisorRecordDO::getSelectType)
+                    .last("ORDER BY FIELD(select_type, 1,2,3)");
         }else if (roleIds.contains(114L)){//学院看所有的编辑、待处理、退回记录
             queryWrapperX.inIfPresent(studentSelectSupervisorRecordDO::getSelectType,0,1,2,3)
                     .orderBy(true, true, studentSelectSupervisorRecordDO::getSelectType)
                     .last("ORDER BY FIELD(select_type, 0, 1, 3, 2)");
-
         }else if (roleIds.contains(112L)){//学生看自己的
             queryWrapperX.eqIfPresent(studentSelectSupervisorRecordDO::getStudentId,loginUser.getId());
         }
@@ -74,7 +76,10 @@ public interface studentSelectSupervisorRecordMapper extends BaseMapperX<student
                 .eqIfExists(studentSelectSupervisorRecordDO::getExternalSupervisorId, reqVO.getExternalSupervisorId())
                 .orderByDesc(studentSelectSupervisorRecordDO::getId);
         if (roleIds.contains(113L)){
-            queryWrapperX.eqIfPresent(studentSelectSupervisorRecordDO::getSupervisorId,loginUser.getId());
+            queryWrapperX.eqIfPresent(studentSelectSupervisorRecordDO::getSupervisorId,loginUser.getId())
+                            .inIfPresent(studentSelectSupervisorRecordDO::getSelectType,1,2,3)
+                            .orderBy(true, true, studentSelectSupervisorRecordDO::getSelectType)
+                            .last("ORDER BY FIELD(select_type, 1,2,3)");
         }else if (roleIds.contains(114L)){//学院看所有的编辑、待处理、退回记录
             queryWrapperX.inIfPresent(studentSelectSupervisorRecordDO::getSelectType,0,1,2,3)
                     .orderBy(true, true, studentSelectSupervisorRecordDO::getSelectType)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/supervisorSelectionSetting/supervisorSelectionSettingMapper.java

@@ -44,8 +44,22 @@ public interface supervisorSelectionSettingMapper extends BaseMapperX<supervisor
         return selectPage(reqVO,mpjLambdaWrapperX);
     }
 
-    @Select("SELECT * FROM supervisor_selection_setting WHERE supervisor_id = #{supervisorId} AND project_id = #{projectId} AND deleted =0")
-    supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(@Param("supervisorId") Long supervisorId,@Param("projectId") Integer projectId);
+    default supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(@Param("supervisorId") Long supervisorId,@Param("projectId") Integer projectId){
+        MPJLambdaWrapperX<supervisorSelectionSettingDO> mpjLambdaWrapperX = new MPJLambdaWrapperX<>();
+        mpjLambdaWrapperX
+                .selectAll(supervisorSelectionSettingDO.class)
+                .leftJoin(AdminUserDO.class, AdminUserDO::getId, supervisorSelectionSettingDO::getSupervisorId)
+                .selectAs(AdminUserDO::getNickname,supervisorSelectionSettingDO::getSupervisorName)//导师姓名
+                .selectAs(AdminUserDO::getUserType,supervisorSelectionSettingDO::getUserType)//导师类型
+                .selectAs(AdminUserDO::getTitle,supervisorSelectionSettingDO::getTitle)//导师职称
+                .selectAs(AdminUserDO::getMajor,supervisorSelectionSettingDO::getMajor)//导师研究方向
+                .eqIfExists(supervisorSelectionSettingDO::getSupervisorId,supervisorId)
+                .eqIfExists(supervisorSelectionSettingDO::getProjectId,projectId);
+        return selectOne(mpjLambdaWrapperX);
+    }
+
+//    @Select("SELECT * FROM supervisor_selection_setting WHERE supervisor_id = #{supervisorId} AND project_id = #{projectId} AND deleted =0")
+//    supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(@Param("supervisorId") Long supervisorId,@Param("projectId") Integer projectId);
 
 
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supervisorSelectionSetting/supervisorSelectionSettingService.java

@@ -54,4 +54,5 @@ public interface supervisorSelectionSettingService {
 
     supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(Long supervisorId,Integer projectId);
 
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/supervisorSelectionSetting/supervisorSelectionSettingServiceImpl.java

@@ -97,12 +97,12 @@ public class supervisorSelectionSettingServiceImpl implements supervisorSelectio
                     re.setSelectType(1);
                 }
             }
-
         });
         return result;
     }
+
     @Override
-   public supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(Long supervisorId,Integer projectId){
+    public supervisorSelectionSettingDO getSettingBySupervisorIdAndProjectId(Long supervisorId,Integer projectId){
         return supervisorSelectionSettingMapper.getSettingBySupervisorIdAndProjectId(supervisorId,projectId);
     }