fix:[资源库管理][仪器管理]

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

@@ -103,6 +103,9 @@ public class Sj extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date gdsqsj;
 
+    /** 档案申请人id */
+    private Long dasqrId;
+
     /** 母液编号 */
     private String parentBh;
 
@@ -334,4 +337,12 @@ public class Sj extends MpBaseEntity
     public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
+
+    public Long getDasqrId() {
+        return dasqrId;
+    }
+
+    public void setDasqrId(Long dasqrId) {
+        this.dasqrId = dasqrId;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqForm.java

@@ -1,5 +1,6 @@
 package com.hxhq.business.form.yq;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hxhq.common.core.annotation.Excel;
 import org.hibernate.validator.constraints.Length;
@@ -56,8 +57,12 @@ public class YqForm {
     /** 部门名称 */
     @NotEmpty(message = "请选择所属部门")
     @Excel(name = "所属部门")
+    @TableField(exist = false)
     private String bmMc;
 
+    /** 部门id */
+    private Long deptId;
+
 
     /**
      * 温层
@@ -165,4 +170,12 @@ public class YqForm {
     public void setWc(String wc) {
         this.wc = wc;
     }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/yq/YqSearchForm.java

@@ -19,6 +19,17 @@ public class YqSearchForm {
     /** 失效日期结束 */
     private String endDate;
 
+    /** 部门名称 */
+    private String bmMc;
+
+    public String getBmMc() {
+        return bmMc;
+    }
+
+    public void setBmMc(String bmMc) {
+        this.bmMc = bmMc;
+    }
+
     public String getLy() {
         return ly;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java

@@ -1,7 +1,14 @@
 package com.hxhq.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.hxhq.business.domain.Mjy;
 import com.hxhq.business.domain.Yq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.dto.mjy.ListDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 仪器管理Mapper接口
  *
@@ -10,5 +17,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface YqMapper extends BaseMapper<Yq>
 {
+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
+    List<Yq> queryList(@Param("ew") Wrapper<Yq> queryWrapper);
 
 }

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

@@ -17,6 +17,7 @@ import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.mjy.*;
 import com.hxhq.business.service.IArchiveLogService;
 import com.hxhq.business.service.IGspFfjlJcgjService;
+import com.hxhq.business.service.INoticeService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.DateUtils;
@@ -51,6 +52,9 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
     @Autowired
     private IArchiveLogService archiveLogService;
 
+    @Autowired
+    private INoticeService noticeService;
+
     /**
      * 查询供试品发放记录列表
      * @return 供试品发放记录
@@ -233,6 +237,9 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         if (!gspFfjl.getJlzt().equals(JlztEnum.gd.getValue())) {
             throw new ServiceException("发放记录发放记录【" + gspFfjl.getMc() + "】未归档，不能解档");
         }
+        if(!gspFfjl.getGdsqrId().equals(qmr.getUserId())){
+            throw new ServiceException("只有归档申请人才能操作");
+        }
         //申请解档后，状态更新为待解档，等待档案员审核期间无法进行其他操作；
         gspFfjl.setJlzt(JlztEnum.djd.getValue());
         this.updateById(gspFfjl);
@@ -497,6 +504,9 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         if (!gspFfjl.getJyzt().equals(JyztEnum.wjy.getValue())) {
             throw new ServiceException("发放记录【" + gspFfjl.getMc() + "】不是未借阅状态，不能借阅");
         }
+        if(!gspFfjl.getGdsqrId().equals(qmr.getUserId())){
+            throw new ServiceException("只有归档申请人才能操作");
+        }
         //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作；
         gspFfjl.setJyzt(JyztEnum.djy.getValue());
         gspFfjl.setJyksrq(form.getStartDate());
@@ -588,6 +598,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
             mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
         }
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "同意归档");
+        //通知
+        noticeService.save("供试品发放记录【"+gspFfjl.getMc()+"】同意归档",gspFfjl.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     @Override
@@ -621,6 +633,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
             mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
         }
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "拒绝归档");
+        //通知
+        noticeService.save("供试品发放记录【"+gspFfjl.getMc()+"】拒绝归档",gspFfjl.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     @Override
@@ -654,6 +668,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
             mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
         }
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "同意解档");
+        //通知
+        noticeService.save("供试品发放记录【"+gspFfjl.getMc()+"】同意解档",gspFfjl.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     @Override
@@ -687,6 +703,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
             mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
         }
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "拒绝解档");
+        //通知
+        noticeService.save("供试品发放记录【"+gspFfjl.getMc()+"】拒绝解档",gspFfjl.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     @Override
@@ -722,6 +740,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
             mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
         }
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "同意借阅");
+        //通知
+        noticeService.save("供试品发放记录【"+gspFfjl.getMc()+"】同意借阅",gspFfjl.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     @Override
@@ -755,6 +775,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
             mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
         }
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "拒绝借阅");
+        //通知
+        noticeService.save("供试品发放记录【"+gspFfjl.getMc()+"】拒绝借阅",gspFfjl.getGdsqrId(),getUrlQz("ffjlList"));
     }
 
     @Override
@@ -789,6 +811,17 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
             mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
         }
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "确认归还");
+        //通知
+        noticeService.save("供试品发放记录【"+gspFfjl.getMc()+"】确认归还",gspFfjl.getGdsqrId(),getUrlQz("ffjlList"));
+    }
+
+    /**
+     * 获取通知的跳转url
+     * @param tab
+     * @return
+     */
+    private String getUrlQz(String tab){
+        return  "/resource/specimen/"+tab;
     }
 
 }

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

@@ -11,6 +11,7 @@ import com.hxhq.business.domain.*;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.gsp.*;
 import com.hxhq.business.service.IGspRkjlJcgjService;
+import com.hxhq.business.service.INoticeService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
 import com.hxhq.common.core.exception.ServiceException;
@@ -41,6 +42,9 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
     @Autowired
     private IGspRkjlJcgjService gspRkjlJcgjService;
 
+    @Autowired
+    private INoticeService noticeService;
+
     /**
      * 查询供试品入库记录列表
      *
@@ -413,6 +417,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意归档",  "Approve Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+        //通知
+        noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】同意归档",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
     }
 
     @Override
@@ -439,6 +445,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档",  "Reject Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+        //通知
+        noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】拒绝归档",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
     }
 
     @Override
@@ -465,6 +473,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意解档",  "Approve De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+        //通知
+        noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】同意解档",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
     }
 
     @Override
@@ -491,6 +501,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档",  "Reject De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+        //通知
+        noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】拒绝解档",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
     }
 
     @Override
@@ -519,6 +531,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意借阅",  "Approve Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+        //通知
+        noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】同意借阅",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
     }
 
     @Override
@@ -545,6 +559,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅",  "Reject Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+        //通知
+        noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】拒绝借阅",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
     }
 
     @Override
@@ -571,6 +587,16 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还",  "Check-out End Confirmation",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+        //通知
+        noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】确认归还",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
     }
 
+    /**
+     * 获取通知的跳转url
+     * @param tab
+     * @return
+     */
+    private String getUrlQz(String tab){
+        return  "/resource/specimen/"+tab;
+    }
 }

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

@@ -57,6 +57,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
     @Autowired
     private IArchiveLogService archiveLogService;
 
+    @Autowired
+    private INoticeService noticeService;
     /**
      * 查询供试品管理列表
      *
@@ -214,8 +216,10 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         gspJcgj.setJcmc(ShbjEnum.getEnumByValue(form.getQmyy()).getText());
         if (form.getQmyy().equals(ShbjEnum.ty.getValue())) {
             gspJcgj.setJcmcys(JcmcysEnum.green.getValue());
+            noticeService.save("供试品【"+gspOld.getMc()+"】同意编辑",gspOld.getBjrId(),getUrlQz("gspList"));
         } else {
             gspJcgj.setJcmcys(JcmcysEnum.red.getValue());
+            noticeService.save("供试品【"+gspOld.getMc()+"】拒绝编辑",gspOld.getBjrId(),getUrlQz("gspList"));
         }
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("申请备注", gspOld.getBjbz());
@@ -331,7 +335,6 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         zcgService.updateById(zcg);
         this.saveOrUpdateBatch(gspList);
         gspJcgjService.saveBatch(gspJcgjList);
-
     }
 
     @Override
@@ -589,10 +592,13 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
             gspJcgj.setJcmc( ShXgkcEnum.ty.getText());
             gspJcgj.setJcmcEn("Approve Inventory Change");
             gspJcgj.setJcmcys(JcmcysEnum.green.getValue());
+            noticeService.save("供试品【"+gspOld.getMc()+"】同意修改库存",gspOld.getKcbjrId(),getUrlQz("gspList"));
+
         } else {
             gspJcgj.setJcmc( ShXgkcEnum.jj.getText());
             gspJcgj.setJcmcEn("Reject Inventory Change");
             gspJcgj.setJcmcys(JcmcysEnum.red.getValue());
+            noticeService.save("供试品【"+gspOld.getMc()+"】拒绝修改库存",gspOld.getKcbjrId(),getUrlQz("gspList"));
         }
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("申请备注", gspOld.getKcbjbz());
@@ -876,6 +882,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         if (!gsp.getJyzt().equals(JyztEnum.wjy.getValue())) {
             throw new SecurityException("供试品【" + gsp.getMc() + "】不是未借阅状态，不能借阅");
         }
+        if(!gsp.getDasqrId().equals(qmr.getUserId())){
+            throw new ServiceException("只有归档申请人才能操作");
+        }
         //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作；
         gsp.setJyzt(JyztEnum.djy.getValue());
         gsp.setJyksrq(form.getStartDate());
@@ -915,6 +924,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         if (!gsp.getZjzt().equals(ZjztEnum.gd.getValue())) {
             throw new SecurityException("供试品【" + gsp.getMc() + "】未归档，不能解档");
         }
+        if(!gsp.getDasqrId().equals(qmr.getUserId())){
+            throw new ServiceException("只有归档申请人才能操作");
+        }
         //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作；
         gsp.setZjzt(ZjztEnum.djd.getValue());
         gsp.setDasqrIdOld(gsp.getDasqrId());
@@ -1073,6 +1085,11 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), jsr1);
         //endregion
 
+        noticeService.save("供试品【"+gspOld.getMc()+"】确认归还",ghr1.getUserId(),getUrlQz("gspList"));
+        if(ghr2 != null) {
+            noticeService.save("供试品【"+gspOld.getMc()+"】确认归还",ghr2.getUserId(),getUrlQz("gspList"));
+        }
+
     }
 
     @Override
@@ -1129,6 +1146,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意归档");
 
+        noticeService.save("供试品【"+gsp.getMc()+"】同意归档",gsp.getDasqrId(),getUrlQz("gspList"));
+
     }
 
     @Override
@@ -1158,6 +1177,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝归档");
 
+        noticeService.save("供试品【"+gsp.getMc()+"】拒绝归档",gsp.getDasqrId(),getUrlQz("gspList"));
+
     }
 
     @Override
@@ -1187,6 +1208,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意解档");
 
+        noticeService.save("供试品【"+gsp.getMc()+"】同意解档",gsp.getDasqrId(),getUrlQz("gspList"));
+
     }
 
     @Override
@@ -1218,6 +1241,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝解档");
 
+        noticeService.save("供试品【"+gsp.getMc()+"】拒绝解档",gsp.getDasqrId(),getUrlQz("gspList"));
+
     }
 
     @Override
@@ -1249,6 +1274,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意借阅");
 
+        noticeService.save("供试品【"+gsp.getMc()+"】同意借阅",gsp.getDasqrId(),getUrlQz("gspList"));
+
     }
 
     @Override
@@ -1278,6 +1305,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝借阅");
 
+        noticeService.save("供试品【"+gsp.getMc()+"】拒绝借阅",gsp.getDasqrId(),getUrlQz("gspList"));
+
     }
 
     @Override
@@ -1307,6 +1336,17 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "确认归还");
 
+        noticeService.save("供试品【"+gsp.getMc()+"】确认归还",gsp.getDasqrId(),getUrlQz("gspList"));
+
+    }
+
+    /**
+     * 获取通知的跳转url
+     * @param tab
+     * @return
+     */
+    private String getUrlQz(String tab){
+        return  "/resource/specimen/"+tab;
     }
 
 }

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

@@ -63,6 +63,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
     @Autowired
     private IArchiveLogService archiveLogService;
 
+    @Autowired
+    private INoticeService noticeService;
+
     /**
      * 查询试剂库存列表
      *
@@ -427,6 +430,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         if (!sjOld.getJyzt().equals(JyztEnum.wjy.getValue())) {
             throw new SecurityException("试剂【" + sjOld.getMc() + "】不是未借阅状态，不能借阅");
         }
+        if(!sjOld.getDasqrId().equals(qmr.getUserId())){
+            throw new ServiceException("只有归档申请人才能操作");
+        }
         //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作；
         sjOld.setJyzt(JyztEnum.djy.getValue());
         sjOld.setJyksrq(form.getStartDate());
@@ -464,6 +470,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         if (!sjOld.getZjzt().equals(ZjztEnum.gd.getValue())) {
             throw new SecurityException("试剂【" + sjOld.getMc() + "】未归档，不能解档");
         }
+        if(!sjOld.getDasqrId().equals(qmr.getUserId())){
+            throw new ServiceException("只有归档申请人才能操作");
+        }
         //申请解档后，制剂状态更新为待解档，等待档案员审核期间无法进行其他操作；
         sjOld.setZjzt(ZjztEnum.djd.getValue());
         this.updateById(sjOld);
@@ -497,6 +506,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         }
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         sjOld.setZjzt(ZjztEnum.dgd.getValue());
+        sjOld.setGdsqsj(new Date());
+        sjOld.setDasqrId(qmr.getUserId());
         this.updateById(sjOld);
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
@@ -531,6 +542,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             }
             //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
             sjOld.setZjzt(ZjztEnum.dgd.getValue());
+            sjOld.setGdsqsj(new Date());
+            sjOld.setDasqrId(qmr.getUserId());
             sjList.add(sjOld);
         }
         this.updateBatchById(sjList);
@@ -546,7 +559,6 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
                     JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
 
             archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "申请归档");
-
         }
 
     }
@@ -803,6 +815,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意归档");
 
+        noticeService.save("试剂【"+sj.getMc()+"】同意归档",sj.getDasqrId(),getUrlQz());
+
     }
 
     @Override
@@ -832,6 +846,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝归档");
 
+        noticeService.save("试剂【"+sj.getMc()+"】拒绝归档",sj.getDasqrId(),getUrlQz());
+
     }
 
     @Override
@@ -861,6 +877,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意解档");
 
+        noticeService.save("试剂【"+sj.getMc()+"】同意解档",sj.getDasqrId(),getUrlQz());
+
     }
 
     @Override
@@ -890,6 +908,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝解档");
 
+        noticeService.save("试剂【"+sj.getMc()+"】拒绝解档",sj.getDasqrId(),getUrlQz());
+
     }
 
     @Override
@@ -921,6 +941,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意借阅");
 
+        noticeService.save("试剂【"+sj.getMc()+"】同意借阅",sj.getDasqrId(),getUrlQz());
+
     }
 
     @Override
@@ -950,6 +972,8 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
         archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝借阅");
 
+        noticeService.save("试剂【"+sj.getMc()+"】拒绝借阅",sj.getDasqrId(),getUrlQz());
+
     }
 
     @Override
@@ -981,4 +1005,11 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
 
     }
 
+    /**
+     * 获取通知的跳转url
+     * @return
+     */
+    private String getUrlQz(){
+        return  "/resource/reagent";
+    }
 }

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

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -53,24 +54,27 @@ public class YqServiceImpl extends ServiceImpl implements IYqServi
     @Override
     public List<Yq> queryList(YqSearchForm form)
     {
-        LambdaQueryWrapper<Yq> queryWrapper = new LambdaQueryWrapper<>();
+        QueryWrapper<Yq> queryWrapper = Wrappers.query();
         if(StringUtils.isNotEmpty(form.getMc())) {
-            queryWrapper.like(Yq::getMc, form.getMc());
+            queryWrapper.like("y.`mc`", form.getBh());
         }
         if(StringUtils.isNotEmpty(form.getBh())) {
-            queryWrapper.like(Yq::getBh, form.getBh());
+            queryWrapper.like("y.bh", form.getBh());
         }
         if(StringUtils.isNotEmpty(form.getLy())) {
-            queryWrapper.like(Yq::getLy, form.getLy());
+            queryWrapper.like("y.ly", form.getLy());
         }
         if(StringUtils.isNotEmpty(form.getStartDate())) {
-            queryWrapper.ge(Yq::getJzrq, form.getStartDate());
+            queryWrapper.ge("y.jzrq", form.getStartDate());
         }
         if(StringUtils.isNotEmpty(form.getEndDate())) {
-            queryWrapper.le(Yq::getJzrq, form.getEndDate());
+            queryWrapper.le("y.jzrq", form.getEndDate());
         }
-        queryWrapper.orderByDesc(MpBaseEntity::getId);
-        return this.list(queryWrapper);
+        if(StringUtils.isNotEmpty(form.getBmMc())) {
+            queryWrapper.like("d.dept_name", form.getBmMc());
+        }
+        queryWrapper.orderByDesc("y.id");
+        return baseMapper.queryList(queryWrapper);
     }
 
     @Override

hxhq-modules/hxhq-system/src/main/resources/mapper/business/YqMapper.xml

@@ -3,4 +3,12 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.YqMapper">
+    <select id="queryList" resultType="com.hxhq.business.domain.Yq">
+        SELECT t.*, d.dept_name AS bmMc FROM t_yq y LEFT JOIN sys_dept d ON y.dept_id = d.dept_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
 </mapper>