From 3fea4a18b6a2716b81dacc37cb4534ad2f7e6dea Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Mon, 26 Jan 2026 14:01:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5]?=
 =?UTF-8?q?=20=E8=AF=95=E9=AA=8C=E7=9B=B8=E5=85=B3=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxhq/business/service/impl/StudyServiceImpl.java | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
index 4e8b6cf..9b267a6 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java
@@ -510,6 +510,7 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void doGd(StudySaveForm form) {
         Study study = form.getStudy();
         SignForm sign = form.getSign();
@@ -529,9 +530,17 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
         studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getStatus().equals(StudyStatusEnum.ysd.getValue())?JcmcysEnum.red:JcmcysEnum.blue,null,null,sign);
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),study.getStatus().equals(StudyStatusEnum.ysd.getValue())?"拒绝归档":"同意归档");
+
+        String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请归档已"+sign.getQmyy()+(study.getStatus().equals(StudyStatusEnum.ysd.getValue())?("，原因："+sign.getRemark()):"");
+        noticeService.save(title,study.getLeader(),getNoticeUrl(info));
+    }
+
+    private String getNoticeUrl(Study study){
+        return  study.getType().equals(StudyTypeEnum.sy.getValue())?("/trial/list"):study.getType().equals(StudyTypeEnum.fsy.getValue())?("/form/nonTrial"):study.getType().equals(StudyTypeEnum.mjy.getValue())?("/form/drug"):"";
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void doJd(StudySaveForm form) {
         Study study = form.getStudy();
         SignForm sign = form.getSign();
@@ -551,9 +560,13 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
         studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getStatus().equals(StudyStatusEnum.gd.getValue())?JcmcysEnum.red:JcmcysEnum.blue,null,null,sign);
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),study.getStatus().equals(StudyStatusEnum.gd.getValue())?"拒绝解档":"同意解档");
+
+        String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请解档已"+sign.getQmyy()+(study.getStatus().equals(StudyStatusEnum.gd.getValue())?("，原因："+sign.getRemark()):"");
+        noticeService.save(title,study.getLeader(),getNoticeUrl(info));
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void doJy(StudySaveForm form) {
         Study study = form.getStudy();
         SignForm sign = form.getSign();
@@ -574,9 +587,13 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
         studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?JcmcysEnum.red:JcmcysEnum.blue,null,null,sign);
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?"拒绝借阅":"同意借阅");
+
+        String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请借阅已"+sign.getQmyy()+(study.getBorrowStatus().equals(StudyBorrowStatusEnum.wjy.getValue())?("，原因："+sign.getRemark()):"");
+        noticeService.save(title,study.getLeader(),getNoticeUrl(info));
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void gh(StudySaveForm form) {
         Study study = form.getStudy();
         SignForm sign = form.getSign();
@@ -596,6 +613,9 @@ public class StudyServiceImpl extends ServiceImpl<StudyMapper, Study> implements
         studyJcgjService.saveInfo(study.getId(), JcgjlxEnum.lc, JcmcysEnum.blue,null,null,sign);
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sy,StudyTypeEnum.getEnumByValue(info.getType()),info.getId(),info.getName(),info.getSn(),info.getLeaderName(),"确认归还");
+
+        String title = StudyTypeEnum.getEnumByValue(info.getType()).getText()+"【"+info.getName()+"（"+info.getSn()+"）】提交的申请借阅已确认归还";
+        noticeService.save(title,study.getLeader(),getNoticeUrl(info));
     }
 
     //endregion