feat：[资源库档案通知]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java

@@ -235,6 +235,28 @@ public class Gyzj extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String qmr2Mc;
 
+    /** 归档申请人id */
+    private Long gdsqrId;
+
+    /** 归档申请人名称 */
+    private String gdsqrMc;
+
+    public Long getGdsqrId() {
+        return gdsqrId;
+    }
+
+    public void setGdsqrId(Long gdsqrId) {
+        this.gdsqrId = gdsqrId;
+    }
+
+    public String getGdsqrMc() {
+        return gdsqrMc;
+    }
+
+    public void setGdsqrMc(String gdsqrMc) {
+        this.gdsqrMc = gdsqrMc;
+    }
+
     public Integer getDazt() {
         return dazt;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java

@@ -209,6 +209,28 @@ public class Mjy extends MpBaseEntity
     /** 发放目的其他 */
     private String mdOther;
 
+    /** 归档申请人id */
+    private Long gdsqrId;
+
+    /** 归档申请人名称 */
+    private String gdsqrMc;
+
+    public Long getGdsqrId() {
+        return gdsqrId;
+    }
+
+    public void setGdsqrId(Long gdsqrId) {
+        this.gdsqrId = gdsqrId;
+    }
+
+    public String getGdsqrMc() {
+        return gdsqrMc;
+    }
+
+    public void setGdsqrMc(String gdsqrMc) {
+        this.gdsqrMc = gdsqrMc;
+    }
+
     public Integer getDazt() {
         return dazt;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java

@@ -245,6 +245,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 gyzjFfjl.setJlzt(JlztEnum.dgd.getValue());
                 gyzjFfjl.setDazt(DaztEnum.ygd.getValue());
+                gyzjFfjl.setGdsqrId(qmr.getUserId());
+                gyzjFfjl.setGdsqrMc(qmr.getNickName());
                 // 稽查轨迹
                 gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
                 //保存日志
@@ -279,6 +281,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         gyzjFfjlOld.setJlzt(JlztEnum.dgd.getValue());
         gyzjFfjlOld.setDazt(DaztEnum.ygd.getValue());
+        gyzjFfjlOld.setGdsqrId(qmr.getUserId());
+        gyzjFfjlOld.setGdsqrMc(qmr.getNickName());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
@@ -574,7 +578,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意归档");
-
+        //通知
+        noticeService.save("发放回收记录【"+gyzjFfjlOld.getMc()+"】同意归档",gyzjFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -604,6 +609,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝归档");
+        //通知
+        noticeService.save("发放回收记录【"+gyzjFfjlOld.getMc()+"】拒绝归档",gyzjFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -631,7 +638,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意解档");
-
+        //通知
+        noticeService.save("发放回收记录【"+gyzjFfjlOld.getMc()+"】同意解档",gyzjFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -660,7 +668,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝解档");
-
+        //通知
+        noticeService.save("发放回收记录【"+gyzjFfjlOld.getMc()+"】拒绝解档",gyzjFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -692,7 +701,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "同意借阅");
-
+        //通知
+        noticeService.save("发放回收记录【"+gyzjFfjlOld.getMc()+"】同意借阅",gyzjFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -725,7 +735,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "拒绝借阅");
-
+        //通知
+        noticeService.save("发放回收记录【"+gyzjFfjlOld.getMc()+"】拒绝借阅",gyzjFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -752,7 +763,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzjlqff, gyzjFfjlOld.getId(), gyzjFfjlOld.getMc(), gyzjFfjlOld.getBh(), gyzjFfjlOld.getNd()+gyzjFfjlOld.getNddw(), "确认归还");
-
+        //通知
+        noticeService.save("发放回收记录【"+gyzjFfjlOld.getMc()+"】确认归还",gyzjFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     //endregion

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java

@@ -235,6 +235,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 gyzj.setZjzt(ZjztEnum.dgd.getValue());
                 gyzj.setDazt(DaztEnum.ygd.getValue());
+                gyzj.setGdsqrId(qmr.getUserId());
+                gyzj.setGdsqrMc(qmr.getNickName());
                 //稽查轨迹
                 gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()));
                 //保存日志
@@ -269,6 +271,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         gyzjOld.setZjzt(ZjztEnum.dgd.getValue());
         gyzjOld.setDazt(DaztEnum.ygd.getValue());
+        gyzjOld.setGdsqrId(qmr.getUserId());
+        gyzjOld.setGdsqrMc(qmr.getNickName());
         this.updateById(gyzjOld);
         //稽查轨迹
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark());
@@ -1340,6 +1344,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意归档");
+        //通知
+        noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意归档",gyzjOld.getGdsqrId(),getUrlQz("gyzjList"));
     }
 
     /**
@@ -1369,6 +1375,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝归档");
+        //通知
+        noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝归档",gyzjOld.getGdsqrId(),getUrlQz("gyzjList"));
     }
 
     /**
@@ -1396,6 +1404,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意解档");
+        //通知
+        noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意解档",gyzjOld.getGdsqrId(),getUrlQz("gyzjList"));
     }
 
     /**
@@ -1424,6 +1434,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝解档");
+        //通知
+        noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝解档",gyzjOld.getGdsqrId(),getUrlQz("gyzjList"));
 
     }
 
@@ -1456,6 +1468,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "同意借阅");
+        //通知
+        noticeService.save("给药制剂【"+gyzjOld.getMc()+"】同意借阅",gyzjOld.getGdsqrId(),getUrlQz("gyzjList"));
     }
 
     /**
@@ -1488,6 +1502,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "拒绝借阅");
+        //通知
+        noticeService.save("给药制剂【"+gyzjOld.getMc()+"】拒绝借阅",gyzjOld.getGdsqrId(),getUrlQz("gyzjList"));
     }
 
     /**
@@ -1514,6 +1530,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gyzj, gyzjOld.getId(), gyzjOld.getMc(), gyzjOld.getBh(), gyzjOld.getNd()+gyzjOld.getNddw(), "确认归还");
+        //通知
+        noticeService.save("给药制剂【"+gyzjOld.getMc()+"】确认归还",gyzjOld.getGdsqrId(),getUrlQz("gyzjList"));
     }
 
     //endregion
@@ -1530,4 +1548,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         sysUserService.checkPassword(user,qmrmm,needName);
     }
 
+    /**
+     * 获取通知的跳转url
+     * @param tab
+     * @return
+     */
+    private String getUrlQz(String tab){
+        return  "/resource/gyzj/"+tab;
+    }
+
+
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java

@@ -241,6 +241,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 mjyFfjl.setJlzt(JlztEnum.dgd.getValue());
                 mjyFfjl.setDazt(DaztEnum.ygd.getValue());
+                mjyFfjl.setGdsqrId(qmr.getUserId());
+                mjyFfjl.setGdsqrMc(qmr.getNickName());
                 // 稽查轨迹
                 mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
                 //保存日志
@@ -275,6 +277,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         mjyFfjlOld.setJlzt(JlztEnum.dgd.getValue());
         mjyFfjlOld.setDazt(DaztEnum.ygd.getValue());
+        mjyFfjlOld.setGdsqrId(qmr.getUserId());
+        mjyFfjlOld.setGdsqrMc(qmr.getNickName());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
@@ -569,7 +573,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意归档");
-
+        //通知
+        noticeService.save("发放回收记录【"+mjyFfjlOld.getMc()+"】同意归档",mjyFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -599,7 +604,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝归档");
-
+        //通知
+        noticeService.save("发放回收记录【"+mjyFfjlOld.getMc()+"】拒绝归档",mjyFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -627,7 +633,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意解档");
-
+        //通知
+        noticeService.save("发放回收记录【"+mjyFfjlOld.getMc()+"】同意解档",mjyFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -656,7 +663,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝解档");
-
+        //通知
+        noticeService.save("发放回收记录【"+mjyFfjlOld.getMc()+"】拒绝解档",mjyFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -688,7 +696,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "同意借阅");
-
+        //通知
+        noticeService.save("发放回收记录【"+mjyFfjlOld.getMc()+"】同意借阅",mjyFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -721,7 +730,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "拒绝借阅");
-
+        //通知
+        noticeService.save("发放回收记录【"+mjyFfjlOld.getMc()+"】拒绝借阅",mjyFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     /**
@@ -748,7 +758,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjylqff, mjyFfjlOld.getId(), mjyFfjlOld.getMc(), mjyFfjlOld.getBh(), mjyFfjlOld.getNd()+mjyFfjlOld.getNddw(), "确认归还");
-
+        //通知
+        noticeService.save("发放回收记录【"+mjyFfjlOld.getMc()+"】确认归还",mjyFfjlOld.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     //endregion

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

@@ -233,6 +233,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 mjy.setZjzt(ZjztEnum.dgd.getValue());
                 mjy.setDazt(DaztEnum.ygd.getValue());
+                mjy.setGdsqrId(qmr.getUserId());
+                mjy.setGdsqrMc(qmr.getNickName());
                 //稽查轨迹
                 mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()));
                 //保存日志
@@ -267,6 +269,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         mjyOld.setZjzt(ZjztEnum.dgd.getValue());
         mjyOld.setDazt(DaztEnum.ygd.getValue());
+        mjyOld.setGdsqrId(qmr.getUserId());
+        mjyOld.setGdsqrMc(qmr.getNickName());
         this.updateById(mjyOld);
         //稽查轨迹
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark());
@@ -1189,10 +1193,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
     //region 档案管理
 
     /**
-     * 查询给药制剂列表
+     * 查询麻精药列表
      *
-     * @param form 给药制剂
-     * @return 给药制剂集合
+     * @param form 麻精药
+     * @return 麻精药集合
      */
     @Override
     public List<ListDto> queryArchiveList(SearchForm form){
@@ -1234,10 +1238,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         Mjy mjyOld = this.getById(form.getId());
         if (mjyOld == null) {
-            throw new ServiceException("给药制剂不存在或已删除");
+            throw new ServiceException("麻精药不存在或已删除");
         }
         if (!mjyOld.getZjzt().equals(ZjztEnum.dgd.getValue())) {
-            throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待归档状态，不能操作");
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是待归档状态，不能操作");
         }
         mjyOld.setZjzt(ZjztEnum.gd.getValue());
         this.updateById(mjyOld);
@@ -1245,6 +1249,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意归档");
+        //通知
+        noticeService.save("麻精药【"+mjyOld.getMc()+"】同意归档",mjyOld.getGdsqrId(),getUrlQz("mjyList"));
     }
 
     /**
@@ -1260,10 +1266,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         Mjy mjyOld = this.getById(form.getId());
         if (mjyOld == null) {
-            throw new ServiceException("给药制剂不存在或已删除");
+            throw new ServiceException("麻精药不存在或已删除");
         }
         if (!mjyOld.getZjzt().equals(ZjztEnum.dgd.getValue())) {
-            throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待归档状态，不能操作");
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是待归档状态，不能操作");
         }
         mjyOld.setZjzt(ZjztEnum.ysd.getValue());
         mjyOld.setDazt(DaztEnum.wgd.getValue());
@@ -1274,7 +1280,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝归档");
-
+        //通知
+        noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝归档",mjyOld.getGdsqrId(),getUrlQz("mjyList"));
     }
 
     /**
@@ -1290,10 +1297,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         Mjy mjyOld = this.getById(form.getId());
         if (mjyOld == null) {
-            throw new ServiceException("给药制剂不存在或已删除");
+            throw new ServiceException("麻精药不存在或已删除");
         }
         if (!mjyOld.getZjzt().equals(ZjztEnum.djd.getValue())) {
-            throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待解档状态，不能操作");
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是待解档状态，不能操作");
         }
         mjyOld.setZjzt(ZjztEnum.ysd.getValue());
         mjyOld.setDazt(DaztEnum.wgd.getValue());
@@ -1302,7 +1309,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意解档");
-
+        //通知
+        noticeService.save("麻精药【"+mjyOld.getMc()+"】同意解档",mjyOld.getGdsqrId(),getUrlQz("mjyList"));
     }
 
     /**
@@ -1318,10 +1326,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         Mjy mjyOld = this.getById(form.getId());
         if (mjyOld == null) {
-            throw new ServiceException("给药制剂不存在或已删除");
+            throw new ServiceException("麻精药不存在或已删除");
         }
         if (!mjyOld.getZjzt().equals(ZjztEnum.djd.getValue())) {
-            throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待解档状态，不能操作");
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是待解档状态，不能操作");
         }
         mjyOld.setZjzt(ZjztEnum.gd.getValue());
         this.updateById(mjyOld);
@@ -1331,6 +1339,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝解档");
+        //通知
+        noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝解档",mjyOld.getGdsqrId(),getUrlQz("mjyList"));
     }
 
     /**
@@ -1346,10 +1356,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         Mjy mjyOld = this.getById(form.getId());
         if (mjyOld == null) {
-            throw new ServiceException("给药制剂不存在或已删除");
+            throw new ServiceException("麻精药不存在或已删除");
         }
         if (!mjyOld.getJyzt().equals(JyztEnum.djy.getValue())) {
-            throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待借阅状态，不能操作");
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是待借阅状态，不能操作");
         }
         mjyOld.setJyzt(JyztEnum.jyz.getValue());
         mjyOld.setJyksrq(form.getJyksrq());
@@ -1362,7 +1372,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "同意借阅");
-
+        //通知
+        noticeService.save("麻精药【"+mjyOld.getMc()+"】同意借阅",mjyOld.getGdsqrId(),getUrlQz("mjyList"));
     }
 
     /**
@@ -1378,10 +1389,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         Mjy mjyOld = this.getById(form.getId());
         if (mjyOld == null) {
-            throw new ServiceException("给药制剂不存在或已删除");
+            throw new ServiceException("麻精药不存在或已删除");
         }
         if (!mjyOld.getJyzt().equals(JyztEnum.djy.getValue())) {
-            throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待借阅状态，不能操作");
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是待借阅状态，不能操作");
         }
         mjyOld.setJyzt(JyztEnum.wjy.getValue());
         mjyOld.setJyksrq(form.getJyksrq());
@@ -1395,6 +1406,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "拒绝借阅");
+        //通知
+        noticeService.save("麻精药【"+mjyOld.getMc()+"】拒绝借阅",mjyOld.getGdsqrId(),getUrlQz("mjyList"));
     }
 
     /**
@@ -1410,10 +1423,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         }
         Mjy mjyOld = this.getById(form.getId());
         if (mjyOld == null) {
-            throw new ServiceException("给药制剂不存在或已删除");
+            throw new ServiceException("麻精药不存在或已删除");
         }
         if (!mjyOld.getJyzt().equals(JyztEnum.jyz.getValue())) {
-            throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是借阅中状态，不能操作");
+            throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是借阅中状态，不能操作");
         }
         mjyOld.setJyzt(JyztEnum.wjy.getValue());
         this.updateById(mjyOld);
@@ -1421,6 +1434,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
         //保存日志
         archiveLogService.saveInfo(ArchiveLogTypeEnum.mjy, mjyOld.getId(), mjyOld.getMc(), mjyOld.getBh(), mjyOld.getNd()+mjyOld.getNddw(), "确认归还");
+        //通知
+        noticeService.save("麻精药【"+mjyOld.getMc()+"】确认归还",mjyOld.getGdsqrId(),getUrlQz("mjyList"));
     }
 
     //endregion
@@ -1440,12 +1455,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
 
 
 
+
     /**
      * 获取通知的跳转url
+     * @param tab
      * @return
      */
-    private String getUrlQz(){
-        return  "/resource/mjy";
+    private String getUrlQz(String tab){
+        return  "/resource/gyzj/"+tab;
     }
 
 }