12.30

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

@@ -249,7 +249,7 @@ public class studentSelectSupervisorRecordController {
     @PutMapping("/agree")
     @Operation(summary = "通过")
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:agree')")
-    public CommonResult<Boolean> agreeStudentSelectSupervisorRecord(@Valid @RequestBody studentSelectSupervisorRecordSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> agreeSelectionRecord(@Valid @RequestBody studentSelectSupervisorRecordSaveReqVO updateReqVO) {
         LocalDateTime dateTime = LocalDateTime.now();
 
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(dateTime.getYear()), studentSelectionProjectSaveReqVO.class);
@@ -299,7 +299,7 @@ public class studentSelectSupervisorRecordController {
     @PutMapping("/refuse")
     @Operation(summary = "退回")
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:refuse')")
-    public CommonResult<Boolean> refuseStudentSelectSupervisorRecord(@Valid @RequestBody studentSelectSupervisorRecordSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> refuseSelectionRecord(@Valid @RequestBody studentSelectSupervisorRecordSaveReqVO updateReqVO) {
         LocalDateTime dateTime = LocalDateTime.now();
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(dateTime.getYear()), studentSelectionProjectSaveReqVO.class);
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
@@ -314,11 +314,11 @@ public class studentSelectSupervisorRecordController {
         return success(true);
     }
 
-    //在导师设置那传导师id
+    //在导师设置那传导师id，志愿填报那撤回
     @PutMapping("/withdraw")
     @Operation(summary = "撤回")
     @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:withdraw')")
-    public CommonResult<Boolean> withdrawStudentSelectSupervisorRecord(@Valid @RequestBody studentSelectSupervisorRecordSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> withdrawSelectionRecordBySupervisorId(@Valid @RequestBody studentSelectSupervisorRecordSaveReqVO updateReqVO) {
         LocalDateTime dateTime = LocalDateTime.now();
         studentSelectionProjectSaveReqVO project = BeanUtils.toBean(studentSelectionProjectService.getStudentSelectionProjectByYear(dateTime.getYear()), studentSelectionProjectSaveReqVO.class);
         Long loginId = SecurityFrameworkUtils.getLoginUserId();
@@ -383,6 +383,25 @@ public class studentSelectSupervisorRecordController {
         return success(result);
     }
 
+    //在互选记录里面撤回
+    @PutMapping("/withdrawRecord")
+    @Operation(summary = "撤回")
+    @PreAuthorize("@ss.hasPermission('system:student-select-supervisor-record:withdrawRecord')")
+    public CommonResult<Boolean> withdrawSelectionRecord(@Valid @RequestBody studentSelectSupervisorRecordSaveReqVO updateReqVO) {
+        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 {
+            updateReqVO.setSelectType(0);
+            studentSelectSupervisorRecordService.updateStudentSelectSupervisorRecord(updateReqVO);
+        }
+        return success(true);
+    }
+
+
     //信息弹窗填写
     @PutMapping("/updateSelectionBook")
     @Operation(summary = "更新互选表数据")
@@ -445,4 +464,7 @@ public class studentSelectSupervisorRecordController {
         return success(BeanUtils.toBean(studentSelectSupervisorRecordService.getStudentSelectSupervisorRecordList(listReqVO),studentSelectSupervisorRecordRespVO.class));
     }
 
+
+
+
 }