feat:[资源库管理][供试品入库记录]

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

@@ -113,7 +113,6 @@ public class GspFfjlController extends BaseController
      * 锁定
      */
     @PostMapping("/sd")
-    @RequiresPermissions("business:resource:mjy:ffjlsd")
     public AjaxResult sd(@RequestBody FfjlSdForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
@@ -125,7 +124,6 @@ public class GspFfjlController extends BaseController
      * 解锁
      */
     @PostMapping("/js")
-    @RequiresPermissions("business:resource:mjy:ffjljs")
     public AjaxResult js(@RequestBody FfjlJsForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
@@ -137,7 +135,6 @@ public class GspFfjlController extends BaseController
      * 借阅
      */
     @PostMapping("/jy")
-    @RequiresPermissions("business:resource:mjy:ffjljy")
     public AjaxResult jy(@RequestBody FfjlJyForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());
@@ -149,7 +146,6 @@ public class GspFfjlController extends BaseController
      * 加签
      */
     @PostMapping("/jq")
-    @RequiresPermissions("business:resource:mjy:ffjljq")
     public AjaxResult jq(@RequestBody FfjlJqForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());

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

@@ -3,6 +3,12 @@ package com.hxhq.business.controller;
 import java.util.Arrays;
 import java.util.List;
 
+import com.hxhq.business.domain.GspFfjlJcgj;
+import com.hxhq.business.domain.GspRkjlJcgj;
+import com.hxhq.business.form.gsp.*;
+import com.hxhq.business.form.mjy.*;
+import com.hxhq.business.service.IGspRkjlJcgjService;
+import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hxhq.business.domain.GspRkjl;
@@ -19,12 +25,15 @@ import com.hxhq.common.core.web.page.TableDataInfo;
  * @date 2025-12-30
  */
 @RestController
-@RequestMapping("/business/rkjl")
+@RequestMapping("/business/gspRkjl")
 public class GspRkjlController extends BaseController
 {
     @Autowired
     private IGspRkjlService gspRkjlService;
 
+    @Autowired
+    private IGspRkjlJcgjService gspRkjlJcgjService;
+
     /**
      * 查询供试品入库记录列表
      */
@@ -44,22 +53,113 @@ public class GspRkjlController extends BaseController
     {
         return AjaxResult.success(gspRkjlService.getById(id));
     }
+    /**
+     * 稽查轨迹列表
+     */
+    @GetMapping("/jcgjList")
+    public TableDataInfo jcgjList(GspRkjlJcgj form)
+    {
+        startPage();
+        List<GspRkjlJcgj> list = gspRkjlJcgjService.queryList(form);
+        return getDataTable(list);
+    }
 
     /**
      * 新增供试品入库记录信息
      */
-    @PostMapping("/save")
-    public AjaxResult save(@RequestBody GspRkjl gspRkjl)
+    @PostMapping("/xz")
+    public AjaxResult save(@RequestBody GspRkjlForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.add(form);
+        return AjaxResult.success("操作成功");
+    }
+    /**
+     * 编辑供试品入库记录信息
+     */
+    @PostMapping("/bj")
+    public AjaxResult bj(@RequestBody GspRkjlForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.update(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 锁定
+     */
+    @PostMapping("/sd")
+    public AjaxResult sd(@RequestBody GspSdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.sd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 批量锁定
+     */
+    @PostMapping("/plsd")
+    public AjaxResult plsd(@RequestBody GspSdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.plsd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 解锁
+     */
+    @PostMapping("/js")
+    public AjaxResult js(@RequestBody GspJsForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.js(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 解档
+     */
+    @PostMapping("/jd")
+    public AjaxResult jd(@RequestBody GspJdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.jd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 批量归档
+     */
+    @PostMapping("/plgd")
+    public AjaxResult plgd(@RequestBody GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.plgd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 归档
+     */
+    @PostMapping("/gd")
+    public AjaxResult gd(@RequestBody GspGdForm form)
     {
-        return toAjax(gspRkjlService.saveOrUpdate(gspRkjl));
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.gd(form);
+        return AjaxResult.success("操作成功");
     }
 
     /**
-     * 删除供试品入库记录信息
+     * 借阅
      */
-    @PostMapping("/delete")
-    public AjaxResult delete(@RequestBody Long[] ids)
+    @PostMapping("/jy")
+    public AjaxResult jy(@RequestBody GspJyForm form)
     {
-        return toAjax(gspRkjlService.removeByIds(Arrays.asList(ids)));
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.jy(form);
+        return AjaxResult.success("操作成功");
     }
 }

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

@@ -3,6 +3,7 @@ package com.hxhq.business.domain;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.hxhq.common.core.annotation.Compare;
 import com.hxhq.common.core.domain.MpBaseEntity;
 
 
@@ -24,36 +25,71 @@ public class GspRkjl extends MpBaseEntity
     private Integer jyzt;
 
     /** 名称 */
+    @Compare(name = "名称")
     private String mc;
 
     /** 批号 */
+    @Compare(name = "批号")
     private String ph;
 
     /** 规格 */
+    @Compare(name = "规格")
     private String gg;
 
     /** 规格 */
+    @Compare(name = "规格单位")
     private String ggdw;
 
     /** 入库数量 */
-    private String rksl;
+    @Compare(name = "入库量")
+    private String rkl;
 
     /** 入库单位 */
+    @Compare(name = "入库量单位")
     private String rkdw;
 
     /** 入库时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Compare(name = "入库时间")
     private Date rksj;
 
     /** 存储条件 */
-    private Long bctj;
+    @Compare(name = "存储条件")
+    private String cctj;
 
     /** 注意事项 */
+    @Compare(name = "注意事项")
     private String zysx;
 
     /** 归档申请人id */
     private Long gdsqrId;
 
+    /** 归档申请人名称 */
+    private String gdsqrMc;
+
+    /** 借阅开始日期 */
+    @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 void setJlzt(Integer jlzt)
     {
@@ -115,14 +151,14 @@ public class GspRkjl extends MpBaseEntity
         return ggdw;
     }
 
-    public void setRksl(String rksl)
+    public void setRkl(String rkl)
     {
-        this.rksl = rksl;
+        this.rkl = rkl;
     }
 
-    public String getRksl()
+    public String getRkl()
     {
-        return rksl;
+        return rkl;
     }
 
     public void setRkdw(String rkdw)
@@ -145,14 +181,14 @@ public class GspRkjl extends MpBaseEntity
         return rksj;
     }
 
-    public void setBctj(Long bctj)
+    public void setCctj(String cctj)
     {
-        this.bctj = bctj;
+        this.cctj = cctj;
     }
 
-    public Long getBctj()
+    public String getCctj()
     {
-        return bctj;
+        return cctj;
     }
 
     public void setZysx(String zysx)
@@ -175,4 +211,11 @@ public class GspRkjl extends MpBaseEntity
         return gdsqrId;
     }
 
+    public String getGdsqrMc() {
+        return gdsqrMc;
+    }
+
+    public void setGdsqrMc(String gdsqrMc) {
+        this.gdsqrMc = gdsqrMc;
+    }
 }

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

@@ -16,95 +16,79 @@ public class GspRkjlJcgj extends MpBaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 供试品入库记录id */
-    private Long gspRkId;
+    private Long gspRkjlId;
 
     /** 稽查轨迹类型 */
-    private String jcgjlx;
+    private Integer jcgjlx;
 
     /** 稽查名称 */
     private String jcmc;
 
     /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */
-    private Long jcmcys;
+    private Integer jcmcys;
 
     /** 稽查内容 */
     private String jcnr;
 
-    /** 签名意义 */
-    private String qmyy;
-
     /** 签名人id */
     private Long qmrId;
 
+    /** 签名人名称 */
+    private String qmrMc;
 
-    public void setGspRkId(Long gspRkId)
-    {
-        this.gspRkId = gspRkId;
-    }
-
-    public Long getGspRkId()
-    {
-        return gspRkId;
+    public Long getGspRkjlId() {
+        return gspRkjlId;
     }
 
-    public void setJcgjlx(String jcgjlx)
-    {
-        this.jcgjlx = jcgjlx;
+    public void setGspRkjlId(Long gspRkjlId) {
+        this.gspRkjlId = gspRkjlId;
     }
 
-    public String getJcgjlx()
-    {
+    public Integer getJcgjlx() {
         return jcgjlx;
     }
 
-    public void setJcmc(String jcmc)
-    {
-        this.jcmc = jcmc;
+    public void setJcgjlx(Integer jcgjlx) {
+        this.jcgjlx = jcgjlx;
     }
 
-    public String getJcmc()
-    {
+    public String getJcmc() {
         return jcmc;
     }
 
-    public void setJcmcys(Long jcmcys)
-    {
-        this.jcmcys = jcmcys;
+    public void setJcmc(String jcmc) {
+        this.jcmc = jcmc;
     }
 
-    public Long getJcmcys()
-    {
+    public Integer getJcmcys() {
         return jcmcys;
     }
 
-    public void setJcnr(String jcnr)
-    {
-        this.jcnr = jcnr;
+    public void setJcmcys(Integer jcmcys) {
+        this.jcmcys = jcmcys;
     }
 
-    public String getJcnr()
-    {
+    public String getJcnr() {
         return jcnr;
     }
 
-    public void setQmyy(String qmyy)
-    {
-        this.qmyy = qmyy;
+    public void setJcnr(String jcnr) {
+        this.jcnr = jcnr;
     }
 
-    public String getQmyy()
-    {
-        return qmyy;
+    public Long getQmrId() {
+        return qmrId;
     }
 
-    public void setQmrId(Long qmrId)
-    {
+    public void setQmrId(Long qmrId) {
         this.qmrId = qmrId;
     }
 
-    public Long getQmrId()
-    {
-        return qmrId;
+    public String getQmrMc() {
+        return qmrMc;
     }
 
+    public void setQmrMc(String qmrMc) {
+        this.qmrMc = qmrMc;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspRkjlForm.java

@@ -0,0 +1,156 @@
+package com.hxhq.business.form.gsp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+
+/**
+ * 供试品入库记录
+ */
+public class GspRkjlForm {
+
+    private Long id;
+
+    /** 名称 */
+    private String mc;
+
+    /** 批号 */
+    private String ph;
+
+    /** 规格 */
+    private String gg;
+
+    /** 规格 */
+    private String ggdw;
+
+    /** 入库数量 */
+    private String rkl;
+
+    /** 入库单位 */
+    private String rkdw;
+
+    /** 入库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date rksj;
+
+    /** 存储条件 */
+    private String cctj;
+
+    /** 注意事项 */
+    private String zysx;
+
+    /** 备注 */
+    private String qmbz;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    @NotEmpty(message = "请输入密码")
+    private String qmrmm;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMc() {
+        return mc;
+    }
+
+    public void setMc(String mc) {
+        this.mc = mc;
+    }
+
+    public String getPh() {
+        return ph;
+    }
+
+    public void setPh(String ph) {
+        this.ph = ph;
+    }
+
+    public String getGg() {
+        return gg;
+    }
+
+    public void setGg(String gg) {
+        this.gg = gg;
+    }
+
+    public String getGgdw() {
+        return ggdw;
+    }
+
+    public void setGgdw(String ggdw) {
+        this.ggdw = ggdw;
+    }
+
+    public String getRkl() {
+        return rkl;
+    }
+
+    public void setRkl(String rkl) {
+        this.rkl = rkl;
+    }
+
+    public String getRkdw() {
+        return rkdw;
+    }
+
+    public void setRkdw(String rkdw) {
+        this.rkdw = rkdw;
+    }
+
+    public Date getRksj() {
+        return rksj;
+    }
+
+    public void setRksj(Date rksj) {
+        this.rksj = rksj;
+    }
+
+    public String getCctj() {
+        return cctj;
+    }
+
+    public void setCctj(String cctj) {
+        this.cctj = cctj;
+    }
+
+    public String getZysx() {
+        return zysx;
+    }
+
+    public void setZysx(String zysx) {
+        this.zysx = zysx;
+    }
+
+    public String getQmbz() {
+        return qmbz;
+    }
+
+    public void setQmbz(String qmbz) {
+        this.qmbz = qmbz;
+    }
+
+    public Long getQmrId() {
+        return qmrId;
+    }
+
+    public void setQmrId(Long qmrId) {
+        this.qmrId = qmrId;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

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

@@ -20,4 +20,15 @@ public interface IGspRkjlJcgjService extends IService
      */
     public List<GspRkjlJcgj> queryList(GspRkjlJcgj gspRkjlJcgj);
 
+    /**
+     * 新增稽查轨迹
+     * @param gspRkjlId 供试品入库id
+     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param jcmc 稽查名称
+     * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
+     * @param jcnr 稽查内容
+     * @param jcrId 稽查人id
+     * @param jcrMc 稽查人名称
+     */
+    public  void saveJcgj(Long  gspRkjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc);
 }

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

@@ -3,6 +3,8 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.GspRkjl;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.form.gsp.*;
+import com.hxhq.business.form.mjy.FfjlSdForm;
 
 /**
  * 供试品入库记录Service接口
@@ -20,4 +22,36 @@ public interface IGspRkjlService extends IService
      */
     public List<GspRkjl> queryList(GspRkjl gspRkjl);
 
+    /**
+     * 供试品入库记录新增
+     * @param form 供试品入库记录表单
+     */
+    void add(GspRkjlForm form);
+
+    /**
+     * 编辑供试品入库记录
+     * @param form 供试品入库记录表单
+     */
+    void update(GspRkjlForm form);
+
+    /** 供试品入库记录锁定 */
+    void sd(GspSdForm form);
+
+    /** 供试品入库记录解锁 */
+    void js(GspJsForm form);
+
+    /** 批量锁定 */
+    void plsd(GspSdForm form);
+
+    /** 解档 */
+    void jd(GspJdForm form);
+
+    /** 批量归档 */
+    void plgd(GspGdForm form);
+
+    /** 归档 */
+    void gd(GspGdForm form);
+
+    /** 借阅 */
+    void jy(GspJyForm form);
 }

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

@@ -28,7 +28,24 @@ public class GspRkjlJcgjServiceImpl extends ServiceImpl
     public List<GspRkjlJcgj> queryList(GspRkjlJcgj gspRkjlJcgj)
     {
         QueryWrapper<GspRkjlJcgj> queryWrapper = Wrappers.query();
+        if(gspRkjlJcgj.getGspRkjlId() != null) {
+            queryWrapper.eq("gsp_rkjl_id", gspRkjlJcgj.getGspRkjlId());
+        }
+        queryWrapper.orderByDesc("id");
         return this.list(queryWrapper);
     }
 
+    @Override
+    public void saveJcgj(Long gspRkjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, Long jcrId, String jcrMc) {
+        GspRkjlJcgj gspRkjlJcgj = new GspRkjlJcgj();
+        gspRkjlJcgj.setGspRkjlId(gspRkjlId);
+        gspRkjlJcgj.setJcgjlx(jcgjlx);
+        gspRkjlJcgj.setJcmc(jcmc);
+        gspRkjlJcgj.setJcmcys(jcmcys);
+        gspRkjlJcgj.setJcnr(jcnr);
+        gspRkjlJcgj.setQmrId(jcrId);
+        gspRkjlJcgj.setQmrMc(jcrMc);
+        this.save(gspRkjlJcgj);
+    }
+
 }

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

@@ -1,11 +1,27 @@
 package com.hxhq.business.service.impl;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.utils.JctUtil;
+import com.hxhq.business.utils.ObjectCompareUtil;
+import com.hxhq.common.core.exception.ServiceException;
+import com.hxhq.common.core.utils.DateUtils;
+import com.hxhq.common.security.utils.SecurityUtils;
+import com.hxhq.system.api.domain.SysUser;
+import com.hxhq.system.service.ISysUserService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.GspRkjlMapper;
-import com.hxhq.business.domain.GspRkjl;
 import com.hxhq.business.service.IGspRkjlService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
@@ -18,6 +34,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class GspRkjlServiceImpl extends ServiceImpl<GspRkjlMapper, GspRkjl> implements IGspRkjlService
 {
+    @Autowired
+    private ISysUserService sysUserService;
+
+    @Autowired
+    private IGspRkjlJcgjService gspRkjlJcgjService;
+
     /**
      * 查询供试品入库记录列表
      *
@@ -31,4 +53,272 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         return this.list(queryWrapper);
     }
 
+    @Override
+    public void add(GspRkjlForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        GspRkjl gspRkjl = new GspRkjl();
+        BeanUtils.copyProperties(form, gspRkjl);
+        gspRkjl.setJlzt(JlztEnum.wsd.getValue());
+        gspRkjl.setJyzt(JyztEnum.wjy.getValue());
+        this.save(gspRkjl);
+
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getQmbz());
+        gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "新增供试品入库记录", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData),
+                qmr.getUserId(), qmr.getNickName());
+    }
+
+    @Override
+    public void update(GspRkjlForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        GspRkjl gspRkjl = this.getById(form.getId());
+        if(gspRkjl == null) {
+            throw new ServiceException("供试品入库记录不存在或已删除");
+        }
+        if (!gspRkjl.getJlzt().equals(JlztEnum.wsd.getValue())) {
+            throw new ServiceException("供试品入库记录【" + gspRkjl.getMc() + "】不是未锁定状态，不能编辑");
+        }
+
+        List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(gspRkjl, form);
+        if (fieldChanges.size() == 0) {
+            throw new ServiceException("你没有修改任何内容");
+        }
+
+        BeanUtils.copyProperties(form, gspRkjl);
+        this.updateById(gspRkjl);
+
+        List<GspRkjlJcgj> gspRkjlJcgjList = new ArrayList<>();
+
+        for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
+            GspRkjlJcgj gspRkjlJcgj = new GspRkjlJcgj();
+            gspRkjlJcgj.setGspRkjlId(gspRkjl.getId());
+            gspRkjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            gspRkjlJcgj.setJcmc("编辑供试品入库记录");
+            gspRkjlJcgj.setJcmcys(JcmcysEnum.green.getValue());
+            gspRkjlJcgj.setJcnr(fieldChange.toString());
+            gspRkjlJcgj.setQmrId(qmr.getUserId());
+            gspRkjlJcgj.setQmrMc(qmr.getNickName());
+            gspRkjlJcgj.setRemark(form.getQmbz());
+            gspRkjlJcgjList.add(gspRkjlJcgj);
+        }
+        gspRkjlJcgjService.saveBatch(gspRkjlJcgjList);
+    }
+
+    @Override
+    public void sd(GspSdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GspRkjl gspRkjl = this.getById(form.getId());
+        if (gspRkjl == null) {
+            throw new ServiceException("供试品入库记录不存在或已删除");
+        }
+        if (!gspRkjl.getJlzt().equals(JlztEnum.wsd.getValue())) {
+            throw new ServiceException("供试品入库记录【" + gspRkjl.getMc() + "】不是未锁定状态，不能锁定");
+        }
+        gspRkjl.setJlzt(JlztEnum.ysd.getValue());
+        this.updateById(gspRkjl);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "锁定供试品入库记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+
+    }
+
+    @Override
+    public void js(GspJsForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GspRkjl gspRkjl = this.getById(form.getId());
+        if (gspRkjl == null) {
+            throw new ServiceException("供试品入库记录不存在或已删除");
+        }
+        if (!gspRkjl.getJlzt().equals(JlztEnum.ysd.getValue())) {
+            throw new ServiceException("供试品入库记录【" + gspRkjl.getMc() + "】不是已锁定状态，不能解锁");
+        }
+        gspRkjl.setJlzt(JlztEnum.wsd.getValue());
+        this.updateById(gspRkjl);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "解锁供试品入库记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+
+    }
+
+    @Override
+    public void plsd(GspSdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getIds().length < 0) {
+            throw new ServiceException("参数ids不正确");
+        }
+        QueryWrapper<GspRkjl> queryWrapper = Wrappers.query();
+        queryWrapper.in("id", form.getIds());
+        queryWrapper.eq("jlzt", JlztEnum.wsd.getValue());
+        List<GspRkjl> gspRkjlList = this.list(queryWrapper);
+        List<GspRkjlJcgj> gspRkjlJcgjList = new ArrayList<>();
+        if (gspRkjlList.size() <= form.getIds().length) {
+            throw new ServiceException("供试品入库记录不是未锁定状态，不能锁定");
+        }
+        for (GspRkjl gspRkjl : gspRkjlList) {
+            //锁定
+            gspRkjl.setJlzt(JlztEnum.ysd.getValue());
+
+            //region 稽查轨迹
+            GspRkjlJcgj gspRkjlJcgj = new GspRkjlJcgj();
+            gspRkjlJcgj.setGspRkjlId(gspRkjl.getId());
+            gspRkjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            gspRkjlJcgj.setJcmc("锁定供试品入库记录");
+            gspRkjlJcgj.setJcmcys(JcmcysEnum.green.getValue());
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", form.getRemark());
+
+            gspRkjlJcgj.setJcnr(JctUtil.formatStr(formData));
+            gspRkjlJcgj.setQmrId(SecurityUtils.getUserId());
+            gspRkjlJcgj.setQmrMc(SecurityUtils.getNickName());
+            gspRkjlJcgjList.add(gspRkjlJcgj);
+            //endregion
+
+        }
+        this.saveOrUpdateBatch(gspRkjlList);
+        gspRkjlJcgjService.saveBatch(gspRkjlJcgjList);
+    }
+
+    @Override
+    public void jd(GspJdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GspRkjl gspRkjl = this.getById(form.getId());
+        if (gspRkjl == null) {
+            throw new ServiceException("供试品入库记录不存在或已删除");
+        }
+        if (!gspRkjl.getJlzt().equals(JlztEnum.gd.getValue())) {
+            throw new ServiceException("供试品入库记录【" + gspRkjl.getMc() + "】未归档，不能解档");
+        }
+        //申请解档后，状态更新为待解档，等待档案员审核期间无法进行其他操作；
+        gspRkjl.setJlzt(JlztEnum.djd.getValue());
+        this.updateById(gspRkjl);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+
+    }
+
+    @Override
+    public void plgd(GspGdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getIds().length < 0) {
+            throw new ServiceException("参数ids不正确");
+        }
+        QueryWrapper<GspRkjl> queryWrapper = Wrappers.query();
+        queryWrapper.in("id", form.getIds());
+        List<GspRkjl> gspRkjlList = this.list(queryWrapper);
+        List<GspRkjlJcgj> gspRkjlJcgjList = new ArrayList<>();
+        if (gspRkjlList.size() > 0) {
+            for (GspRkjl gspRkjl : gspRkjlList) {
+                if (!gspRkjl.getJlzt().equals(JlztEnum.ysd.getValue())) {
+                    throw new ServiceException("供试品入库记录【" + gspRkjl.getMc() + "】不是锁定状态，不能归档");
+                }
+            }
+            for (GspRkjl gspRkjl : gspRkjlList) {
+                //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
+                gspRkjl.setJlzt(JlztEnum.dgd.getValue());
+                gspRkjl.setGdsqrId(qmr.getUserId());
+                gspRkjl.setGdsqrMc(qmr.getNickName());
+
+                //region 稽查轨迹
+                GspRkjlJcgj gspRkjlJcgj = new GspRkjlJcgj();
+                gspRkjlJcgj.setGspRkjlId(gspRkjl.getId());
+                gspRkjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+                gspRkjlJcgj.setJcmc("申请归档");
+                gspRkjlJcgj.setJcmcys(JcmcysEnum.green.getValue());
+                Map<String, String> formData = new LinkedHashMap<>();
+                formData.put("备注", form.getRemark());
+                formData.put("签名意义", "申请归档");
+                formData.put("签名人", qmr.getNickName());
+                gspRkjlJcgj.setJcnr(JctUtil.formatStr(formData));
+                gspRkjlJcgj.setQmrId(SecurityUtils.getUserId());
+                gspRkjlJcgj.setQmrMc(SecurityUtils.getNickName());
+                gspRkjlJcgjList.add(gspRkjlJcgj);
+                //endregion
+
+            }
+            this.saveOrUpdateBatch(gspRkjlList);
+            gspRkjlJcgjService.saveBatch(gspRkjlJcgjList);
+        }
+    }
+
+    @Override
+    public void gd(GspGdForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GspRkjl gspRkjl = this.getById(form.getId());
+        if (gspRkjl == null) {
+            throw new ServiceException("供试品入库记录不存在或已删除");
+        }
+        if (!gspRkjl.getJlzt().equals(JlztEnum.ysd.getValue())) {
+            throw new ServiceException("供试品入库记录【" + gspRkjl.getMc() + "】不是锁定状态，不能归档");
+        }
+        //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
+        gspRkjl.setJlzt(JlztEnum.dgd.getValue());
+        gspRkjl.setGdsqrId(qmr.getUserId());
+        gspRkjl.setGdsqrMc(qmr.getNickName());
+        this.updateById(gspRkjl);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "申请归档");
+        formData.put("签名人", qmr.getNickName());
+        gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+
+    }
+
+    @Override
+    public void jy(GspJyForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        GspRkjl gspRkjl = this.getById(form.getId());
+        if (gspRkjl == null) {
+            throw new ServiceException("供试品入库记录不存在或已删除");
+        }
+        if (!gspRkjl.getJlzt().equals(JlztEnum.gd.getValue())) {
+            throw new ServiceException("供试品入库记录【" + gspRkjl.getMc() + "】不是归档状态，不能借阅");
+        }
+        if (!gspRkjl.getJyzt().equals(JyztEnum.wjy.getValue())) {
+            throw new ServiceException("供试品入库记录【" + gspRkjl.getMc() + "】不是未借阅状态，不能借阅");
+        }
+        //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作；
+        gspRkjl.setJyzt(JyztEnum.djy.getValue());
+        gspRkjl.setJyksrq(form.getStartDate());
+        gspRkjl.setJyjsrq(form.getEndDate());
+        this.updateById(gspRkjl);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
+        formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "申请借阅");
+        formData.put("签名人", qmr.getNickName());
+        gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+
+    }
+
 }