完善了之前的通知管理功能，支持对发送的通知的批量更改和删除;在学生证补办模块增加了完成制作功能。

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphMsgController.java

@@ -23,7 +23,7 @@ import com.srs.common.core.page.TableDataInfo;
 
 /**
  * 消息Controller
- * 
+ *
  * @author srs
  * @date 2023-07-12
  */
@@ -103,4 +103,13 @@ public class CphMsgController extends BaseController
     {
         return toAjax(cphMsgService.deleteCphMsgByIds(ids));
     }
+
+    /**
+     * 根据学号查询用户ID
+     */
+    @GetMapping("/getUserIdByStuNo/{stuNo}")
+    public AjaxResult getUserIdByStuNo(@PathVariable("stuNo") String stuNo)
+    {
+        return success(cphMsgService.getUserIdByStuNo(stuNo));
+    }
 }

srs-admin/src/main/java/com/srs/web/controller/routine/NotificationManagementController.java

@@ -15,6 +15,7 @@ import com.srs.common.enums.BusinessType;
 import com.srs.common.annotation.Log;
 import com.srs.common.core.page.TableDataInfo;
 import com.srs.comprehensive.domain.SrsGrade;
+
 /**
  * 通知管理Controller
  *
@@ -28,18 +29,6 @@ public class NotificationManagementController extends BaseController {
     @Autowired
     private INotificationManagementService notificationManagementService;
 
-    /**
-     * 查询通知管理列表
-     */
-@PreAuthorize("@ss.hasPermi('routine:NotificationManagement:list')")
-@GetMapping("/list")
-@ApiOperation("查询通知管理列表")
-    public TableDataInfo list(NotificationManagement notificationManagement)
-    {
-        startPage();
-        List<NotificationManagement> list = notificationManagementService.selectNotificationManagementList(notificationManagement);
-        return getDataTable(list);
-    }
 
     /**
      * 导出通知管理列表
@@ -97,9 +86,20 @@ public class NotificationManagementController extends BaseController {
     @Log(title = "通知管理", businessType = BusinessType.DELETE)
     @PostMapping("/{ids}")
     @ApiOperation("删除通知管理")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public AjaxResult remove(@PathVariable String ids)
     {
-        return toAjax(notificationManagementService.deleteNotificationManagementByIds(ids));
+        // 处理逗号分隔的ID字符串
+        String[] idArray = ids.split(",");
+        Long[] idLongArray = new Long[idArray.length];
+        for (int i = 0; i < idArray.length; i++) {
+            idLongArray[i] = Long.parseLong(idArray[i]);
+        }
+
+        if (idLongArray.length == 1) {
+            return toAjax(notificationManagementService.deleteNotificationManagementById(idLongArray[0]));
+        } else {
+            return toAjax(notificationManagementService.deleteNotificationManagementByIds(idLongArray));
+        }
     }
 
     /**

srs-admin/src/main/java/com/srs/web/controller/routine/RtStuIdReissueController.java

@@ -145,8 +145,16 @@ public class RtStuIdReissueController extends BaseController {
     @PostMapping("/add")
     @ApiOperation("新增学生证补办")
     public AjaxResult add(@RequestBody RtStuIdReissue rtStuIdReissue) {
-        // rtStuIdReissue.setCounsellorId(SecurityUtils.getUserId());
-        rtStuIdReissue.setCreateBy(SecurityUtils.getUsername());
+        // 检查该学号是否已有申请记录
+        RtStuIdReissue existingApplication = rtStuIdReissueService.selectRtStuIdReissueByStuNo(rtStuIdReissue.getStuNo());
+        if (existingApplication != null) {
+            // 如果已有申请记录且未完成制作，则不允许重复提交
+            if (existingApplication.getInspectionProgress() < 3) {
+                return AjaxResult.error("您已有正在处理的申请，请勿重复提交");
+            }
+            // 如果已完成制作，允许提交新申请，但需要先删除旧记录
+            rtStuIdReissueService.deleteRtStuIdReissueById(existingApplication.getId());
+        }
         return toAjax(rtStuIdReissueService.insertRtStuIdReissue(rtStuIdReissue));
     }
 
@@ -169,9 +177,30 @@ public class RtStuIdReissueController extends BaseController {
     @PostMapping("/update")
     @ApiOperation("修改学生证补办")
     public AjaxResult edit(@RequestBody RtStuIdReissue rtStuIdReissue) {
+        // 检查当前申请状态，如果已完成制作则不允许修改
+        RtStuIdReissue currentApplication = rtStuIdReissueService.selectRtStuIdReissueById(rtStuIdReissue.getId());
+        if (currentApplication != null && currentApplication.getInspectionProgress() >= 3) {
+            return AjaxResult.error("申请已完成制作，不可修改");
+        }
         return toAjax(rtStuIdReissueService.updateRtStuIdReissue(rtStuIdReissue));
     }
 
+    /**
+     * 删除单个学生证补办申请（学生取消申请）
+     */
+    @PreAuthorize("@ss.hasPermi('routine:stuIdReissue:remove')")
+    @Log(title = "取消学生证补办申请", businessType = BusinessType.DELETE)
+    @PostMapping("/cancel/{id}")
+    @ApiOperation("取消学生证补办申请")
+    public AjaxResult cancelApplication(@PathVariable Long id) {
+        // 先检查审核状态，如果已完成制作则不允许取消
+        RtStuIdReissue rtStuIdReissue = rtStuIdReissueService.selectRtStuIdReissueById(id);
+        if (rtStuIdReissue != null && rtStuIdReissue.getInspectionProgress() >= 3) {
+            return AjaxResult.error("当前审核已完成，不可取消");
+        }
+        return toAjax(rtStuIdReissueService.deleteRtStuIdReissueById(id));
+    }
+
     /**
      * 删除学生证补办
      */
@@ -182,4 +211,6 @@ public class RtStuIdReissueController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(rtStuIdReissueService.deleteRtStuIdReissueByIds(ids));
     }
+
+
 }

srs-admin/src/main/java/com/srs/web/controller/routine/RtStuMultiLevelReviewController.java

@@ -114,4 +114,15 @@ public class RtStuMultiLevelReviewController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(rtStuMultiLevelReviewService.deleteRtStuMultiLevelReviewByIds(ids));
     }
+
+    /**
+     * 更新审核信息并同时更新学生证补办状态
+     */
+    @PreAuthorize("@ss.hasPermi('routine:stuMultiLevelReview:edit')")
+    @Log(title = "更新审核信息并同时更新学生证补办状态", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateWithStuIdReissue")
+    @ApiOperation("更新审核信息并同时更新学生证补办状态")
+    public AjaxResult updateWithStuIdReissue(@RequestBody RtStuMultiLevelReview rtStuMultiLevelReview) {
+        return toAjax(rtStuMultiLevelReviewService.updateRtStuMultiLevelReviewWithStuIdReissue(rtStuMultiLevelReview));
+    }
 }