feat:[档案管理][试剂档案管理]

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

@@ -103,7 +103,7 @@ public class GspController extends BaseController {
     @GetMapping(value = "/info")
     @RequiresPermissions("business:resource:gsp:xq")
     public AjaxResult getInfo(Long id) {
-        return AjaxResult.success(gspService.getById(id));
+        return AjaxResult.success(gspService.queryInfo(id));
     }
 
     /**
@@ -312,87 +312,4 @@ public class GspController extends BaseController {
         return AjaxResult.success("操作成功");
     }
 
-    /**
-     * 同意归档
-     */
-    @PostMapping("/gd/agree")
-    @RequiresPermissions("business:archive:gsp:tygd")
-    public AjaxResult agreeGd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspService.agreeGd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝归档
-     */
-    @PostMapping("/gd/refuse")
-    @RequiresPermissions("business:archive:gsp:jjgd")
-    public AjaxResult refuseGd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspService.refuseGd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 同意解档
-     */
-    @PostMapping("/jd/agree")
-    @RequiresPermissions("business:archive:gsp:tyjd")
-    public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspService.agreeJd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝解档
-     */
-    @PostMapping("/jd/refuse")
-    @RequiresPermissions("business:archive:gsp:jjjd")
-    public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspService.refuseJd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 同意借阅
-     */
-    @PostMapping("/jy/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspService.agreeJy(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝借阅
-     */
-    @PostMapping("/jy/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspService.refuseJy(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 档案确认归还
-     */
-    @PostMapping("/gh/archive")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspService.archiveGh(form);
-        return AjaxResult.success("操作成功");
-    }
 }

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

@@ -0,0 +1,137 @@
+package com.hxhq.business.controller;
+
+import com.hxhq.business.domain.GspFfjlJcgj;
+import com.hxhq.business.dto.gsp.GspFfjlListDto;
+import com.hxhq.business.enums.zykgl.DaztEnum;
+import com.hxhq.business.form.gsp.GspGdForm;
+import com.hxhq.business.form.gsp.GspJyForm;
+import com.hxhq.business.form.gsp.GspSearchListForm;
+import com.hxhq.business.form.mjy.*;
+import com.hxhq.business.service.IGspFfjlJcgjService;
+import com.hxhq.business.service.IGspFfjlService;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 供试品发放记录Controller
+ *
+ * @author hxhq
+ * @date 2025-12-30
+ */
+@RestController
+@RequestMapping("/business/gspFfjlArchive")
+public class GspFfjlArchiveController extends BaseController
+{
+    @Autowired
+    private IGspFfjlService gspFfjlService;
+
+    @Autowired
+    private IGspFfjlJcgjService gspFfjlJcgjService;
+
+    /**
+     * 查询供试品发放记录列表
+     */
+    @GetMapping("/list")
+    @RequiresPermissions("business:resource:gsp:ffjllist")
+    public TableDataInfo list(GspSearchListForm form)
+    {
+        startPage();
+        form.setArchive(DaztEnum.ygd.getValue());
+        List<GspFfjlListDto> list = gspFfjlService.queryList(form);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 同意归档
+     */
+    @PostMapping("/gd/agree")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult agreeGd(@RequestBody @Validated GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspFfjlService.agreeGd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 拒绝归档
+     */
+    @PostMapping("/gd/refuse")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult refuseGd(@RequestBody @Validated GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspFfjlService.refuseGd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 同意解档
+     */
+    @PostMapping("/jd/agree")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspFfjlService.agreeJd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 拒绝解档
+     */
+    @PostMapping("/jd/refuse")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspFfjlService.refuseJd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 同意借阅
+     */
+    @PostMapping("/jy/agree")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspFfjlService.agreeJy(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 拒绝借阅
+     */
+    @PostMapping("/jy/refuse")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspFfjlService.refuseJy(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 档案确认归还
+     */
+    @PostMapping("/gh/archive")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspFfjlService.archiveGh(form);
+        return AjaxResult.success("操作成功");
+    }
+}

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

@@ -5,10 +5,14 @@ import java.util.List;
 
 import com.hxhq.business.domain.GspFfjlJcgj;
 import com.hxhq.business.domain.MjyFfjlJcgj;
+import com.hxhq.business.dto.gsp.GspFfjlListDto;
 import com.hxhq.business.form.gsp.GspGdForm;
 import com.hxhq.business.form.gsp.GspJyForm;
+import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.mjy.*;
 import com.hxhq.business.service.IGspFfjlJcgjService;
+import com.hxhq.business.service.IStudyService;
+import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import com.hxhq.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,10 +46,10 @@ public class GspFfjlController extends BaseController
      */
     @GetMapping("/list")
     @RequiresPermissions("business:resource:gsp:ffjllist")
-    public TableDataInfo list(GspFfjl gspFfjl)
+    public TableDataInfo list(GspSearchListForm form)
     {
         startPage();
-        List<GspFfjl> list = gspFfjlService.queryList(gspFfjl);
+        List<GspFfjlListDto> list = gspFfjlService.queryList(form);
         return getDataTable(list);
     }
 
@@ -167,87 +171,4 @@ public class GspFfjlController extends BaseController
         return AjaxResult.success("操作成功");
     }
 
-    /**
-     * 同意归档
-     */
-    @PostMapping("/gd/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeGd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspFfjlService.agreeGd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝归档
-     */
-    @PostMapping("/gd/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseGd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspFfjlService.refuseGd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 同意解档
-     */
-    @PostMapping("/jd/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspFfjlService.agreeJd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝解档
-     */
-    @PostMapping("/jd/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspFfjlService.refuseJd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 同意借阅
-     */
-    @PostMapping("/jy/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspFfjlService.agreeJy(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝借阅
-     */
-    @PostMapping("/jy/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspFfjlService.refuseJy(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 档案确认归还
-     */
-    @PostMapping("/gh/archive")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspFfjlService.archiveGh(form);
-        return AjaxResult.success("操作成功");
-    }
 }

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

@@ -0,0 +1,106 @@
+package com.hxhq.business.controller;
+
+import com.hxhq.business.domain.GspRkjl;
+import com.hxhq.business.domain.GspRkjlJcgj;
+import com.hxhq.business.enums.zykgl.DaztEnum;
+import com.hxhq.business.form.gsp.*;
+import com.hxhq.business.service.IGspRkjlJcgjService;
+import com.hxhq.business.service.IGspRkjlService;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 供试品入库记录Controller
+ *
+ * @author hxhq
+ * @date 2025-12-30
+ */
+@RestController
+@RequestMapping("/business/gspRkjlArchive")
+public class GspRkjlArchiveController extends BaseController
+{
+    @Autowired
+    private IGspRkjlService gspRkjlService;
+
+    /**
+     * 查询供试品入库记录列表
+     */
+    @GetMapping("/list")
+    @RequiresPermissions("business:resource:gsp:rklist")
+    public TableDataInfo list(GspSearchListForm form)
+    {
+        startPage();
+        form.setArchive(DaztEnum.ygd.getValue());
+        List<GspRkjl> list = gspRkjlService.queryList(form);
+        return getDataTable(list);
+    }
+
+    /**
+     * 同意解档
+     */
+    @PostMapping("/jd/agree")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.agreeJd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 拒绝解档
+     */
+    @PostMapping("/jd/refuse")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.refuseJd(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 同意借阅
+     */
+    @PostMapping("/jy/agree")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.agreeJy(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 拒绝借阅
+     */
+    @PostMapping("/jy/refuse")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.refuseJy(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 档案确认归还
+     */
+    @PostMapping("/gh/archive")
+    @RequiresPermissions("business:resource:gsp:gd")
+    public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        gspRkjlService.archiveGh(form);
+        return AjaxResult.success("操作成功");
+    }
+}

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

@@ -41,10 +41,10 @@ public class GspRkjlController extends BaseController
      */
     @GetMapping("/list")
     @RequiresPermissions("business:resource:gsp:rklist")
-    public TableDataInfo list(GspRkjl gspRkjl)
+    public TableDataInfo list(GspSearchListForm form)
     {
         startPage();
-        List<GspRkjl> list = gspRkjlService.queryList(gspRkjl);
+        List<GspRkjl> list = gspRkjlService.queryList(form);
         return getDataTable(list);
     }
 
@@ -177,87 +177,4 @@ public class GspRkjlController extends BaseController
         return AjaxResult.success("操作成功");
     }
 
-    /**
-     * 同意归档
-     */
-    @PostMapping("/gd/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeGd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspRkjlService.agreeGd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝归档
-     */
-    @PostMapping("/gd/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseGd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspRkjlService.refuseGd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 同意解档
-     */
-    @PostMapping("/jd/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspRkjlService.agreeJd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝解档
-     */
-    @PostMapping("/jd/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspRkjlService.refuseJd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 同意借阅
-     */
-    @PostMapping("/jy/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspRkjlService.agreeJy(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝借阅
-     */
-    @PostMapping("/jy/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspRkjlService.refuseJy(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 档案确认归还
-     */
-    @PostMapping("/gh/archive")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        gspRkjlService.archiveGh(form);
-        return AjaxResult.success("操作成功");
-    }
 }

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

@@ -4,6 +4,7 @@ import com.hxhq.business.domain.Sj;
 import com.hxhq.business.domain.SjJcgj;
 import com.hxhq.business.domain.SjTz;
 import com.hxhq.business.dto.sj.SjListDto;
+import com.hxhq.business.enums.zykgl.DaztEnum;
 import com.hxhq.business.enums.zykgl.JyztEnum;
 import com.hxhq.business.enums.zykgl.ZjztEnum;
 import com.hxhq.business.form.gsp.GspGdForm;
@@ -42,6 +43,20 @@ public class SjArchiveController extends BaseController
     private ISjService sjService;
 
     /**
+     * 查询试剂列表
+     */
+    @GetMapping("/list")
+    @RequiresPermissions("business:resource:sj:list")
+    public TableDataInfo list(SjSearchListForm form)
+    {
+        startPage();
+        form.setArchive(DaztEnum.ygd.getValue());
+        List<SjListDto> list = sjService.queryList(form);
+        return getDataTable(list);
+    }
+
+
+    /**
      * 同意归档
      */
     @PostMapping("/gd/agree")

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

@@ -7,6 +7,7 @@ import java.util.List;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.gsp.GspListDto;
 import com.hxhq.business.dto.sj.SjListDto;
+import com.hxhq.business.enums.zykgl.DaztEnum;
 import com.hxhq.business.enums.zykgl.JyztEnum;
 import com.hxhq.business.enums.zykgl.ZjztEnum;
 import com.hxhq.business.form.gsp.GspGdForm;
@@ -57,9 +58,11 @@ public class SjController extends BaseController
         Sj sj = sjService.getSjByBh(form.getBh());
         if(sj == null) {
             sj = new Sj();
-            BeanUtils.copyProperties(form, sj);
             sj.setPzrq(new Date());
             sjService.save(sj);
+        } else {
+            sj.setPzrq(new Date());
+            sjService.updateById(sj);
         }
 
         return success();
@@ -156,6 +159,7 @@ public class SjController extends BaseController
     public TableDataInfo list(SjSearchListForm form)
     {
         startPage();
+        form.setArchive(DaztEnum.ygd.getValue());
         List<SjListDto> list = sjService.queryList(form);
         return getDataTable(list);
     }
@@ -294,88 +298,4 @@ public class SjController extends BaseController
         sjService.gd(form);
         return AjaxResult.success("操作成功");
     }
-
-    /**
-     * 同意归档
-     */
-    @PostMapping("/gd/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeGd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        sjService.agreeGd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝归档
-     */
-    @PostMapping("/gd/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseGd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        sjService.refuseGd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 同意解档
-     */
-    @PostMapping("/jd/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeJd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        sjService.agreeJd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝解档
-     */
-    @PostMapping("/jd/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseJd(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        sjService.refuseJd(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 同意借阅
-     */
-    @PostMapping("/jy/agree")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult agreeJy(@RequestBody @Validated GspJyForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        sjService.agreeJy(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 拒绝借阅
-     */
-    @PostMapping("/jy/refuse")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult refuseJy(@RequestBody @Validated GspJyForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        sjService.refuseJy(form);
-        return AjaxResult.success("操作成功");
-    }
-
-    /**
-     * 档案确认归还
-     */
-    @PostMapping("/gh/archive")
-    @RequiresPermissions("business:resource:gsp:gd")
-    public AjaxResult archiveGh(@RequestBody @Validated GspGdForm form)
-    {
-        form.setQmrId(SecurityUtils.getUserId());
-        sjService.archiveGh(form);
-        return AjaxResult.success("操作成功");
-    }
 }

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

@@ -179,6 +179,9 @@ public class Gsp extends MpBaseEntity
     /** 发放目的ids */
     private String mdIds;
 
+    /** 发放目的其他 */
+    private String mdOther;
+
     /** 关联暂存柜id */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long zcgId;
@@ -640,4 +643,12 @@ public class Gsp extends MpBaseEntity
     public void setMdIds(String mdIds) {
         this.mdIds = mdIds;
     }
+
+    public String getMdOther() {
+        return mdOther;
+    }
+
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
+    }
 }

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

@@ -87,6 +87,9 @@ public class GspFfjl extends MpBaseEntity
     /** 目的 */
     private String mdIds;
 
+    /** 发放目的其他 */
+    private String mdOther;
+
     /** 归还人1id */
     private Long ghr1Id;
 
@@ -606,4 +609,12 @@ public class GspFfjl extends MpBaseEntity
     public void setDasqrIdOld(Long dasqrIdOld) {
         this.dasqrIdOld = dasqrIdOld;
     }
+
+    public String getMdOther() {
+        return mdOther;
+    }
+
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gsp/GspDto.java

@@ -0,0 +1,17 @@
+package com.hxhq.business.dto.gsp;
+
+import com.hxhq.business.domain.Gsp;
+
+public class GspDto extends Gsp {
+
+    /** 发放目的名称 */
+    private String mdMcs;
+
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gsp/GspFfjlListDto.java

@@ -0,0 +1,27 @@
+package com.hxhq.business.dto.gsp;
+
+import com.hxhq.business.domain.GspFfjl;
+
+public class GspFfjlListDto extends GspFfjl {
+
+    /** 发放目的名称 */
+    private String mdMcs;
+
+    private String zcgMc;
+
+    public String getZcgMc() {
+        return zcgMc;
+    }
+
+    public void setZcgMc(String zcgMc) {
+        this.zcgMc = zcgMc;
+    }
+
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+}

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

@@ -20,9 +20,14 @@ public class FfGspForm {
     private String zytj;
 
     /** 目的ids */
-    @NotEmpty(message = "请选择目的")
     private String mdIds;
 
+    /** 目的名称 */
+    private String mdMcs;
+
+    /** 目的其他 */
+    private String mdOther;
+
     /** 领取人1Id  */
     @NotNull(message = "请选择领取人")
     private Long lqr1Id;
@@ -190,4 +195,20 @@ public class FfGspForm {
     public void setFfr2mm(String ffr2mm) {
         this.ffr2mm = ffr2mm;
     }
+
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        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/form/gsp/GspPlffItem.java

@@ -18,6 +18,28 @@ public class GspPlffItem {
     /** 目的ids */
     private String mdIds;
 
+    /** 目的名称 */
+    private String mdMcs;
+
+    /** 目的其他 */
+    private String mdOther;
+
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+
+    public String getMdOther() {
+        return mdOther;
+    }
+
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -27,9 +27,17 @@ public class GspSearchListForm {
     /** 来源 */
     private String ly;
 
+    /** 目的 */
+    private String md;
+
+    private Long mdId;
+
     /** 制剂状态 1:入库 3:已发放 5:已锁定 7:待归档 9:归档 11:待解档 */
     private Integer zjzt;
 
+    /** 记录状态 1:未锁定 3:已锁定 5:待归档 7:归档 9:待解档 */
+    private Integer jlzt;
+
     /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */
     private Integer jyzt;
 
@@ -45,6 +53,66 @@ public class GspSearchListForm {
     /** 是否是档案 1-是 */
     private Integer archive;
 
+    /** 入库日期开始 */
+    private String startDateRk;
+
+    /** 入库日期结束 */
+    private String endDateRk;
+
+    /** 出库日期开始 */
+    private String startDateCk;
+
+    /** 出库日期结束 */
+    private String endDateCk;
+
+    public Long getMdId() {
+        return mdId;
+    }
+
+    public void setMdId(Long mdId) {
+        this.mdId = mdId;
+    }
+
+    public String getMd() {
+        return md;
+    }
+
+    public void setMd(String md) {
+        this.md = md;
+    }
+
+    public String getStartDateRk() {
+        return startDateRk;
+    }
+
+    public void setStartDateRk(String startDateRk) {
+        this.startDateRk = startDateRk;
+    }
+
+    public String getEndDateRk() {
+        return endDateRk;
+    }
+
+    public void setEndDateRk(String endDateRk) {
+        this.endDateRk = endDateRk;
+    }
+
+    public String getStartDateCk() {
+        return startDateCk;
+    }
+
+    public void setStartDateCk(String startDateCk) {
+        this.startDateCk = startDateCk;
+    }
+
+    public String getEndDateCk() {
+        return endDateCk;
+    }
+
+    public void setEndDateCk(String endDateCk) {
+        this.endDateCk = endDateCk;
+    }
+
     public Integer getArchive() {
         return archive;
     }
@@ -132,4 +200,12 @@ public class GspSearchListForm {
     public void setGg(String gg) {
         this.gg = gg;
     }
+
+    public Integer getJlzt() {
+        return jlzt;
+    }
+
+    public void setJlzt(Integer jlzt) {
+        this.jlzt = jlzt;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/sj/SjSearchListForm.java

@@ -37,6 +37,7 @@ public class SjSearchListForm {
 
     /** 所属部门名称 */
     private String deptName;
+    private Integer archive;
 
     public String getDeptName() {
         return deptName;
@@ -125,4 +126,12 @@ public class SjSearchListForm {
     public void setStudyFormId(Long studyFormId) {
         this.studyFormId = studyFormId;
     }
+
+    public void setArchive(Integer archive) {
+        this.archive = archive;
+    }
+
+    public Integer getArchive() {
+        return archive;
+    }
 }

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

@@ -1,7 +1,15 @@
 package com.hxhq.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.hxhq.business.domain.GspFfjl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.domain.GyzjFfjl;
+import com.hxhq.business.dto.gsp.GspFfjlListDto;
+import com.hxhq.business.dto.gyzj.FfjlListDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 供试品发放记录Mapper接口
  *
@@ -11,4 +19,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface GspFfjlMapper extends BaseMapper<GspFfjl>
 {
 
+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
+    List<GspFfjlListDto> queryList(@Param("ew") Wrapper<GspFfjl> queryWrapper);
+
+    GspFfjlListDto queryInfo(Long id);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hxhq.business.domain.Gsp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hxhq.business.domain.Mjy;
+import com.hxhq.business.dto.gsp.GspDto;
 import com.hxhq.business.dto.gsp.GspListDto;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,4 +21,6 @@ public interface GspMapper extends BaseMapper
 {
 
     List<GspListDto> queryStudyList(@Param("ew") Wrapper<Gsp> queryWrapper);
+
+    GspDto queryInfo(Long id);
 }

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

@@ -8,10 +8,12 @@ import com.hxhq.business.domain.GspFfjl;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.business.domain.Mjy;
 import com.hxhq.business.domain.MjyFfjl;
+import com.hxhq.business.dto.gsp.GspFfjlListDto;
 import com.hxhq.business.dto.mjy.FfjlDetailDto;
 import com.hxhq.business.form.gsp.GspGdForm;
 import com.hxhq.business.form.gsp.GspGhForm;
 import com.hxhq.business.form.gsp.GspJyForm;
+import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.mjy.*;
 import com.hxhq.system.api.domain.SysUser;
 
@@ -26,10 +28,10 @@ public interface IGspFfjlService extends IService
     /**
      * 查询供试品发放记录列表
      *
-     * @param gspFfjl 供试品发放记录
+     * @param form 供试品发放记录
      * @return 供试品发放记录集合
      */
-    public List<GspFfjl> queryList(GspFfjl gspFfjl);
+    public List<GspFfjlListDto> queryList(GspSearchListForm form);
 
     /**
      * 详情

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

@@ -20,7 +20,7 @@ public interface IGspRkjlService extends IService
      * @param gspRkjl 供试品入库记录
      * @return 供试品入库记录集合
      */
-    public List<GspRkjl> queryList(GspRkjl gspRkjl);
+    public List<GspRkjl> queryList(GspSearchListForm gspRkjl);
 
     /**
      * 供试品入库记录新增

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

@@ -3,6 +3,7 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.Gsp;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.dto.gsp.GspDto;
 import com.hxhq.business.dto.gsp.GspListDto;
 import com.hxhq.business.form.gsp.*;
 import com.hxhq.business.form.gyzj.SearchForm;
@@ -23,6 +24,9 @@ public interface IGspService extends IService
      */
     public List<Gsp> queryList(GspSearchListForm form);
 
+    GspDto queryInfo(Long id);
+
+
     /**
      * 新增供试品
      * @param gspForm 供试品表单
@@ -106,4 +110,5 @@ public interface IGspService extends IService
 
     /** 档案确认归还 */
     void archiveGh(GspGdForm form);
+
 }

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

@@ -6,16 +6,21 @@ import java.util.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
+import com.hxhq.business.dto.gsp.GspFfjlListDto;
 import com.hxhq.business.dto.mjy.FfjlDetailDto;
+import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.gsp.GspGdForm;
 import com.hxhq.business.form.gsp.GspGhForm;
 import com.hxhq.business.form.gsp.GspJyForm;
+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.utils.JctUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.DateUtils;
+import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
 import com.hxhq.system.api.domain.SysUser;
 import com.hxhq.system.service.ISysUserService;
@@ -43,17 +48,44 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private IArchiveLogService archiveLogService;
+
     /**
      * 查询供试品发放记录列表
-     *
-     * @param gspFfjl 供试品发放记录
      * @return 供试品发放记录
      */
     @Override
-    public List<GspFfjl> queryList(GspFfjl gspFfjl)
+    public List<GspFfjlListDto> queryList(GspSearchListForm form)
     {
         QueryWrapper<GspFfjl> queryWrapper = Wrappers.query();
-        return this.list(queryWrapper);
+        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.ghrq>={0}", form.getStartDateRk()));
+        }
+        if (StringUtils.isNoneBlank(form.getEndDateRk())) {
+            queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk());
+        }
+        queryWrapper.orderByDesc("t.id");
+        return baseMapper.queryList(queryWrapper);
     }
 
     @Override
@@ -81,7 +113,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         gspFfjl.setCkldw(ckdw);
         gspFfjl.setJyzt(JyztEnum.wjy.getValue());
         gspFfjl.setJlzt(JlztEnum.wsd.getValue());
-
+        gspFfjl.setMdIds(gsp.getMdIds());
+        gspFfjl.setMdOther(gsp.getMdOther());
         gspFfjl.setLqr1Id(lqr1.getUserId());
         gspFfjl.setLqr1Mc(lqr1.getNickName());
         if(lqr2 != null) {
@@ -212,6 +245,12 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档",  "Apply for De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
 
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "申请解档");
     }
 
     @Override
@@ -260,6 +299,12 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
                 gspFfjlJcgjList.add(gspFfjlJcgj);
                 //endregion
 
+                GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+                String mdMcs = gspFfjlListDto.getMdMcs();
+                if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+                    mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+                }
+                archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "申请归档");
             }
             this.saveOrUpdateBatch(gspFfjlList);
             gspFfjlJcgjService.saveBatch(gspFfjlJcgjList);
@@ -298,6 +343,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档","Apply for Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
 
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "申请归档");
+
     }
 
     /**
@@ -464,6 +516,14 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
                 JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "申请借阅");
+
     }
 
     /**
@@ -521,6 +581,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意归档",  "Approve Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "同意归档");
     }
 
     @Override
@@ -547,6 +614,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档",  "Reject Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "拒绝归档");
     }
 
     @Override
@@ -573,6 +647,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意解档",  "Approve De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "同意解档");
     }
 
     @Override
@@ -599,6 +680,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档",  "Reject De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "拒绝解档");
     }
 
     @Override
@@ -627,6 +715,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意借阅",  "Approve Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "同意借阅");
     }
 
     @Override
@@ -653,6 +748,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅",  "Reject Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "拒绝借阅");
     }
 
     @Override
@@ -679,6 +781,14 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         formDataEn.put("Comment", form.getRemark());
         gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还",  "Check-out End Confirmation",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+
+        GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
+        String mdMcs = gspFfjlListDto.getMdMcs();
+        if(StringUtils.isNotEmpty(gspFfjlListDto.getMdOther())) {
+            mdMcs = mdMcs + "," + gspFfjlListDto.getMdOther();
+        }
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "确认归还");
     }
 
 }

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

@@ -18,6 +18,7 @@ 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.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,13 +44,39 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
     /**
      * 查询供试品入库记录列表
      *
-     * @param gspRkjl 供试品入库记录
      * @return 供试品入库记录
      */
     @Override
-    public List<GspRkjl> queryList(GspRkjl gspRkjl)
+    public List<GspRkjl> queryList(GspSearchListForm form)
     {
-        QueryWrapper<GspRkjl> queryWrapper = Wrappers.query();
+        QueryWrapper<GspRkjl> queryWrapper = new QueryWrapper<>();
+        if(StringUtils.isNotEmpty(form.getMc())) {
+            queryWrapper.like("mc", form.getMc());
+        }
+        if(StringUtils.isNotEmpty(form.getBh())) {
+            queryWrapper.like("bh", form.getBh());
+        }
+        if(StringUtils.isNotEmpty(form.getPh())) {
+            queryWrapper.like("ph", form.getPh());
+        }
+        if(StringUtils.isNotEmpty(form.getGg())) {
+            queryWrapper.and(p -> p.apply("CONCAT(gg, ggdw) LIKE #{0}", form.getGg()));
+        }
+        if(StringUtils.isNotEmpty(form.getStartDate())) {
+            queryWrapper.ge("rksj", form.getStartDate());
+        }
+        if(StringUtils.isNotEmpty(form.getEndDate())) {
+            queryWrapper.le("rksj", form.getEndDate());
+        }
+        if(form.getJlzt() != null) {
+            queryWrapper.eq("jlzt", form.getJlzt());
+        }
+        if(form.getJyzt() != null) {
+            queryWrapper.eq("jyzt", form.getJyzt());
+        }
+        if(form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) {
+            queryWrapper.in("jlzt", JlztEnum.dgd.getValue(), JlztEnum.gd.getValue(), JlztEnum.djd.getValue());
+        }
         return this.list(queryWrapper);
     }
 

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

@@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
+import com.hxhq.business.dto.gsp.GspDto;
 import com.hxhq.business.dto.gsp.GspListDto;
+import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.gsp.*;
 import com.hxhq.business.service.*;
@@ -51,6 +53,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
     @Autowired
     private IZcgService zcgService;
 
+    @Autowired
+    private IArchiveLogService archiveLogService;
+
     /**
      * 查询供试品管理列表
      *
@@ -91,6 +96,14 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
     }
 
     @Override
+    public GspDto queryInfo(Long id) {
+        if (id == null || id.longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        return baseMapper.queryInfo(id);
+    }
+
+    @Override
     public void save(GspForm form) {
         SysUser qmr = sysUserService.selectUserById(form.getQmrId());
         sysUserService.checkPassword(qmr, form.getQmrmm(), false);
@@ -352,13 +365,13 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", gspOld.getKc()+ gspOld.getKcdw());
         formData.put("转移条件", form.getZytj());
-        formData.put("目的", form.getMdIds());
+        formData.put("目的", form.getMdMcs());
         formData.put("备注", form.getRemark());
 
         Map<String, String> formDataEn = new LinkedHashMap<>();
         formDataEn.put("Out Amount", gspOld.getKc()+ gspOld.getKcdw());
         formDataEn.put("Transfer Condition", form.getZytj());
-        formDataEn.put("Purpose", form.getMdIds());
+        formDataEn.put("Purpose", form.getMdMcs());
         formDataEn.put("Comment", form.getRemark());
         gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", "Distribution", JcmcysEnum.green.getValue(),
                 JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn),
@@ -384,7 +397,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         }
         gspOld.setFfrq(now);
         gspOld.setFfbz(form.getRemark());
-        gspOld.setMdIds(form.getMdIds());
+        gspOld.setMdIds(form.getMdMcs());
+        gspOld.setMdOther(form.getMdOther());
         gspOld.setZjzt(ZjztEnum.yff.getValue());
         //endregion
         this.updateById(gspOld);
@@ -437,13 +451,13 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
                 Map<String, String> formData = new LinkedHashMap<>();
                 formData.put("出库量", gsp.getKc()+ gsp.getKcdw());
                 formData.put("转移条件", plffItemFilter.get(0).getZytj());
-                formData.put("目的", plffItemFilter.get(0).getMdIds());
+                formData.put("目的", plffItemFilter.get(0).getMdMcs());
                 formData.put("备注", plffItemFilter.get(0).getRemark());
                 gspJcgj.setJcnr(JctUtil.formatStr(formData));
                 Map<String, String> formDataEn = new LinkedHashMap<>();
                 formDataEn.put("Out Amount", gsp.getKc()+ gsp.getKcdw());
                 formDataEn.put("Transfer Condition", plffItemFilter.get(0).getZytj());
-                formDataEn.put("Purpose", plffItemFilter.get(0).getMdIds());
+                formDataEn.put("Purpose", plffItemFilter.get(0).getMdMcs());
                 formDataEn.put("Comment", plffItemFilter.get(0).getRemark());
                 gspJcgj.setJcnrEn(JctUtil.formatStr(formDataEn));
                 gspJcgj.setQmrId(SecurityUtils.getUserId());
@@ -481,6 +495,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
                 gsp.setFfrq(now);
                 gsp.setFfbz(plffItemFilter.get(0).getRemark());
                 gsp.setMdIds(plffItemFilter.get(0).getMdIds());
+                gsp.setMdOther(plffItemFilter.get(0).getMdOther());
                 gsp.setZjzt(ZjztEnum.yff.getValue());
                 //endregion
             } else {
@@ -877,6 +892,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
                 JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
 
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "申请借阅");
+
     }
 
     @Override
@@ -909,6 +926,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         formDataEn.put("Comment", form.getRemark());
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "申请解档",
                 JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData),  JctUtil.formatStr(formDataEn), qmr);
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "申请解档");
+
     }
 
     @Override
@@ -940,6 +960,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档",  "Apply for Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
 
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "申请归档");
     }
 
     @Override
@@ -976,6 +997,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
             formDataEn.put("Comment", form.getRemark());
             gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档",  "Apply for Archiving",
                     JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+            archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "申请归档");
         }
     }
 
@@ -1100,6 +1123,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意归档",  "Approve Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
 
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意归档");
+
     }
 
     @Override
@@ -1126,6 +1151,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         formDataEn.put("Comment", form.getRemark());
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档",  "Reject Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝归档");
+
     }
 
     @Override
@@ -1152,6 +1180,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         formDataEn.put("Comment", form.getRemark());
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意解档",  "Approve De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意解档");
+
     }
 
     @Override
@@ -1180,6 +1211,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         formDataEn.put("Comment", form.getRemark());
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档",  "Reject De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝解档");
+
     }
 
     @Override
@@ -1208,6 +1242,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         formDataEn.put("Comment", form.getRemark());
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意借阅",  "Approve Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意借阅");
+
     }
 
     @Override
@@ -1234,6 +1271,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         formDataEn.put("Comment", form.getRemark());
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅",  "Reject Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝借阅");
+
     }
 
     @Override
@@ -1260,6 +1300,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
         formDataEn.put("Comment", form.getRemark());
         gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "确认归还",  "Check-out End Confirmation",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "确认归还");
+
     }
 
 }

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

@@ -14,18 +14,14 @@ import com.hxhq.business.dto.sj.SjListDto;
 import com.hxhq.business.dto.study.StudyFormFillCc;
 import com.hxhq.business.dto.study.StudyFormFillCz;
 import com.hxhq.business.dto.study.StudyFormFillResource;
-import com.hxhq.business.enums.zykgl.JcgjlxEnum;
-import com.hxhq.business.enums.zykgl.JcmcysEnum;
-import com.hxhq.business.enums.zykgl.JyztEnum;
-import com.hxhq.business.enums.zykgl.ZjztEnum;
+import com.hxhq.business.enums.archive.ArchiveLogTypeEnum;
+import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.gsp.GspGdForm;
 import com.hxhq.business.form.gsp.GspJyForm;
 import com.hxhq.business.form.gsp.GspSearchListForm;
 import com.hxhq.business.form.mjy.GdForm;
 import com.hxhq.business.form.sj.*;
-import com.hxhq.business.service.ISjTzService;
-import com.hxhq.business.service.ISjJcgjService;
-import com.hxhq.business.service.IStudySjService;
+import com.hxhq.business.service.*;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
 import com.hxhq.common.core.exception.ServiceException;
@@ -40,7 +36,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.SjMapper;
-import com.hxhq.business.service.ISjService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -65,6 +60,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
     @Autowired
     private IStudySjService studySjService;
 
+    @Autowired
+    private IArchiveLogService archiveLogService;
+
     /**
      * 查询试剂库存列表
      *
@@ -100,6 +98,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         if(StringUtils.isNotEmpty(form.getStudyName())) {
             queryWrapper.like("t.name", form.getStudyName());
         }
+        if(form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) {
+            queryWrapper.in("s.zjzt", ZjztEnum.dgd.getValue(), ZjztEnum.gd.getValue(), ZjztEnum.djd.getValue());
+        }
         queryWrapper.orderByDesc("s.id");
         return baseMapper.queryList(queryWrapper);
     }
@@ -443,6 +444,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
                 JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sjOld.getId(), sjOld.getMc(), sjOld.getBh(), sjOld.getNd() + sjOld.getNddw(), "申请借阅");
+
     }
 
     @Override
@@ -471,6 +475,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sjOld.getId(), sjOld.getMc(), sjOld.getBh(), sjOld.getNd() + sjOld.getNddw(), "申请解档");
+
     }
 
     @Override
@@ -499,6 +506,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sjOld.getId(), sjOld.getMc(), sjOld.getBh(), sjOld.getNd() + sjOld.getNddw(), "申请归档");
+
     }
 
     @Override
@@ -534,6 +544,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
             formDataEn.put("Comment", form.getRemark());
             sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
                     JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+            archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "申请归档");
+
         }
 
     }
@@ -787,6 +800,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意归档",  "Approve Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意归档");
+
     }
 
     @Override
@@ -813,6 +829,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档",  "Reject Archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝归档");
+
     }
 
     @Override
@@ -839,6 +858,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意解档",  "Approve De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意解档");
+
     }
 
     @Override
@@ -865,6 +887,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档",  "Reject De-archiving",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝解档");
+
     }
 
     @Override
@@ -893,6 +918,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "同意借阅",  "Approve Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "同意借阅");
+
     }
 
     @Override
@@ -919,6 +947,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅",  "Reject Check-out",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "拒绝借阅");
+
     }
 
     @Override
@@ -945,6 +976,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
         formDataEn.put("Comment", form.getRemark());
         sjJcgjService.saveJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "确认归还",  "Check-out End Confirmation",
                 JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn));
+
+        archiveLogService.saveInfo(ArchiveLogTypeEnum.sj, sj.getId(), sj.getMc(), sj.getBh(), sj.getNd() + sj.getNddw(), "确认归还");
+
     }
 
 }

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

@@ -3,4 +3,21 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.GspFfjlMapper">
+    <select id="queryList" resultType="com.hxhq.business.dto.gsp.GspFfjlListDto">
+        select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq,
+        (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
+        FROM `t_gsp_ffjl` t
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
+    <select id="queryInfo" resultType="com.hxhq.business.dto.gsp.GspFfjlListDto">
+        select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc
+        ,t.syl,t.syldw,t.jlzt,t.jyzt,t.md_other,t.jyksrq,t.jyjsrq,
+        (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
+        FROM `t_gsp_ffjl` t WHERE id = #{id}
+    </select>
 </mapper>

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

@@ -5,12 +5,18 @@
 <mapper namespace="com.hxhq.business.mapper.GspMapper">
     <select id="queryStudyList" resultType="com.hxhq.business.dto.gsp.GspListDto">
         select t.id,t.mc,t.bh, t.ph, t.gg,tggdw, t.yxq,t.kc,t.kcdw,t.zjzt
-        FROM `t_study_gsp` ts
-        join  `t_gsp` t on t.id=ts.resource_id
+        FROM  `t_gsp` t
+        join  `t_study_gsp` ts on t.id=ts.resource_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
             </where>
         </if>
     </select>
+    <select id="queryInfo" resultType="com.hxhq.business.dto.gsp.GspDto">
+        select t.*,
+               (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
+        FROM `t_gsp` t
+        where t.id=#{id}
+    </select>
 </mapper>