feat：[档案管理]麻精药，给药制剂，发放记录档案

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlArchiveController.java

@@ -1,18 +1,17 @@
 package com.hxhq.business.controller;
 
-import com.hxhq.business.domain.GyzjFfjlJcgj;
 import com.hxhq.business.dto.gyzj.FfjlListDto;
-import com.hxhq.business.form.gyzj.*;
-import com.hxhq.business.service.IGyzjFfjlJcgjService;
+import com.hxhq.business.dto.gyzj.ListDto;
+import com.hxhq.business.form.gyzj.ArchiveForm;
+import com.hxhq.business.form.gyzj.FfjlSearchForm;
+import com.hxhq.business.form.gyzj.SearchForm;
 import com.hxhq.business.service.IGyzjFfjlService;
 import com.hxhq.common.core.web.controller.BaseController;
 import com.hxhq.common.core.web.domain.AjaxResult;
 import com.hxhq.common.core.web.page.TableDataInfo;
 import com.hxhq.common.security.annotation.RequiresPermissions;
-import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 
@@ -20,145 +19,106 @@ import java.util.List;
  * 给药制剂发放记录档案Controller
  *
  * @author hxhq
- * @date 2025-12-15
+ * @date 2025-12-18
  */
 @RestController
 @RequestMapping("/business/gyzjFfjlArchive")
 public class GyzjFfjlArchiveController extends BaseController
 {
     @Autowired
-    private IGyzjFfjlJcgjService gyzjFfjlJcgjService;
-    @Autowired
     private IGyzjFfjlService gyzjFfjlService;
 
+
     /**
      * 列表
      */
+    @RequiresPermissions("business:archive:gyzjFfjl:list")
     @GetMapping("/list")
-    @RequiresPermissions("business:resource:gyzj:ffjllist")
     public TableDataInfo list(FfjlSearchForm form)
     {
         startPage();
-        List<FfjlListDto> list = gyzjFfjlService.queryList(form);
-        return getDataTable(list);
-    }
-
-    /**
-     * 详细信息
-     */
-    @RequiresPermissions("business:resource:gyzj:ffjlxq")
-    @GetMapping(value = "/info")
-    public AjaxResult getInfo(Long id)
-    {
-        return AjaxResult.success(gyzjFfjlService.queryInfo(id));
-    }
-
-    /**
-     * 稽查轨迹列表
-     */
-    @RequiresPermissions("business:resource:gyzj:ffjllist")
-    @GetMapping("/jcgjList")
-    public TableDataInfo jcgjList(GyzjFfjlJcgj form)
-    {
-        startPage();
-        List<GyzjFfjlJcgj> list = gyzjFfjlJcgjService.queryList(form);
+        List<FfjlListDto> list = gyzjFfjlService.queryArchiveList(form);
         return getDataTable(list);
     }
 
     /**
-     * 解档
+     * 同意归档
      */
-    @PostMapping("/jd")
-    @RequiresPermissions("business:resource:gyzj:ffjljd")
-    public AjaxResult jd(@RequestBody FfjlJdForm form)
+    @PostMapping("/tygd")
+    @RequiresPermissions("business:archive:gyzjFfjl:tygd")
+    public AjaxResult tygd(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjFfjlService.jd(form);
+        gyzjFfjlService.tygd(form);
         return AjaxResult.success("操作成功");
     }
 
+
     /**
-     * 批量归档
+     * 拒绝归档
      */
-    @PostMapping("/plgd")
-    @RequiresPermissions("business:resource:gyzj:ffjlgd")
-    public AjaxResult plgd(@RequestBody FfjlGdForm form)
+    @PostMapping("/jjgd")
+    @RequiresPermissions("business:archive:gyzjFfjl:jjgd")
+    public AjaxResult jjgd(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjFfjlService.plgd(form);
+        gyzjFfjlService.jjgd(form);
         return AjaxResult.success("操作成功");
     }
 
     /**
-     * 归档
+     * 同意解档
      */
-    @PostMapping("/gd")
-    @RequiresPermissions("business:resource:gyzj:ffjlgd")
-    public AjaxResult gd(@RequestBody FfjlGdForm form)
+    @PostMapping("/tyjd")
+    @RequiresPermissions("business:archive:gyzjFfjl:tyjd")
+    public AjaxResult tyjd(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjFfjlService.gd(form);
+        gyzjFfjlService.tyjd(form);
         return AjaxResult.success("操作成功");
     }
 
 
     /**
-     * 批量锁定
+     * 拒绝解档
      */
-    @PostMapping("/plsd")
-    @RequiresPermissions("business:resource:gyzj:ffjlsd")
-    public AjaxResult plsd(@RequestBody FfjlSdForm form)
+    @PostMapping("/jjjd")
+    @RequiresPermissions("business:archive:gyzjFfjl:jjjd")
+    public AjaxResult jjjd(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjFfjlService.plsd(form);
+        gyzjFfjlService.jjjd(form);
         return AjaxResult.success("操作成功");
     }
 
     /**
-     * 锁定
+     * 同意借阅
      */
-    @PostMapping("/sd")
-    @RequiresPermissions("business:resource:gyzj:ffjlsd")
-    public AjaxResult sd(@RequestBody FfjlSdForm form)
+    @PostMapping("/tyjy")
+    @RequiresPermissions("business:archive:gyzjFfjl:tyjy")
+    public AjaxResult tyjy(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjFfjlService.sd(form);
+        gyzjFfjlService.tyjy(form);
         return AjaxResult.success("操作成功");
     }
 
-    /**
-     * 解锁
-     */
-    @PostMapping("/js")
-    @RequiresPermissions("business:resource:gyzj:ffjljs")
-    public AjaxResult js(@RequestBody FfjlJsForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjFfjlService.js(form);
-        return AjaxResult.success("操作成功");
-    }
 
     /**
-     * 借阅
+     * 拒绝借阅
      */
-    @PostMapping("/jy")
-    @RequiresPermissions("business:resource:gyzj:ffjljy")
-    public AjaxResult jy(@RequestBody FfjlJyForm form)
+    @PostMapping("/jjjy")
+    @RequiresPermissions("business:archive:gyzjFfjl:jjjy")
+    public AjaxResult jjjy(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjFfjlService.jy(form);
+        gyzjFfjlService.jjjy(form);
         return AjaxResult.success("操作成功");
     }
 
+
     /**
-     * 加签
+     * 确认归还
      */
-    @PostMapping("/jq")
-    @RequiresPermissions("business:resource:gyzj:ffjljq")
-    public AjaxResult jq(@RequestBody FfjlJqForm form)
+    @PostMapping("/qrgh")
+    @RequiresPermissions("business:archive:gyzjFfjl:qrgh")
+    public AjaxResult qrgh(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        gyzjFfjlService.jq(form);
+        gyzjFfjlService.qrgh(form);
         return AjaxResult.success("操作成功");
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjFfjlController.java

@@ -8,6 +8,7 @@ import com.hxhq.business.service.IGyzjFfjlService;
 import com.hxhq.common.core.web.controller.BaseController;
 import com.hxhq.common.core.web.domain.AjaxResult;
 import com.hxhq.common.core.web.page.TableDataInfo;
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +47,7 @@ public class GyzjFfjlController extends BaseController
     /**
      * 详细信息
      */
-    @RequiresPermissions("business:resource:gyzj:ffjlxq")
+    @RequiresPermissions(value={"business:resource:gyzj:ffjlxq","business:archive:gyzj:ffjlxq"}, logical= Logical.OR)
     @GetMapping(value = "/info")
     public AjaxResult getInfo(Long id)
     {
@@ -56,7 +57,7 @@ public class GyzjFfjlController extends BaseController
     /**
      * 稽查轨迹列表
      */
-    @RequiresPermissions("business:resource:gyzj:ffjllist")
+    @RequiresPermissions(value={"business:resource:gyzj:ffjlxq","business:archive:gyzj:ffjlxq"}, logical= Logical.OR)
     @GetMapping("/jcgjList")
     public TableDataInfo jcgjList(GyzjFfjlJcgj form)
     {

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlArchiveController.java

@@ -1,18 +1,17 @@
 package com.hxhq.business.controller;
 
-import com.hxhq.business.domain.MjyFfjlJcgj;
 import com.hxhq.business.dto.mjy.FfjlListDto;
-import com.hxhq.business.form.mjy.*;
-import com.hxhq.business.service.IMjyFfjlJcgjService;
+import com.hxhq.business.dto.mjy.ListDto;
+import com.hxhq.business.form.mjy.ArchiveForm;
+import com.hxhq.business.form.mjy.FfjlSearchForm;
+import com.hxhq.business.form.mjy.SearchForm;
 import com.hxhq.business.service.IMjyFfjlService;
 import com.hxhq.common.core.web.controller.BaseController;
 import com.hxhq.common.core.web.domain.AjaxResult;
 import com.hxhq.common.core.web.page.TableDataInfo;
 import com.hxhq.common.security.annotation.RequiresPermissions;
-import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 
@@ -20,145 +19,106 @@ import java.util.List;
  * 麻精药发放记录档案Controller
  *
  * @author hxhq
- * @date 2025-12-15
+ * @date 2025-12-18
  */
 @RestController
 @RequestMapping("/business/mjyFfjlArchive")
 public class MjyFfjlArchiveController extends BaseController
 {
     @Autowired
-    private IMjyFfjlJcgjService mjyFfjlJcgjService;
-    @Autowired
     private IMjyFfjlService mjyFfjlService;
 
+
     /**
      * 列表
      */
+    @RequiresPermissions("business:archive:mjyFfjl:list")
     @GetMapping("/list")
-    @RequiresPermissions("business:resource:mjy:ffjllist")
     public TableDataInfo list(FfjlSearchForm form)
     {
         startPage();
-        List<FfjlListDto> list = mjyFfjlService.queryList(form);
-        return getDataTable(list);
-    }
-
-    /**
-     * 详细信息
-     */
-    @RequiresPermissions("business:resource:mjy:ffjlxq")
-    @GetMapping(value = "/info")
-    public AjaxResult getInfo(Long id)
-    {
-        return AjaxResult.success(mjyFfjlService.queryInfo(id));
-    }
-
-    /**
-     * 稽查轨迹列表
-     */
-    @RequiresPermissions("business:resource:mjy:ffjllist")
-    @GetMapping("/jcgjList")
-    public TableDataInfo jcgjList(MjyFfjlJcgj form)
-    {
-        startPage();
-        List<MjyFfjlJcgj> list = mjyFfjlJcgjService.queryList(form);
+        List<FfjlListDto> list = mjyFfjlService.queryArchiveList(form);
         return getDataTable(list);
     }
 
     /**
-     * 解档
+     * 同意归档
      */
-    @PostMapping("/jd")
-    @RequiresPermissions("business:resource:mjy:ffjljd")
-    public AjaxResult jd(@RequestBody FfjlJdForm form)
+    @PostMapping("/tygd")
+    @RequiresPermissions("business:archive:mjyFfjl:tygd")
+    public AjaxResult tygd(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyFfjlService.jd(form);
+        mjyFfjlService.tygd(form);
         return AjaxResult.success("操作成功");
     }
 
+
     /**
-     * 批量归档
+     * 拒绝归档
      */
-    @PostMapping("/plgd")
-    @RequiresPermissions("business:resource:mjy:ffjlgd")
-    public AjaxResult plgd(@RequestBody FfjlGdForm form)
+    @PostMapping("/jjgd")
+    @RequiresPermissions("business:archive:mjyFfjl:jjgd")
+    public AjaxResult jjgd(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyFfjlService.plgd(form);
+        mjyFfjlService.jjgd(form);
         return AjaxResult.success("操作成功");
     }
 
     /**
-     * 归档
+     * 同意解档
      */
-    @PostMapping("/gd")
-    @RequiresPermissions("business:resource:mjy:ffjlgd")
-    public AjaxResult gd(@RequestBody FfjlGdForm form)
+    @PostMapping("/tyjd")
+    @RequiresPermissions("business:archive:mjyFfjl:tyjd")
+    public AjaxResult tyjd(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyFfjlService.gd(form);
+        mjyFfjlService.tyjd(form);
         return AjaxResult.success("操作成功");
     }
 
 
     /**
-     * 批量锁定
+     * 拒绝解档
      */
-    @PostMapping("/plsd")
-    @RequiresPermissions("business:resource:mjy:ffjlsd")
-    public AjaxResult plsd(@RequestBody FfjlSdForm form)
+    @PostMapping("/jjjd")
+    @RequiresPermissions("business:archive:mjyFfjl:jjjd")
+    public AjaxResult jjjd(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyFfjlService.plsd(form);
+        mjyFfjlService.jjjd(form);
         return AjaxResult.success("操作成功");
     }
 
     /**
-     * 锁定
+     * 同意借阅
      */
-    @PostMapping("/sd")
-    @RequiresPermissions("business:resource:mjy:ffjlsd")
-    public AjaxResult sd(@RequestBody FfjlSdForm form)
+    @PostMapping("/tyjy")
+    @RequiresPermissions("business:archive:mjyFfjl:tyjy")
+    public AjaxResult tyjy(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyFfjlService.sd(form);
+        mjyFfjlService.tyjy(form);
         return AjaxResult.success("操作成功");
     }
 
-    /**
-     * 解锁
-     */
-    @PostMapping("/js")
-    @RequiresPermissions("business:resource:mjy:ffjljs")
-    public AjaxResult js(@RequestBody FfjlJsForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyFfjlService.js(form);
-        return AjaxResult.success("操作成功");
-    }
 
     /**
-     * 借阅
+     * 拒绝借阅
      */
-    @PostMapping("/jy")
-    @RequiresPermissions("business:resource:mjy:ffjljy")
-    public AjaxResult jy(@RequestBody FfjlJyForm form)
+    @PostMapping("/jjjy")
+    @RequiresPermissions("business:archive:mjyFfjl:jjjy")
+    public AjaxResult jjjy(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyFfjlService.jy(form);
+        mjyFfjlService.jjjy(form);
         return AjaxResult.success("操作成功");
     }
 
+
     /**
-     * 加签
+     * 确认归还
      */
-    @PostMapping("/jq")
-    @RequiresPermissions("business:resource:mjy:ffjljq")
-    public AjaxResult jq(@RequestBody FfjlJqForm form)
+    @PostMapping("/qrgh")
+    @RequiresPermissions("business:archive:mjyFfjl:qrgh")
+    public AjaxResult qrgh(@RequestBody ArchiveForm form)
     {
-        form.setQmrId(SecurityUtils.getUserId());
-        mjyFfjlService.jq(form);
+        mjyFfjlService.qrgh(form);
         return AjaxResult.success("操作成功");
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyFfjlController.java

@@ -8,6 +8,7 @@ import com.hxhq.business.service.IMjyFfjlService;
 import com.hxhq.common.core.web.controller.BaseController;
 import com.hxhq.common.core.web.domain.AjaxResult;
 import com.hxhq.common.core.web.page.TableDataInfo;
+import com.hxhq.common.security.annotation.Logical;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +47,7 @@ public class MjyFfjlController extends BaseController
     /**
      * 详细信息
      */
-    @RequiresPermissions("business:resource:mjy:ffjlxq")
+    @RequiresPermissions(value={"business:resource:mjy:ffjlxq","business:archive:mjy:ffjlxq"}, logical= Logical.OR)
     @GetMapping(value = "/info")
     public AjaxResult getInfo(Long id)
     {
@@ -56,7 +57,7 @@ public class MjyFfjlController extends BaseController
     /**
      * 稽查轨迹列表
      */
-    @RequiresPermissions("business:resource:mjy:ffjllist")
+    @RequiresPermissions(value={"business:resource:mjy:ffjlxq","business:archive:mjy:ffjlxq"}, logical= Logical.OR)
     @GetMapping("/jcgjList")
     public TableDataInfo jcgjList(MjyFfjlJcgj form)
     {

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

@@ -24,8 +24,11 @@ public class GyzjFfjl extends MpBaseEntity
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Integer jyzt;
 
+    /** 档案状态：1：未归档；3：已归档*/
+    private Integer dazt;
+
     /** 给药制剂id */
-        private Long gyzjId;
+    private Long gyzjId;
 
     /** 名称 */
     private String mc;
@@ -203,6 +206,14 @@ public class GyzjFfjl extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyjsrq;
 
+    public Integer getDazt() {
+        return dazt;
+    }
+
+    public void setDazt(Integer dazt) {
+        this.dazt = dazt;
+    }
+
     public String getCkmz() {
         return ckmz;
     }

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

@@ -23,6 +23,9 @@ public class MjyFfjl extends MpBaseEntity
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Integer jyzt;
 
+    /** 档案状态：1：未归档；3：已归档*/
+    private Integer dazt;
+
     /** 麻精药id */
     private Long mjyId;
 
@@ -208,6 +211,14 @@ public class MjyFfjl extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyjsrq;
 
+    public Integer getDazt() {
+        return dazt;
+    }
+
+    public void setDazt(Integer dazt) {
+        this.dazt = dazt;
+    }
+
     public String getLqr1McEn() {
         return lqr1McEn;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/FfjlListDto.java

@@ -82,6 +82,31 @@ public class FfjlListDto {
     /** 发放目的其他 */
     private String mdOther;
 
+
+    /** 借阅开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyksrq;
+
+    /** 借阅结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyjsrq;
+
+    public Date getJyksrq() {
+        return jyksrq;
+    }
+
+    public void setJyksrq(Date jyksrq) {
+        this.jyksrq = jyksrq;
+    }
+
+    public Date getJyjsrq() {
+        return jyjsrq;
+    }
+
+    public void setJyjsrq(Date jyjsrq) {
+        this.jyjsrq = jyjsrq;
+    }
+
     public String getMdOther() {
         return mdOther;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlDetailDto.java

@@ -12,9 +12,6 @@ public class FfjlDetailDto extends MjyFfjl {
     /** 发放目的名称 */
     private String mdMcs;
 
-    /** 发放目的其他 */
-    private String mdOther;
-
     public String getMdMcs() {
         return mdMcs;
     }
@@ -23,11 +20,4 @@ public class FfjlDetailDto extends MjyFfjl {
         this.mdMcs = mdMcs;
     }
 
-    public String getMdOther() {
-        return mdOther;
-    }
-
-    public void setMdOther(String mdOther) {
-        this.mdOther = mdOther;
-    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/FfjlListDto.java

@@ -95,6 +95,30 @@ public class FfjlListDto {
     /** 发放目的其他 */
     private String mdOther;
 
+    /** 借阅开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyksrq;
+
+    /** 借阅结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyjsrq;
+
+    public Date getJyksrq() {
+        return jyksrq;
+    }
+
+    public void setJyksrq(Date jyksrq) {
+        this.jyksrq = jyksrq;
+    }
+
+    public Date getJyjsrq() {
+        return jyjsrq;
+    }
+
+    public void setJyjsrq(Date jyjsrq) {
+        this.jyjsrq = jyjsrq;
+    }
+
     public String getMdMcs() {
         return mdMcs;
     }

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

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date 2025-12-21
  */
 public interface IGyzjFfjlService extends IService<GyzjFfjl> {
+
+    //region 发放记录
     /**
      * 详情
      *
@@ -126,4 +128,52 @@ public interface IGyzjFfjlService extends IService {
      */
     public void ff(FfForm form,Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
 
+    //endregion
+
+    //region 档案管理
+
+    /**
+     * 查询给药制剂列表
+     *
+     * @param form 给药制剂
+     * @return 给药制剂集合
+     */
+    public List<FfjlListDto> queryArchiveList(FfjlSearchForm form);
+
+    /**
+     * 同意归档
+     */
+    public void tygd(ArchiveForm form);
+
+    /**
+     * 拒绝归档
+     */
+    public void jjgd(ArchiveForm form);
+
+    /**
+     * 同意解档
+     */
+    public void tyjd(ArchiveForm form);
+
+    /**
+     * 拒绝解档
+     */
+    public void jjjd(ArchiveForm form);
+
+    /**
+     * 同意借阅
+     */
+    public void tyjy(ArchiveForm form);
+
+    /**
+     * 拒绝借阅
+     */
+    public void jjjy(ArchiveForm form);
+
+    /**
+     * 确认归还
+     */
+    public void qrgh(ArchiveForm form);
+
+    //endregion
 }

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

@@ -19,6 +19,10 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date 2025-12-21
  */
 public interface IMjyFfjlService extends IService<MjyFfjl> {
+
+
+    //region 发放记录
+
     /**
      * 详情
      *
@@ -126,4 +130,53 @@ public interface IMjyFfjlService extends IService {
      */
     public void ff( FfForm form, Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
 
+    //endregion
+
+    //region 档案管理
+
+    /**
+     * 查询给药制剂列表
+     *
+     * @param form 给药制剂
+     * @return 给药制剂集合
+     */
+    public List<FfjlListDto> queryArchiveList(FfjlSearchForm form);
+
+    /**
+     * 同意归档
+     */
+    public void tygd(ArchiveForm form);
+
+    /**
+     * 拒绝归档
+     */
+    public void jjgd(ArchiveForm form);
+
+    /**
+     * 同意解档
+     */
+    public void tyjd(ArchiveForm form);
+
+    /**
+     * 拒绝解档
+     */
+    public void jjjd(ArchiveForm form);
+
+    /**
+     * 同意借阅
+     */
+    public void tyjy(ArchiveForm form);
+
+    /**
+     * 拒绝借阅
+     */
+    public void jjjy(ArchiveForm form);
+
+    /**
+     * 确认归还
+     */
+    public void qrgh(ArchiveForm form);
+
+    //endregion
+
 }

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

@@ -11,6 +11,7 @@ import com.hxhq.business.domain.GyzjFfjlJcgj;
 import com.hxhq.business.domain.StudyGyzj;
 import com.hxhq.business.dto.gyzj.FfjlDetailDto;
 import com.hxhq.business.dto.gyzj.FfjlListDto;
+import com.hxhq.business.dto.gyzj.ListDto;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.enums.zykgl.JlztEnum;
 import com.hxhq.business.form.gyzj.*;
@@ -47,6 +48,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     @Autowired
     private IStudyGyzjService studyGyzjService;
 
+
+    //region 发放记录
+
     /**
      * 详情
      *
@@ -232,6 +236,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
             for (GyzjFfjl gyzjFfjl : gyzjFfjlList) {
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 gyzjFfjl.setJlzt(JlztEnum.dgd.getValue());
+                gyzjFfjl.setDazt(DaztEnum.ygd.getValue());
                 // 稽查轨迹
                 gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()));
             }
@@ -263,6 +268,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         }
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         gyzjFfjlOld.setJlzt(JlztEnum.dgd.getValue());
+        gyzjFfjlOld.setDazt(DaztEnum.ygd.getValue());
         this.updateById(gyzjFfjlOld);
         //稽查轨迹
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
@@ -492,6 +498,246 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     }
 
 
+    //endregion
+
+    //region 档案管理
+
+    /**
+     * 查询发放记录列表
+     *
+     * @param form 发放记录
+     * @return 发放记录集合
+     */
+    @Override
+    public List<FfjlListDto> queryArchiveList(FfjlSearchForm form){
+        QueryWrapper<GyzjFfjl> queryWrapper = Wrappers.query();
+        queryWrapper.eq("t.del_flag", "0");
+        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
+            queryWrapper.eq("t.jyzt", form.getJyzt());
+        }
+        if (form.getJlzt() != null && form.getJlzt().intValue() > 0) {
+            queryWrapper.eq("t.jlzt", form.getJlzt());
+        }
+        if (StringUtils.isNoneBlank(form.getMc())) {
+            queryWrapper.and(p -> p.like("t.`mc`", form.getMc()));
+        }
+        if (StringUtils.isNoneBlank(form.getBh())) {
+            queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
+        }
+        if (StringUtils.isNoneBlank(form.getStartDateCk())) {
+            queryWrapper.and(p -> p.apply("t.ffrq>={0}", form.getStartDateCk()));
+        }
+        if (StringUtils.isNoneBlank(form.getEndDateCk())) {
+            queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk());
+        }
+        if (StringUtils.isNoneBlank(form.getStartDateRk())) {
+            queryWrapper.and(p -> p.apply("t.rkrq>={0}", form.getStartDateRk()));
+        }
+        if (StringUtils.isNoneBlank(form.getEndDateRk())) {
+            queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk());
+        }
+        if (form.getMdId() != null && form.getMdId().intValue() > 0) {
+            queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+        }
+        queryWrapper.orderByDesc("t.id");
+        return baseMapper.queryList(queryWrapper);
+    }
+
+    /**
+     * 同意归档
+     */
+    @Override
+    public void tygd(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
+        if (gyzjFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.dgd.getValue())) {
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待归档状态，不能操作");
+        }
+        gyzjFfjlOld.setJlzt(JlztEnum.gd.getValue());
+        this.updateById(gyzjFfjlOld);
+        //稽查轨迹
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    /**
+     * 拒绝归档
+     */
+    @Override
+    public void jjgd(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
+        if (gyzjFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.dgd.getValue())) {
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待归档状态，不能操作");
+        }
+        gyzjFfjlOld.setJlzt(JlztEnum.ysd.getValue());
+        gyzjFfjlOld.setDazt(DaztEnum.wgd.getValue());
+        this.updateById(gyzjFfjlOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因", form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
+
+    }
+
+    /**
+     * 同意解档
+     */
+    @Override
+    public void tyjd(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
+        if (gyzjFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.djd.getValue())) {
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待解档状态，不能操作");
+        }
+        gyzjFfjlOld.setJlzt(JlztEnum.ysd.getValue());
+        gyzjFfjlOld.setDazt(DaztEnum.wgd.getValue());
+        this.updateById(gyzjFfjlOld);
+        //稽查轨迹
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    /**
+     * 拒绝解档
+     */
+    @Override
+    public void jjjd(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
+        if (gyzjFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.djd.getValue())) {
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待解档状态，不能操作");
+        }
+        gyzjFfjlOld.setJlzt(JlztEnum.gd.getValue());
+        this.updateById(gyzjFfjlOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因", form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
+
+    }
+
+    /**
+     * 同意借阅
+     */
+    @Override
+    public void tyjy(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
+        if (gyzjFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!gyzjFfjlOld.getJyzt().equals(JyztEnum.djy.getValue())) {
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待借阅状态，不能操作");
+        }
+        gyzjFfjlOld.setJyzt(JyztEnum.jyz.getValue());
+        gyzjFfjlOld.setJyksrq(form.getJyksrq());
+        gyzjFfjlOld.setJyjsrq(form.getJyjsrq());
+        this.updateById(gyzjFfjlOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+
+    }
+
+    /**
+     * 拒绝借阅
+     */
+    @Override
+    public void jjjy(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
+        if (gyzjFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!gyzjFfjlOld.getJyzt().equals(JyztEnum.djy.getValue())) {
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待借阅状态，不能操作");
+        }
+        gyzjFfjlOld.setJyzt(JyztEnum.wjy.getValue());
+        gyzjFfjlOld.setJyksrq(form.getJyksrq());
+        gyzjFfjlOld.setJyjsrq(form.getJyjsrq());
+        this.updateById(gyzjFfjlOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("原因", form.getRemark());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
+
+    }
+
+    /**
+     * 确认归还
+     */
+    @Override
+    public void qrgh(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GyzjFfjl gyzjFfjlOld = this.getById(form.getId());
+        if (gyzjFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!gyzjFfjlOld.getJyzt().equals(JyztEnum.jyz.getValue())) {
+            throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是借阅中状态，不能操作");
+        }
+        gyzjFfjlOld.setJyzt(JyztEnum.wjy.getValue());
+        this.updateById(gyzjFfjlOld);
+        //稽查轨迹
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    //endregion
+
+
 
     /**
      * 验证密码

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

@@ -44,6 +44,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Autowired
     private IStudyMjyService studyMjyService;
 
+    //region 发放记录
+
     /**
      * 详情
      *
@@ -229,6 +231,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
             for (MjyFfjl mjyFfjl : mjyFfjlList) {
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 mjyFfjl.setJlzt(JlztEnum.dgd.getValue());
+                mjyFfjl.setDazt(DaztEnum.ygd.getValue());
                 // 稽查轨迹
                 mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark()));
             }
@@ -260,6 +263,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         }
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         mjyFfjlOld.setJlzt(JlztEnum.dgd.getValue());
+        mjyFfjlOld.setDazt(DaztEnum.ygd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
         mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr,form.getRemark());
@@ -491,6 +495,245 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
 
     }
 
+    //endregion
+
+    //region 档案管理
+
+    /**
+     * 查询发放记录列表
+     *
+     * @param form 发放记录
+     * @return 发放记录集合
+     */
+    @Override
+    public List<FfjlListDto> queryArchiveList(FfjlSearchForm form){
+        QueryWrapper<MjyFfjl> queryWrapper = Wrappers.query();
+        queryWrapper.eq("t.del_flag", "0");
+        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
+            queryWrapper.eq("t.jyzt", form.getJyzt());
+        }
+        if (form.getJlzt() != null && form.getJlzt().intValue() > 0) {
+            queryWrapper.eq("t.jlzt", form.getJlzt());
+        }
+        if (StringUtils.isNoneBlank(form.getMc())) {
+            queryWrapper.and(p -> p.like("t.`mc`", form.getMc()));
+        }
+        if (StringUtils.isNoneBlank(form.getBh())) {
+            queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
+        }
+        if (StringUtils.isNoneBlank(form.getStartDateCk())) {
+            queryWrapper.and(p -> p.apply("t.ffrq>={0}", form.getStartDateCk()));
+        }
+        if (StringUtils.isNoneBlank(form.getEndDateCk())) {
+            queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk());
+        }
+        if (StringUtils.isNoneBlank(form.getStartDateRk())) {
+            queryWrapper.and(p -> p.apply("t.rkrq>={0}", form.getStartDateRk()));
+        }
+        if (StringUtils.isNoneBlank(form.getEndDateRk())) {
+            queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk());
+        }
+        if (form.getMdId() != null && form.getMdId().intValue() > 0) {
+            queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId()));
+        }
+        queryWrapper.orderByDesc("t.id");
+        return baseMapper.queryList(queryWrapper);
+    }
+
+    /**
+     * 同意归档
+     */
+    @Override
+    public void tygd(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.dgd.getValue())) {
+            throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是待归档状态，不能操作");
+        }
+        mjyFfjlOld.setJlzt(JlztEnum.gd.getValue());
+        this.updateById(mjyFfjlOld);
+        //稽查轨迹
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    /**
+     * 拒绝归档
+     */
+    @Override
+    public void jjgd(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.dgd.getValue())) {
+            throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是待归档状态，不能操作");
+        }
+        mjyFfjlOld.setJlzt(JlztEnum.ysd.getValue());
+        mjyFfjlOld.setDazt(DaztEnum.wgd.getValue());
+        this.updateById(mjyFfjlOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因", form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
+
+    }
+
+    /**
+     * 同意解档
+     */
+    @Override
+    public void tyjd(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.djd.getValue())) {
+            throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是待解档状态，不能操作");
+        }
+        mjyFfjlOld.setJlzt(JlztEnum.ysd.getValue());
+        mjyFfjlOld.setDazt(DaztEnum.wgd.getValue());
+        this.updateById(mjyFfjlOld);
+        //稽查轨迹
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    /**
+     * 拒绝解档
+     */
+    @Override
+    public void jjjd(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.djd.getValue())) {
+            throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是待解档状态，不能操作");
+        }
+        mjyFfjlOld.setJlzt(JlztEnum.gd.getValue());
+        this.updateById(mjyFfjlOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因", form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
+
+    }
+
+    /**
+     * 同意借阅
+     */
+    @Override
+    public void tyjy(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJyzt().equals(JyztEnum.djy.getValue())) {
+            throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是待借阅状态，不能操作");
+        }
+        mjyFfjlOld.setJyzt(JyztEnum.jyz.getValue());
+        mjyFfjlOld.setJyksrq(form.getJyksrq());
+        mjyFfjlOld.setJyjsrq(form.getJyjsrq());
+        this.updateById(mjyFfjlOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
+
+    }
+
+    /**
+     * 拒绝借阅
+     */
+    @Override
+    public void jjjy(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJyzt().equals(JyztEnum.djy.getValue())) {
+            throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是待借阅状态，不能操作");
+        }
+        mjyFfjlOld.setJyzt(JyztEnum.wjy.getValue());
+        mjyFfjlOld.setJyksrq(form.getJyksrq());
+        mjyFfjlOld.setJyjsrq(form.getJyjsrq());
+        this.updateById(mjyFfjlOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("开始日期", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("原因", form.getRemark());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
+
+    }
+
+    /**
+     * 确认归还
+     */
+    @Override
+    public void qrgh(ArchiveForm form){
+        SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
+        //验证签名人密码
+        checkPassword(qmr,form.getQmrmm(),false);
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new ServiceException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJyzt().equals(JyztEnum.jyz.getValue())) {
+            throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是借阅中状态，不能操作");
+        }
+        mjyFfjlOld.setJyzt(JyztEnum.wjy.getValue());
+        this.updateById(mjyFfjlOld);
+        //稽查轨迹
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+
+    }
+
+    //endregion
+
 
     /**
      * 验证密码