fix：[资源库管理][麻精药管理，发放记录]优化

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

@@ -36,7 +36,7 @@ public class MjyController extends BaseController
     private IMjyJcgjService mjyJcgjService;
 
     /**
-     * 查询麻精药列表
+     * 列表
      */
     @RequiresPermissions("business:resource:mjy:list")
     @GetMapping("/list")
@@ -48,7 +48,7 @@ public class MjyController extends BaseController
     }
 
     /**
-     * 查询稽查轨迹列表
+     * 稽查轨迹列表
      */
     @RequiresPermissions("business:resource:mjy:list")
     @GetMapping("/jcgjList")
@@ -60,7 +60,7 @@ public class MjyController extends BaseController
     }
 
     /**
-     * 查询台账列表
+     * 台账列表
      */
     @RequiresPermissions("business:resource:mjy:list")
     @GetMapping("/tzList")
@@ -72,9 +72,9 @@ public class MjyController extends BaseController
     }
 
     /**
-     * 获取麻精药详细信息
+     * 详细信息
      */
-    @RequiresPermissions("business:resource:mjy:list")
+    @RequiresPermissions("business:resource:mjy:xq")
     @GetMapping(value = "/info")
     public AjaxResult getInfo(Long id)
     {
@@ -305,5 +305,15 @@ public class MjyController extends BaseController
         return AjaxResult.error("todo");
     }
 
-
+    /**
+     * 借阅
+     */
+    @PostMapping("/jy")
+    @RequiresPermissions("business:resource:mjy:jy")
+    public AjaxResult jy(@RequestBody JyForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyService.jy(form);
+        return AjaxResult.success("操作成功");
+    }
 }

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

@@ -1,7 +1,10 @@
 package com.hxhq.business.controller;
 
+import com.hxhq.business.domain.MjyFfjlJcgj;
+import com.hxhq.business.domain.MjyJcgj;
 import com.hxhq.business.dto.mjy.MjyFfjlListDto;
 import com.hxhq.business.form.mjy.*;
+import com.hxhq.business.service.IMjyFfjlJcgjService;
 import com.hxhq.business.service.IMjyFfjlService;
 import com.hxhq.common.core.web.controller.BaseController;
 import com.hxhq.common.core.web.domain.AjaxResult;
@@ -25,10 +28,12 @@ import java.util.List;
 public class MjyFfjlController extends BaseController
 {
     @Autowired
+    private IMjyFfjlJcgjService mjyFfjlJcgjService;
+    @Autowired
     private IMjyFfjlService mjyFfjlService;
 
     /**
-     * 查询列表
+     * 列表
      */
     @GetMapping("/list")
     @RequiresPermissions("business:resource:mjy:ffjllist")
@@ -40,6 +45,28 @@ public class MjyFfjlController extends BaseController
     }
 
     /**
+     * 详细信息
+     */
+    @RequiresPermissions("business:resource:mjy:ffjlxq")
+    @GetMapping(value = "/info")
+    public AjaxResult getInfo(Long id)
+    {
+        return AjaxResult.success(mjyFfjlService.queryInfo(id));
+    }
+
+    /**
+     * 稽查轨迹列表
+     */
+    @RequiresPermissions("business:resource:mjy:ffjllist")
+    @GetMapping("/jcgjList")
+    public TableDataInfo jcgjList(MjyFfjlJcgj form)
+    {
+        startPage();
+        List<MjyFfjlJcgj> list = mjyFfjlJcgjService.queryList(form);
+        return getDataTable(list);
+    }
+
+    /**
      * 解档
      */
     @PostMapping("/jd")
@@ -112,4 +139,28 @@ public class MjyFfjlController extends BaseController
         return AjaxResult.success("操作成功");
     }
 
+    /**
+     * 借阅
+     */
+    @PostMapping("/jy")
+    @RequiresPermissions("business:resource:mjy:ffjljy")
+    public AjaxResult jy(@RequestBody FfjlJyForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyFfjlService.jy(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 加签
+     */
+    @PostMapping("/jq")
+    @RequiresPermissions("business:resource:mjy:ffjljq")
+    public AjaxResult jq(@RequestBody FfjlJqForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        mjyFfjlService.jq(form);
+        return AjaxResult.success("操作成功");
+    }
+
 }

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

@@ -188,6 +188,30 @@ public class Mjy extends MpBaseEntity
     /** 发放目的ids */
     private String mdIds;
 
+    /** 借阅开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyksrq;
+
+    /** 借阅结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyjsrq;
+
+    public Date getJyksrq() {
+        return jyksrq;
+    }
+
+    public void setJyksrq(Date jyksrq) {
+        this.jyksrq = jyksrq;
+    }
+
+    public Date getJyjsrq() {
+        return jyjsrq;
+    }
+
+    public void setJyjsrq(Date jyjsrq) {
+        this.jyjsrq = jyjsrq;
+    }
+
     public String getMdIds() {
         return mdIds;
     }

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

@@ -149,6 +149,30 @@ public class MjyFfjl extends MpBaseEntity
     /** 暂存柜id */
     private Long zcgId;
 
+    /** 借阅开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyksrq;
+
+    /** 借阅结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyjsrq;
+
+    public Date getJyksrq() {
+        return jyksrq;
+    }
+
+    public void setJyksrq(Date jyksrq) {
+        this.jyksrq = jyksrq;
+    }
+
+    public Date getJyjsrq() {
+        return jyjsrq;
+    }
+
+    public void setJyjsrq(Date jyjsrq) {
+        this.jyjsrq = jyjsrq;
+    }
+
     public String getMdIds() {
         return mdIds;
     }

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

@@ -0,0 +1,12 @@
+package com.hxhq.business.dto.mjy;
+
+import com.hxhq.business.domain.Mjy;
+import com.hxhq.business.domain.MjyFfjl;
+
+/**
+ * @author 15881
+ */
+public class MjyFfjlDetailDto extends MjyFfjl {
+
+
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/FfjlJqForm.java

@@ -0,0 +1,56 @@
+package com.hxhq.business.form.mjy;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * @author 15881
+ */
+public class FfjlJqForm {
+
+    /** 发放记录id */
+    private Long id;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    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/form/mjy/FfjlJyForm.java

@@ -0,0 +1,79 @@
+package com.hxhq.business.form.mjy;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * @author 15881
+ */
+public class FfjlJyForm {
+
+    /** 发放记录id */
+    private Long id;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    /** 日期开始 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 日期结束 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    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/form/mjy/JyForm.java

@@ -0,0 +1,79 @@
+package com.hxhq.business.form.mjy;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * @author 15881
+ */
+public class JyForm {
+
+    /** 麻精药id */
+    private Long id;
+
+    /** 备注 */
+    private String remark;
+
+    /** 签名人id */
+    private Long qmrId;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    /** 日期开始 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 日期结束 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    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/mapper/MjyFfjlMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.hxhq.business.domain.Mjy;
 import com.hxhq.business.domain.MjyFfjl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.dto.mjy.MjyDetailDto;
+import com.hxhq.business.dto.mjy.MjyFfjlDetailDto;
 import com.hxhq.business.dto.mjy.MjyFfjlListDto;
 import com.hxhq.business.dto.mjy.MjyListDto;
 import org.apache.ibatis.annotations.Param;
@@ -24,4 +26,11 @@ public interface MjyFfjlMapper extends BaseMapper
      * @return
      */
     List<MjyFfjlListDto> queryList(@Param("ew") Wrapper<MjyFfjl> queryWrapper);
+
+    /**
+     *  查询详情
+     * @param id
+     * @return
+     */
+    MjyFfjlDetailDto queryInfo(@Param("id") Long id);
 }

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

@@ -3,6 +3,8 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.MjyFfjl;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.dto.mjy.MjyDetailDto;
+import com.hxhq.business.dto.mjy.MjyFfjlDetailDto;
 import com.hxhq.business.dto.mjy.MjyFfjlListDto;
 import com.hxhq.business.form.mjy.*;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,14 +18,22 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface IMjyFfjlService extends IService<MjyFfjl>
 {
     /**
-     * 查询麻精药-发放记录列表
+     * 列表
      *
      * @param form 麻精药-发放记录
-     * @return 麻精药-发放记录集合
+     * @return
      */
     public List<MjyFfjlListDto> queryList(FfjlSearchForm form);
 
     /**
+     * 详情
+     *
+     * @param id
+     * @return
+     */
+    public MjyFfjlDetailDto queryInfo(Long id);
+
+    /**
      * 解档
      *
      * @param form
@@ -65,4 +75,20 @@ public interface IMjyFfjlService extends IService
      * @param form
      */
     public void js(@RequestBody FfjlJsForm form);
+
+
+    /**
+     * 借阅
+     *
+     * @param form
+     */
+    public void jy(@RequestBody FfjlJyForm form);
+
+
+    /**
+     * 加签
+     *
+     * @param form
+     */
+    public void jq(@RequestBody FfjlJqForm form);
 }

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

@@ -157,4 +157,11 @@ public interface IMjyService extends IService
      */
     public void shxgkc(@RequestBody ShxgkcForm form);
 
+
+    /**
+     * 借阅
+     *
+     * @param form
+     */
+    public void jy(@RequestBody JyForm form);
 }

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

@@ -1,17 +1,23 @@
 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.Mjy;
-import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.domain.MjyFfjlJcgj;
+import com.hxhq.business.dto.mjy.MjyDetailDto;
+import com.hxhq.business.dto.mjy.MjyFfjlDetailDto;
 import com.hxhq.business.dto.mjy.MjyFfjlListDto;
-import com.hxhq.business.enums.zykgl.JcgjlxEnum;
-import com.hxhq.business.enums.zykgl.JcmcysEnum;
-import com.hxhq.business.enums.zykgl.JlztEnum;
+import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.enums.zykgl.JlztEnum;
 import com.hxhq.business.form.mjy.*;
+import com.hxhq.business.service.IMjyFfjlJcgjService;
+import com.hxhq.business.utils.JcgjUtil;
+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;
@@ -26,7 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 /**
- * 麻精药-发放记录Service业务层处理
+ * 发放记录-发放记录Service业务层处理
  *
  * @author hxhq
  * @date 2025-12-21
@@ -36,12 +42,14 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
 {
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private IMjyFfjlJcgjService mjyFfjlJcgjService;
 
     /**
-     * 查询列表
+     * 列表
      *
-     * @param form 麻精药发放记录
-     * @return 麻精药发放记录
+     * @param form 发放记录发放记录
+     * @return 发放记录发放记录
      */
     @Override
     public List<MjyFfjlListDto> queryList(FfjlSearchForm form)
@@ -80,6 +88,86 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     }
 
     /**
+     * 加签 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void jq(@RequestBody FfjlJqForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new SecurityException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.wsd.getValue())) {
+            throw new SecurityException("发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能加签");
+        }
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "补充说明");
+        formData.put("签名人",  qmr.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+    }
+
+    /**
+     * 借阅 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void jy(@RequestBody FfjlJyForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        MjyFfjl mjyFfjlOld = this.getById(form.getId());
+        if (mjyFfjlOld == null) {
+            throw new SecurityException("发放记录不存在或已删除");
+        }
+        if (!mjyFfjlOld.getJlzt().equals(JlztEnum.gd.getValue())) {
+            throw new SecurityException("发放记录【" + mjyFfjlOld.getMc() + "】不是归档状态，不能借阅");
+        }
+        if (!mjyFfjlOld.getJyzt().equals(JyztEnum.wjy.getValue())) {
+            throw new SecurityException("发放记录【" + mjyFfjlOld.getMc() + "】不是未借阅状态，不能借阅");
+        }
+        //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作；
+        mjyFfjlOld.setJyzt(JyztEnum.djy.getValue());
+        mjyFfjlOld.setJyksrq(form.getStartDate());
+        mjyFfjlOld.setJyjsrq(form.getEndDate());
+        this.updateById(mjyFfjlOld);
+        //稽查轨迹
+        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());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+    }
+
+    /**
+     * 详情
+     *
+     * @param id
+     * @return 暂存柜
+     */
+    @Override
+    public MjyFfjlDetailDto queryInfo(Long id) {
+        if (id == null || id.longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        return baseMapper.queryInfo(id);
+    }
+
+    /**
      * 解档 ok
      *
      * @param form
@@ -94,20 +182,21 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         }
         MjyFfjl mjyFfjlOld = this.getById(form.getId());
         if (mjyFfjlOld == null) {
-            throw new SecurityException("麻精药发放记录不存在或已删除");
+            throw new SecurityException("发放记录发放记录不存在或已删除");
         }
         if (!mjyFfjlOld.getJlzt().equals(JlztEnum.gd.getValue())) {
-            throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】未归档，不能解档");
+            throw new SecurityException("发放记录发放记录【" + mjyFfjlOld.getMc() + "】未归档，不能解档");
         }
         //申请解档后，状态更新为待解档，等待档案员审核期间无法进行其他操作；
         mjyFfjlOld.setJlzt(JlztEnum.djd.getValue());
         this.updateById(mjyFfjlOld);
-//        //稽查轨迹 todo
-//        String jcnr = "备注：" + form.getRemark()
-//                + ";签名意义：申请解档"
-//                + ";签名人：" + qmr.getNickName();
-//        mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
-//
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "申请解档");
+        formData.put("签名人",  qmr.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+
     }
 
     /**
@@ -126,35 +215,36 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         QueryWrapper<MjyFfjl> queryWrapper = Wrappers.query();
         queryWrapper.in("id", form.getIds());
         List<MjyFfjl> mjyFfjlList = this.list(queryWrapper);
-        List<MjyJcgj> mjyJcgjList = new ArrayList<>();
+        List<MjyFfjlJcgj> mjyFfjlJcgjList = new ArrayList<>();
         if (mjyFfjlList.size() > 0) {
             for (MjyFfjl mjy : mjyFfjlList) {
                 if (!mjy.getJlzt().equals(JlztEnum.ysd.getValue())) {
-                    throw new SecurityException("麻精药发放记录【" + mjy.getMc() + "】不是锁定状态，不能归档");
+                    throw new SecurityException("发放记录发放记录【" + mjy.getMc() + "】不是锁定状态，不能归档");
                 }
             }
             for (MjyFfjl mjyFfjl : mjyFfjlList) {
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 mjyFfjl.setJlzt(JlztEnum.dgd.getValue());
 
-//                //region 稽查轨迹
-//                MjyJcgj mjyJcgj = new MjyJcgj();
-//                mjyJcgj.setMjyId(mjy.getId());
-//                mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
-//                mjyJcgj.setJcmc("申请归档");
-//                mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
-//                String jcnr = "备注：" + form.getRemark()
-//                        + ";签名意义：申请归档"
-//                        + ";签名人：" + qmr.getNickName();
-//                mjyJcgj.setJcnr(jcnr);
-//                mjyJcgj.setQmrId(SecurityUtils.getUserId());
-//                mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
-//                mjyJcgjList.add(mjyJcgj);
-//                //endregion
+                //region 稽查轨迹
+                MjyFfjlJcgj mjyFfjlJcgj = new MjyFfjlJcgj();
+                mjyFfjlJcgj.setFfjlId(mjyFfjl.getId());
+                mjyFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+                mjyFfjlJcgj.setJcmc("申请归档");
+                mjyFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue());
+                Map<String, String> formData = new LinkedHashMap<>();
+                formData.put("备注", form.getRemark());
+                formData.put("签名意义", "申请归档");
+                formData.put("签名人",  qmr.getNickName());
+                mjyFfjlJcgj.setJcnr(JcgjUtil.formatStr(formData));
+                mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
+                mjyFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                mjyFfjlJcgjList.add(mjyFfjlJcgj);
+                //endregion
 
             }
             this.saveOrUpdateBatch(mjyFfjlList);
-//            mjyJcgjService.saveBatch(mjyJcgjList);
+            mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
         }
     }
 
@@ -173,20 +263,21 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         }
         MjyFfjl mjyFfjlOld = this.getById(form.getId());
         if (mjyFfjlOld == null) {
-            throw new SecurityException("麻精药发放记录不存在或已删除");
+            throw new SecurityException("发放记录发放记录不存在或已删除");
         }
         if (!mjyFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) {
-            throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是锁定状态，不能归档");
+            throw new SecurityException("发放记录发放记录【" + mjyFfjlOld.getMc() + "】不是锁定状态，不能归档");
         }
         //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
         mjyFfjlOld.setJlzt(JlztEnum.dgd.getValue());
         this.updateById(mjyFfjlOld);
-//        //稽查轨迹
-//        String jcnr = "备注：" + form.getRemark()
-//                + ";签名意义：申请归档"
-//                + ";签名人：" + qmr.getNickName();
-//        mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
-//
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "申请归档");
+        formData.put("签名人",  qmr.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+
     }
 
 
@@ -207,32 +298,34 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         queryWrapper.in("id", form.getIds());
         queryWrapper.eq("jlzt", JlztEnum.wsd.getValue());
         List<MjyFfjl> mjyFfjlList = this.list(queryWrapper);
-//        List<MjyFfjlJcgj> mjyJcgjList = new ArrayList<>();
+        List<MjyFfjlJcgj> mjyFfjlJcgjList = new ArrayList<>();
         if (mjyFfjlList.size() <= 0) {
-            throw new SecurityException("麻精药发放记录不是未锁定状态，不能锁定");
+            throw new SecurityException("发放记录发放记录不是未锁定状态，不能锁定");
         }
         for (MjyFfjl mjyFfjl : mjyFfjlList) {
             //锁定
             mjyFfjl.setJlzt(JlztEnum.ysd.getValue());
 
-//            //region 稽查轨迹
-//            MjyJcgj mjyJcgj = new MjyJcgj();
-//            mjyJcgj.setMjyId(mjy.getId());
-//            mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
-//            mjyJcgj.setJcmc("锁定麻精药发放记录");
-//            mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
-//            String jcnr = "备注：" + form.getRemark()
-//                    + ";签名意义：锁定麻精药发放记录"
-//                    + ";签名人：" + qmr.getNickName();
-//            mjyJcgj.setJcnr(jcnr);
-//            mjyJcgj.setQmrId(SecurityUtils.getUserId());
-//            mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
-//            mjyJcgjList.add(mjyJcgj);
-//            //endregion
+            //region 稽查轨迹
+            MjyFfjlJcgj mjyFfjlJcgj = new MjyFfjlJcgj();
+            mjyFfjlJcgj.setFfjlId(mjyFfjl.getId());
+            mjyFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
+            mjyFfjlJcgj.setJcmc("锁定发放记录");
+            mjyFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue());
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", form.getRemark());
+            formData.put("签名意义", "锁定发放记录");
+            formData.put("签名人",  qmr.getNickName());
+
+            mjyFfjlJcgj.setJcnr(JcgjUtil.formatStr(formData));
+            mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
+            mjyFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            mjyFfjlJcgjList.add(mjyFfjlJcgj);
+            //endregion
 
         }
         this.saveOrUpdateBatch(mjyFfjlList);
-//        mjyJcgjService.saveBatch(mjyJcgjList);
+        mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
 
     }
 
@@ -251,19 +344,20 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         }
         MjyFfjl mjyFfjlOld = this.getById(form.getId());
         if (mjyFfjlOld == null) {
-            throw new SecurityException("麻精药发放记录不存在或已删除");
+            throw new SecurityException("发放记录发放记录不存在或已删除");
         }
         if (!mjyFfjlOld.getJlzt().equals(JlztEnum.wsd.getValue())) {
-            throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能锁定");
+            throw new SecurityException("发放记录发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能锁定");
         }
         mjyFfjlOld.setJlzt(JlztEnum.ysd.getValue());
         this.updateById(mjyFfjlOld);
-//        //稽查轨迹
-//        String jcnr = "备注：" + form.getRemark()
-//                + ";签名意义：锁定麻精药发放记录"
-//                + ";签名人：" + qmr.getNickName();
-//        mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药发放记录", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
-//
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "锁定发放记录");
+        formData.put("签名人",  qmr.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+
     }
 
 
@@ -282,20 +376,21 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         }
         MjyFfjl mjyFfjlOld = this.getById(form.getId());
         if (mjyFfjlOld == null) {
-            throw new SecurityException("麻精药发放记录不存在或已删除");
+            throw new SecurityException("发放记录发放记录不存在或已删除");
         }
         if (!mjyFfjlOld.getJlzt().equals(JlztEnum.ysd.getValue())) {
-            throw new SecurityException("麻精药发放记录【" + mjyFfjlOld.getMc() + "】不是已锁定状态，不能解锁");
+            throw new SecurityException("发放记录发放记录【" + mjyFfjlOld.getMc() + "】不是已锁定状态，不能解锁");
         }
         //点击解锁，状态更新为入库；
         mjyFfjlOld.setJlzt(JlztEnum.wsd.getValue());
         this.updateById(mjyFfjlOld);
-//        //稽查轨迹
-//        String jcnr = "备注：" + form.getRemark()
-//                + ";签名意义：解锁麻精药发放记录"
-//                + ";签名人：" + qmr.getNickName();
-//        mjyJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药发放记录", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
-//
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "解锁发放记录");
+        formData.put("签名人",  qmr.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+
     }
 
 }

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

@@ -37,7 +37,7 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
         if(mjyJcgj.getJcgjlx()!=null&&mjyJcgj.getJcgjlx().intValue()>0){
             queryWrapper.eq("jcgjlx",mjyJcgj.getJcgjlx());
         }
-        if (StringUtils.isBlank(mjyJcgj.getJcmc())) {
+        if (StringUtils.isNoneBlank(mjyJcgj.getJcmc())) {
             queryWrapper.and(p -> p.like("`jcmc`", mjyJcgj.getJcmc())
             .or().like("`jcnr`", mjyJcgj.getJcmc()));
         }

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

@@ -12,7 +12,9 @@ import com.hxhq.business.dto.mjy.MjyListDto;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.form.mjy.*;
 import com.hxhq.business.service.*;
+import com.hxhq.business.utils.JcgjUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
+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;
@@ -48,13 +50,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
     private IMjyTzService mjyTzService;
 
     /**
-     * 查询麻精药列表
+     * 列表
      *
      * @param form 暂存柜
      * @return 暂存柜
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public List<MjyListDto> queryList(SearchForm form) {
         QueryWrapper<Mjy> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
@@ -82,13 +83,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
 
 
     /**
-     * 查询麻精药
+     * 详情
      *
      * @param id
      * @return 暂存柜
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public MjyDetailDto queryInfo(Long id) {
         if (id == null || id.longValue() < 0) {
             throw new SecurityException("参数id不正确");
@@ -120,10 +120,49 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setZjzt(ZjztEnum.djd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        String jcnr = "备注：" + form.getRemark()
-                + ";签名意义：申请解档"
-                + ";签名人：" + qmr.getNickName();
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "申请解档");
+        formData.put("签名人",  qmr.getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+    }
+
+    /**
+     * 借阅 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void jy(@RequestBody JyForm form) {
+        SysUser qmr = sysUserService.selectUserById(form.getQmrId());
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new SecurityException("参数id不正确");
+        }
+        Mjy mjyOld = this.getById(form.getId());
+        if (mjyOld == null) {
+            throw new SecurityException("麻精药不存在或已删除");
+        }
+        if (!mjyOld.getZjzt().equals(ZjztEnum.gd.getValue())) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是归档状态，不能借阅");
+        }
+        if (!mjyOld.getJyzt().equals(JyztEnum.wjy.getValue())) {
+            throw new SecurityException("麻精药【" + mjyOld.getMc() + "】不是未借阅状态，不能借阅");
+        }
+        //申请借阅后，借阅状态更新为待借阅，等待档案员审核期间无法进行其他操作；
+        mjyOld.setJyzt(JyztEnum.djy.getValue());
+        mjyOld.setJyksrq(form.getStartDate());
+        mjyOld.setJyjsrq(form.getEndDate());
+        this.updateById(mjyOld);
+        //稽查轨迹
+        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());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
     /**
@@ -198,10 +237,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setZjzt(ZjztEnum.dgd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        String jcnr = "备注：" + form.getRemark()
-                + ";签名意义：申请归档"
-                + ";签名人：" + qmr.getNickName();
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "申请归档");
+        formData.put("签名人",  qmr.getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
 
@@ -236,10 +276,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
             mjyJcgj.setJcmc("锁定麻精药");
             mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
-            String jcnr = "备注：" + form.getRemark()
-                    + ";签名意义：锁定麻精药"
-                    + ";签名人：" + qmr.getNickName();
-            mjyJcgj.setJcnr(jcnr);
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", form.getRemark());
+            formData.put("签名意义", "锁定麻精药");
+            formData.put("签名人",  qmr.getNickName());
+
+            mjyJcgj.setJcnr(JcgjUtil.formatStr(formData));
             mjyJcgj.setQmrId(SecurityUtils.getUserId());
             mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
             mjyJcgjList.add(mjyJcgj);
@@ -274,10 +316,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setZjzt(ZjztEnum.ysd.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        String jcnr = "备注：" + form.getRemark()
-                + ";签名意义：锁定麻精药"
-                + ";签名人：" + qmr.getNickName();
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "锁定麻精药");
+        formData.put("签名人",  qmr.getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
 
@@ -305,10 +348,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         mjyOld.setZjzt(ZjztEnum.rk.getValue());
         this.updateById(mjyOld);
         //稽查轨迹
-        String jcnr = "备注：" + form.getRemark()
-                + ";签名意义：解锁麻精药"
-                + ";签名人：" + qmr.getNickName();
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", form.getRemark());
+        formData.put("签名意义", "解锁麻精药");
+        formData.put("签名人",  qmr.getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
     }
 
     /**
@@ -383,13 +427,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
                 mjyJcgj.setJcmc("处置药剂");
                 mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
-                String jcnr = "处置方式：" + mjyPlffItemFilter.get(0).getCzfs()
-                        + ";处置原因：" + mjyPlffItemFilter.get(0).getCzyy()
-                        + ";处置量：" + mjyPlffItemFilter.get(0).getCzl() + mjy.getKcdw()
-                        + ";处置人：" + clr.getNickName()
-                        + ";复核人：" + fhr.getNickName()
-                        + ";监督人：" + jdr.getNickName();
-                mjyJcgj.setJcnr(jcnr);
+                Map<String, String> formData = new LinkedHashMap<>();
+                formData.put("处置方式", mjyPlffItemFilter.get(0).getCzfs());
+                formData.put("处置原因", mjyPlffItemFilter.get(0).getCzyy());
+                formData.put("处置量",  mjyPlffItemFilter.get(0).getCzl() + mjy.getKcdw());
+                formData.put("处置人",  clr.getNickName());
+                formData.put("复核人",  fhr.getNickName());
+                formData.put("监督人",  jdr.getNickName());
+                
+                mjyJcgj.setJcnr(JcgjUtil.formatStr(formData));
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
                 mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
                 mjyJcgjList.add(mjyJcgj);
@@ -471,13 +517,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
 
 
         //region 稽查轨迹
-        String jcnr = "处置方式：" + form.getCzfs()
-                + ";处置原因：" + form.getCzyy()
-                + ";处置量：" + form.getCzl() + mjyOld.getKcdw()
-                + ";处置人：" + clr.getNickName()
-                + ";复核人：" + fhr.getNickName()
-                + ";监督人：" + jdr.getNickName();
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("处置方式", form.getCzfs());
+        formData.put("处置原因", form.getCzyy());
+        formData.put("处置量",  form.getCzl() + mjyOld.getKcdw());
+        formData.put("处置人",  clr.getNickName());
+        formData.put("复核人",  fhr.getNickName());
+        formData.put("监督人",  jdr.getNickName());
+
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
 
         //region 台账
@@ -537,12 +586,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
                 mjyJcgj.setJcmc("处置容器");
                 mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
-                String jcnr = "处置方式：" + mjyPlffItemFilter.get(0).getCzfs()
-                        + ";处置原因：" + mjyPlffItemFilter.get(0).getCzyy()
-                        + ";处置人：" + clr.getNickName()
-                        + ";复核人：" + fhr.getNickName()
-                        + ";监督人：" + jdr.getNickName();
-                mjyJcgj.setJcnr(jcnr);
+
+                Map<String, String> formData = new LinkedHashMap<>();
+                formData.put("处置方式", mjyPlffItemFilter.get(0).getCzfs());
+                formData.put("处置原因", mjyPlffItemFilter.get(0).getCzyy());
+                formData.put("处置人",  clr.getNickName());
+                formData.put("复核人",  fhr.getNickName());
+                formData.put("监督人",  jdr.getNickName());
+
+                mjyJcgj.setJcnr(JcgjUtil.formatStr(formData));
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
                 mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
                 mjyJcgjList.add(mjyJcgj);
@@ -604,12 +656,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             throw new SecurityException("麻精药【" + mjyOld.getMc() + "】已经处置过容器了，不能重复操作");
         }
         //region 稽查轨迹
-        String jcnr = "处置方式：" + form.getCzfs()
-                + ";处置原因：" + form.getCzyy()
-                + ";处置人：" + clr.getNickName()
-                + ";复核人：" + fhr.getNickName()
-                + ";监督人：" + jdr.getNickName();
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("处置方式", form.getCzfs());
+        formData.put("处置原因", form.getCzyy());
+        formData.put("处置人",  clr.getNickName());
+        formData.put("复核人",  fhr.getNickName());
+        formData.put("监督人",  jdr.getNickName());
+
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JcgjUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
 
         //region 台账
@@ -678,12 +732,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
             mjyJcgj.setJcmc("钥匙发放");
             mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
-            String jcnr = "备注：" + form.getRemark()
-                    + ";签名意义：钥匙发放"
-                    + ";钥匙1领取人：" + lqr1.getNickName()
-                    + ";钥匙2领取人：" + lqr2.getNickName()
-                    + ";发放人：" + ffr1.getNickName();
-            mjyJcgj.setJcnr(jcnr);
+
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("备注", form.getRemark());
+            formData.put("钥匙1领取人", lqr1.getNickName());
+            formData.put("钥匙2领取人",  lqr2.getNickName());
+            formData.put("发放人",  ffr1.getNickName());
+
+            mjyJcgj.setJcnr(JcgjUtil.formatStr(formData));
             mjyJcgj.setQmrId(SecurityUtils.getUserId());
             mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
             mjyJcgjList.add(mjyJcgj);
@@ -776,12 +832,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //endregion
 
         //region 稽查轨迹
-        String jcnr = "出库量：" + mjyOld.getKc()
-                + ";转移条件：" + form.getZytj()
-                + ";出库毛重：" + form.getCkmz() + mjyOld.getKcdw()
-                + ";目的：" + form.getMdIds()
-                + ";备注：" + form.getRemark();
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), jcnr,
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("出库量", mjyOld.getKc());
+        formData.put("转移条件", form.getZytj());
+        formData.put("出库毛重",  form.getCkmz() + mjyOld.getKcdw());
+        formData.put("目的",  form.getMdIds());
+        formData.put("备注",  form.getRemark());
+
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(),JcgjUtil.formatStr(formData),
                 SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
         //endregion
 
@@ -909,12 +967,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue());
                 mjyJcgj.setJcmc("领取发放");
                 mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
-                String jcnr = "出库量：" + mjy.getKc()
-                        + ";转移条件：" + plffItemFilter.get(0).getZytj()
-                        + ";出库毛重：" + plffItemFilter.get(0).getCkmz() + mjy.getKcdw()
-                        + ";目的：" + plffItemFilter.get(0).getMdIds()
-                        + ";备注：" + plffItemFilter.get(0).getRemark();
-                mjyJcgj.setJcnr(jcnr);
+
+                Map<String, String> formData = new LinkedHashMap<>();
+                formData.put("出库量", mjy.getKc());
+                formData.put("转移条件", plffItemFilter.get(0).getZytj());
+                formData.put("出库毛重",  plffItemFilter.get(0).getCkmz() + mjy.getKcdw());
+                formData.put("目的",  plffItemFilter.get(0).getMdIds());
+                formData.put("备注",  plffItemFilter.get(0).getRemark());
+
+                mjyJcgj.setJcnr(JcgjUtil.formatStr(formData));
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
                 mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
                 mjyJcgjList.add(mjyJcgj);
@@ -1170,7 +1231,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         } else {
             mjyJcgj.setJcmcys(JcmcysEnum.red.getValue());
         }
-        mjyJcgj.setJcnr("申请备注：" + mjyOld.getKcbjbz() + "；审核备注：" + form.getRemark());
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("申请备注", mjyOld.getKcbjbz());
+        formData.put("审核备注", form.getRemark());
+        mjyJcgj.setJcnr(JcgjUtil.formatStr(formData));
         mjyJcgj.setQmrId(qmr.getUserId());
         mjyJcgj.setQmrMc(qmr.getNickName());
         mjyJcgjService.save(mjyJcgj);

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/JcgjUtil.java

@@ -0,0 +1,56 @@
+package com.hxhq.business.utils;
+
+import com.alibaba.fastjson2.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class JcgjUtil {
+    private static final Logger LOG = LoggerFactory.getLogger(JcgjUtil.class.getName());
+
+    public static void main(String[] args) {
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("姓名", "张三");
+        formData.put("年龄", "19");
+        LOG.info(formatStr(formData));
+    }
+
+    public static String formatStr(Map<String, String> map) {
+        List<jcgj> result=new ArrayList<>();
+        // 遍历键值对
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            String key = entry.getKey();
+            String value = entry.getValue();
+            jcgj jcgj=new jcgj();
+            jcgj.setName(key);
+            jcgj.setValue(value);
+            result.add(jcgj);
+        }
+        return JSONObject.toJSONString(result);
+    }
+
+    public static class jcgj {
+        private String name;
+        private String value;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public void setValue(String value) {
+            this.value = value;
+        }
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java

@@ -185,8 +185,8 @@ public class ObjectCompareUtil {
     public static class FieldChange {
         private String fieldName;      // 字段名
         private String fieldLabel;     // 字段描述
-        private Object oldValue;       // 旧值
-        private Object newValue;       // 新值
+        private String oldValue;       // 旧值
+        private String newValue;       // 新值
         private String fieldType;      // 字段类型
 
         // getter和setter
@@ -210,15 +210,15 @@ public class ObjectCompareUtil {
             return oldValue;
         }
 
-        public void setOldValue(Object oldValue) {
+        public void setOldValue(String oldValue) {
             this.oldValue = oldValue;
         }
 
-        public Object getNewValue() {
+        public String getNewValue() {
             return newValue;
         }
 
-        public void setNewValue(Object newValue) {
+        public void setNewValue(String newValue) {
             this.newValue = newValue;
         }
 
@@ -232,12 +232,11 @@ public class ObjectCompareUtil {
 
         @Override
         public String toString() {
-            Map<String, Object> map = new HashMap<String, Object>(3);
+            Map<String, String> map = new LinkedHashMap<>();
             map.put("字段名", fieldLabel);
             map.put("原值", oldValue);
             map.put("新值", newValue);
-            return JSONObject.toJSONString(map);
-            //return String.format("字段名：%s;原值：%s;新值：%s", fieldLabel, oldValue, newValue);
+            return JcgjUtil.formatStr(map);
         }
     }
 

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

@@ -15,4 +15,10 @@
             </where>
         </if>
     </select>
+
+    <select id="queryInfo" resultType="com.hxhq.business.dto.mjy.MjyFfjlDetailDto">
+        select t.*
+        FROM `t_mjy_ffjl` t
+        where t.id=#{id}
+    </select>
 </mapper>