From ef2419bde53e57c5934b6a9b5c68c3fc6b67acc9 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Fri, 6 Feb 2026 20:23:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E8=A1=A8=E5=8D=95=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=A2=9E=E5=8A=A0=E5=AD=A6=E7=A7=91=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StudyFormFillServiceImpl.java     | 30 +++++++++++++++-----
 .../service/impl/StudyFormPreServiceImpl.java      | 32 ++++++++++++++++------
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
index db12a7a..4a395f7 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
@@ -298,7 +298,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
             //发送通知
             Study study = studyService.getById(studyFormFillOld.getStudyId());
             String url = getUrlQz(study, "tbbd");
-            String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下填报表单【" + studyFormFillOld.getBdmc() + "】废止通过";
+            String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】废止通过";
             noticeService.save(title, studyFormFillOld.getUserId(), url);
         } else {
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
@@ -312,12 +312,28 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
             //发送通知
             Study study = studyService.getById(studyFormFillOld.getStudyId());
             String url = getUrlQz(study, "tbbd");
-            String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下填报表单【" + studyFormFillOld.getBdmc() + "】废止拒绝";
+            String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】废止拒绝";
             noticeService.save(title, studyFormFillOld.getUserId(), url);
         }
 
     }
 
+    /**
+     * 获取学科名称
+     * @param studySubjectId
+     * @return
+     */
+    private String getSubjectName(Long studySubjectId){
+        if(studySubjectId==null || studySubjectId.longValue()<=0){
+            return "";
+        }
+        try{
+            return "【"+studySubjectService.getById(studySubjectId).getDeptName()+"】";
+        }catch (Exception e){
+            return "";
+        }
+    }
+
 
     /**
      * 更换归属人
@@ -355,7 +371,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
         //发送通知
         Study study = studyService.getById(studyFormFillOld.getStudyId());
         String url = getUrlQz(study, "tbbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下填报表单【" + studyFormFillOld.getBdmc() + "】已更换您为归属人";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】已更换您为归属人";
         noticeService.save(title, studyFormFillOld.getUserId(), url);
     }
 
@@ -696,7 +712,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
         //发送通知
         Study study = studyService.getById(studyFormFillOld.getStudyId());
         String url = getUrlQz(study, "tbbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下填报表单【" + studyFormFillOld.getBdmc() + "】复核通过";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】复核通过";
         noticeService.save(title, studyFormFillOld.getUserId(), url);
     }
 
@@ -734,7 +750,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
         //发送通知
         Study study = studyService.getById(studyFormFillOld.getStudyId());
         String url = getUrlQz(study, "tbbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下填报表单【" + studyFormFillOld.getBdmc() + "】复核拒绝";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】复核拒绝";
         noticeService.save(title, studyFormFillOld.getUserId(), url);
 
     }
@@ -772,7 +788,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
         //发送通知
         Study study = studyService.getById(studyFormFillOld.getStudyId());
         String url = getUrlQz(study, "tbbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下填报表单【" + studyFormFillOld.getBdmc() + "】免复核通过";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】免复核通过";
         noticeService.save(title, studyFormFillOld.getUserId(), url);
     }
 
@@ -807,7 +823,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, S
         //发送通知
         Study study = studyService.getById(studyFormFillOld.getStudyId());
         String url = getUrlQz(study, "tbbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下填报表单【" + studyFormFillOld.getBdmc() + "】已审阅";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】已审阅";
         noticeService.save(title, studyFormFillOld.getUserId(), url);
     }
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
index f5b6e28..d8eff82 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
@@ -241,10 +241,26 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         //发送通知
         Study study = studyService.getById(studyFormPre.getStudyId());
         String url = getUrlQz(study, "ytbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下有预填表单【" + studyFormPre.getBdmc() + "】待审核，请及时处理";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPre.getStudySubjectId())+"下有预填表单【" + studyFormPre.getBdmc() + "】待审核，请及时处理";
         noticeService.save(title, studyFormPre.getShryId(), url);
     }
 
+    /**
+     * 获取学科名称
+     * @param studySubjectId
+     * @return
+     */
+    private String getSubjectName(Long studySubjectId){
+        if(studySubjectId==null || studySubjectId.longValue()<=0){
+            return "";
+        }
+        try{
+            return "【"+studySubjectService.getById(studySubjectId).getDeptName()+"】";
+        }catch (Exception e){
+            return "";
+        }
+    }
+
 
     /**
      * 通过
@@ -271,7 +287,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
             //发送通知
             Study study = studyService.getById(studyFormPreOld.getStudyId());
             String url = getUrlQz(study, "ytbd");
-            String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下预填表单【" + studyFormPreOld.getBdmc() + "】已审核通过";
+            String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】已审核通过";
             noticeService.save(title, studyFormPreOld.getUserId(), url);
         } else {
             //权限审核
@@ -282,14 +298,14 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
                 //发送通知
                 Study study = studyService.getById(studyFormPreOld.getStudyId());
                 String url = getUrlQz(study, "ytbd");
-                String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下有预填表单【" + studyFormPreOld.getBdmc() + "】待审核，请及时处理";
+                String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下有预填表单【" + studyFormPreOld.getBdmc() + "】待审核，请及时处理";
                 noticeService.save(title, study.getLeader(), url);
             } else {
                 studyFormPreOld.setBdzt(StudyFormPreBdztEnum.ytg.getValue());
                 //发送通知
                 Study study = studyService.getById(studyFormPreOld.getStudyId());
                 String url = getUrlQz(study, "ytbd");
-                String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下预填表单【" + studyFormPreOld.getBdmc() + "】已审核通过";
+                String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】已审核通过";
                 noticeService.save(title, studyFormPreOld.getUserId(), url);
             }
         }
@@ -333,7 +349,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         //发送通知
         Study study = studyService.getById(studyFormPreOld.getStudyId());
         String url = getUrlQz(study, "ytbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下预填表单【" + studyFormPreOld.getBdmc() + "】审核未通过";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】审核未通过";
         noticeService.save(title, studyFormPreOld.getUserId(), url);
     }
 
@@ -411,7 +427,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         //发送通知
         Study study = studyService.getById(studyFormPreOld.getStudyId());
         String url = getUrlQz(study, "ytbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下预填表单【" + studyFormPreOld.getBdmc() + "】申请关闭";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】申请关闭";
         noticeService.save(title, studyFormPreOld.getSjshryId(), url);
     }
 
@@ -447,7 +463,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         //发送通知
         Study study = studyService.getById(studyFormPreOld.getStudyId());
         String url = getUrlQz(study, "ytbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下预填表单【" + studyFormPreOld.getBdmc() + "】关闭拒绝";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】关闭拒绝";
         noticeService.save(title, studyFormPreOld.getUserId(), url);
     }
 
@@ -482,7 +498,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
         //发送通知
         Study study = studyService.getById(studyFormPreOld.getStudyId());
         String url = getUrlQz(study, "ytbd");
-        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下预填表单【" + studyFormPreOld.getBdmc() + "】关闭同意";
+        String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】关闭同意";
         noticeService.save(title, studyFormPreOld.getUserId(), url);
     }