fix：[资源库管理][麻精药]翻译

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

@@ -30,23 +30,23 @@ public class Mjy extends MpBaseEntity
     private String bh;
 
     /** 浓度 */
-    @Compare(name = "浓度")
+    @Compare(name = "浓度",nameEn = "Concentration")
     private String nd;
 
     /** 浓度单位 */
-    @Compare(name = "浓度单位")
+    @Compare(name = "浓度单位",nameEn = "todo浓度单位")
     private String nddw;
 
     /** 库存 */
-    @Compare(name = "库存")
+    @Compare(name = "库存",nameEn = "Inventory")
     private String kc;
 
     /** 库存单位 */
-    @Compare(name = "库存单位")
+    @Compare(name = "库存单位",nameEn = "todo库存单位")
     private String kcdw;
 
     /** 失效日期 */
-    @Compare(name = "失效日期")
+    @Compare(name = "失效日期",nameEn = "todo失效日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sxrq;
 

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

@@ -87,6 +87,18 @@ public class MjyFfjl extends MpBaseEntity
     /** 发放人2名称 */
     private String ffr2Mc;
 
+    /** 领取人1名称-英文 */
+    private String lqr1McEn;
+
+    /** 领取人2名称-英文 */
+    private String lqr2McEn;
+
+    /** 发放人1名称-英文 */
+    private String ffr1McEn;
+
+    /** 发放人2名称-英文 */
+    private String ffr2McEn;
+
     /** 发放日期 */
      @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ffrq;
@@ -97,7 +109,6 @@ public class MjyFfjl extends MpBaseEntity
     /** 目的ids */
     private String mdIds;
 
-
     /** 发放目的其他 */
     private String mdOther;
 
@@ -158,6 +169,18 @@ public class MjyFfjl extends MpBaseEntity
     /** 接收人2名称 */
     private String jsr2Mc;
 
+    /** 归还人1名称-英文 */
+    private String ghr1McEn;
+
+    /** 归还人2名称 -英文*/
+    private String ghr2McEn;
+
+    /** 接收人1名称-英文 */
+    private String jsr1McEn;
+
+    /** 接收人2名称-英文 */
+    private String jsr2McEn;
+
     /** 归还日期 */
             @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date ghrq;
@@ -168,6 +191,11 @@ public class MjyFfjl extends MpBaseEntity
     /** 归档申请人id */
     private Long gdsqrId;
 
+    /** 归档申请人名称 */
+    private String gdsqrMc;
+
+    /** 归档申请人名称-英文 */
+    private String gdsqrMcEn;
 
     /** 暂存柜id */
     private Long zcgId;
@@ -180,6 +208,38 @@ public class MjyFfjl extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyjsrq;
 
+    public String getLqr1McEn() {
+        return lqr1McEn;
+    }
+
+    public void setLqr1McEn(String lqr1McEn) {
+        this.lqr1McEn = lqr1McEn;
+    }
+
+    public String getLqr2McEn() {
+        return lqr2McEn;
+    }
+
+    public void setLqr2McEn(String lqr2McEn) {
+        this.lqr2McEn = lqr2McEn;
+    }
+
+    public String getFfr1McEn() {
+        return ffr1McEn;
+    }
+
+    public void setFfr1McEn(String ffr1McEn) {
+        this.ffr1McEn = ffr1McEn;
+    }
+
+    public String getFfr2McEn() {
+        return ffr2McEn;
+    }
+
+    public void setFfr2McEn(String ffr2McEn) {
+        this.ffr2McEn = ffr2McEn;
+    }
+
     public String getMdOther() {
         return mdOther;
     }
@@ -188,6 +248,54 @@ public class MjyFfjl extends MpBaseEntity
         this.mdOther = mdOther;
     }
 
+    public String getGhr1McEn() {
+        return ghr1McEn;
+    }
+
+    public void setGhr1McEn(String ghr1McEn) {
+        this.ghr1McEn = ghr1McEn;
+    }
+
+    public String getGhr2McEn() {
+        return ghr2McEn;
+    }
+
+    public void setGhr2McEn(String ghr2McEn) {
+        this.ghr2McEn = ghr2McEn;
+    }
+
+    public String getJsr1McEn() {
+        return jsr1McEn;
+    }
+
+    public void setJsr1McEn(String jsr1McEn) {
+        this.jsr1McEn = jsr1McEn;
+    }
+
+    public String getJsr2McEn() {
+        return jsr2McEn;
+    }
+
+    public void setJsr2McEn(String jsr2McEn) {
+        this.jsr2McEn = jsr2McEn;
+    }
+
+    public String getGdsqrMc() {
+        return gdsqrMc;
+    }
+
+    public void setGdsqrMc(String gdsqrMc) {
+        this.gdsqrMc = gdsqrMc;
+    }
+
+    public String getGdsqrMcEn() {
+        return gdsqrMcEn;
+    }
+
+    public void setGdsqrMcEn(String gdsqrMcEn) {
+        this.gdsqrMcEn = gdsqrMcEn;
+    }
+
     public String getRkmz() {
         return rkmz;
     }

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

@@ -15,36 +15,36 @@ public class BjForm {
     private Long id;
 
     /** 名称编辑 */
-    @Compare(name = "名称")
+    @Compare(name = "名称",nameEn = "Name")
     private String mc;
 
     /** 浓度编辑 */
-    @Compare(name = "浓度")
+    @Compare(name = "浓度",nameEn = "Concentration")
     private String nd;
 
     /** 浓度单位编辑 */
-    @Compare(name = "浓度单位")
+    @Compare(name = "浓度单位",nameEn = "todo浓度单位")
     private String nddw;
 
     /** 库存编辑 */
-    @Compare(name = "库存")
+    @Compare(name = "库存",nameEn = "Inventory")
     private String kc;
 
     /** 库存单位编辑 */
-    @Compare(name = "库存单位")
+    @Compare(name = "库存单位",nameEn = "todo库存单位")
     private String kcdw;
 
     /** 失效日期编辑 */
-    @Compare(name = "失效日期")
+    @Compare(name = "失效日期",nameEn = "todo失效日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sxrq;
 
     /** 存储条件编辑 */
-    @Compare(name = "存储条件")
+    @Compare(name = "存储条件",nameEn = "todo库存单位")
     private String cctj;
 
     /** 存储位置编辑 */
-    @Compare(name = "存储位置")
+    @Compare(name = "存储位置",nameEn = "Storage Location")
     private String ccwz;
 
     /** 编辑备注 */

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

@@ -12,11 +12,11 @@ public class XgkcForm {
     private Long id;
 
     /** 库存 */
-    @Compare(name = "库存")
+    @Compare(name = "库存",nameEn = "Inventory")
     private String kc;;
 
     /** 库存单位 */
-    @Compare(name = "库存单位")
+    @Compare(name = "库存单位",nameEn = "todo库存单位")
     private String kcdw;
 
     /** 库存编辑备注 */

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

@@ -1,9 +1,12 @@
 package com.hxhq.business.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.hxhq.business.domain.MjyFfjlJcgj;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.system.api.domain.SysUser;
 
 /**
  * 麻精药发放记录-稽查轨迹Service接口
@@ -28,8 +31,21 @@ public interface IMjyFfjlJcgjService extends IService
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
      * @param jcnr 稽查内容
-     * @param jcrId 稽查人id
-     * @param jcrMc 稽查人名称
+     * @param qmr 签名人
+     * @param remark 备注
+     */
+    public  void saveJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
+
+
+    /**
+     * 新增稽查轨迹
+     * @param ffjlId 发放记录id
+     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param jcmc 稽查名称
+     * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
+     * @param jcnr 稽查内容
+     * @param qmr 签名人
+     * @param remark 备注
      */
-    public  void saveJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc);
+    public  MjyFfjlJcgj getJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
 }

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

@@ -1,10 +1,17 @@
 package com.hxhq.business.service.impl;
 
 import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.utils.JctUtil;
+import com.hxhq.business.utils.MjyJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
+import com.hxhq.system.api.domain.SysUser;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.MjyFfjlJcgjMapper;
 import com.hxhq.business.domain.MjyFfjlJcgj;
@@ -51,20 +58,56 @@ public class MjyFfjlJcgjServiceImpl extends ServiceImpl
      * @param jcmc 稽查名称
      * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
      * @param jcnr 稽查内容
-     * @param jcrId 稽查人id
-     * @param jcrMc 稽查人名称
+     * @param qmr 签名人
+     * @param remark 备注
      */
     @Override
-    public  void saveJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){
+    public  void saveJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr,SysUser qmr,String remark){
         MjyFfjlJcgj mjyFfjlJcgj = new MjyFfjlJcgj();
         mjyFfjlJcgj.setFfjlId(ffjlId);
         mjyFfjlJcgj.setJcgjlx(jcgjlx);
         mjyFfjlJcgj.setJcmc(jcmc);
+        mjyFfjlJcgj.setJcmcEn(MjyJcnrUtil.getQmyyEn(jcmc));
         mjyFfjlJcgj.setJcmcys(jcmcys);
-        mjyFfjlJcgj.setJcnr(jcnr);
-        mjyFfjlJcgj.setQmrId(jcrId);
-        mjyFfjlJcgj.setQmrMc(jcrMc);
+        if(jcnr!=null){
+            mjyFfjlJcgj.setJcnr(JctUtil.formatStr(jcnr));
+            mjyFfjlJcgj.setJcnrEn(MjyJcnrUtil.getJcnrEn(jcnr));
+        }
+        mjyFfjlJcgj.setQmrId(qmr.getUserId());
+        mjyFfjlJcgj.setQmrMc(qmr.getNickName());
+        mjyFfjlJcgj.setQmrMcEn(qmr.getUserName());
+        mjyFfjlJcgj.setRemark(remark);
         this.save(mjyFfjlJcgj);
     }
 
+    /**
+     * 新增稽查轨迹
+     * @param ffjlId 发放记录id
+     * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
+     * @param jcmc 稽查名称
+     * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
+     * @param jcnr 稽查内容
+     * @param qmr 签名人
+     * @param remark 备注
+     */
+    @Override
+    public  MjyFfjlJcgj getJcgj(Long  ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr,SysUser qmr,String remark){
+        MjyFfjlJcgj mjyFfjlJcgj = new MjyFfjlJcgj();
+        mjyFfjlJcgj.setFfjlId(ffjlId);
+        mjyFfjlJcgj.setJcgjlx(jcgjlx);
+        mjyFfjlJcgj.setJcmc(jcmc);
+        mjyFfjlJcgj.setJcmcEn(MjyJcnrUtil.getQmyyEn(jcmc));
+        mjyFfjlJcgj.setJcmcys(jcmcys);
+        if(jcnr!=null){
+            mjyFfjlJcgj.setJcnr(JctUtil.formatStr(jcnr));
+            mjyFfjlJcgj.setJcnrEn(MjyJcnrUtil.getJcnrEn(jcnr));
+        }
+        mjyFfjlJcgj.setQmrId(qmr.getUserId());
+        mjyFfjlJcgj.setQmrMc(qmr.getNickName());
+        mjyFfjlJcgj.setQmrMcEn(qmr.getUserName());
+        mjyFfjlJcgj.setRemark(remark);
+        return mjyFfjlJcgj;
+    }
+
+
 }

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

@@ -119,11 +119,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
             throw new ServiceException("发放记录【" + mjyFfjlOld.getMc() + "】不是未锁定状态，不能加签");
         }
         //稽查轨迹
-        Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("备注", form.getRemark());
-        formData.put("签名意义", "补充说明");
-        formData.put("签名人", SecurityUtils.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
     }
 
     /**
@@ -158,10 +154,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         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("签名人", SecurityUtils.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
     }
 
     /**
@@ -202,12 +195,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJlzt(JlztEnum.djd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("备注", form.getRemark());
-        formData.put("签名意义", "申请解档");
-        formData.put("签名人", SecurityUtils.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
-
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
     }
 
     /**
@@ -236,25 +224,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
             for (MjyFfjl mjyFfjl : mjyFfjlList) {
                 //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
                 mjyFfjl.setJlzt(JlztEnum.dgd.getValue());
-
-                //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("签名人", SecurityUtils.getNickName());
-                mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
-                mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
-                mjyFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
-                mjyFfjlJcgjList.add(mjyFfjlJcgj);
-                //endregion
-
+                // 稽查轨迹
+                mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()));
             }
-            this.saveOrUpdateBatch(mjyFfjlList);
+            this.updateBatchById(mjyFfjlList);
             mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
         }
     }
@@ -283,11 +256,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJlzt(JlztEnum.dgd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("备注", form.getRemark());
-        formData.put("签名意义", "申请归档");
-        formData.put("签名人", SecurityUtils.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
 
     }
 
@@ -316,26 +285,10 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         for (MjyFfjl mjyFfjl : mjyFfjlList) {
             //锁定
             mjyFfjl.setJlzt(JlztEnum.ysd.getValue());
-
-            //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("签名人", SecurityUtils.getNickName());
-
-            mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
-            mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
-            mjyFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
-            mjyFfjlJcgjList.add(mjyFfjlJcgj);
-            //endregion
-
-        }
-        this.saveOrUpdateBatch(mjyFfjlList);
+            // 稽查轨迹
+            mjyFfjlJcgjList.add(mjyFfjlJcgjService.getJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()));
+        }
+        this.updateBatchById(mjyFfjlList);
         mjyFfjlJcgjService.saveBatch(mjyFfjlJcgjList);
 
     }
@@ -363,11 +316,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJlzt(JlztEnum.ysd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("备注", form.getRemark());
-        formData.put("签名意义", "锁定发放记录");
-        formData.put("签名人", SecurityUtils.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
 
     }
 
@@ -396,11 +345,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjlOld.setJlzt(JlztEnum.wsd.getValue());
         this.updateById(mjyFfjlOld);
         //稽查轨迹
-        Map<String, String> formData = new LinkedHashMap<>();
-        formData.put("备注", form.getRemark());
-        formData.put("签名意义", "解锁发放记录");
-        formData.put("签名人", SecurityUtils.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
 
     }
 
@@ -429,13 +374,17 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjl.setSyldw(mjy.getKcdw());
         mjyFfjl.setGhr1Id(ghr1.getUserId());
         mjyFfjl.setGhr1Mc(ghr1.getNickName());
+        mjyFfjl.setGhr1McEn(ghr1.getUserName());
         mjyFfjl.setGhrq(new Date());
         mjyFfjl.setGhr2Id(ghr2.getUserId());
         mjyFfjl.setGhr2Mc(ghr2.getNickName());
+        mjyFfjl.setGhr2McEn(ghr2.getUserName());
         mjyFfjl.setJsr1Id(jsr1.getUserId());
         mjyFfjl.setJsr1Mc(jsr1.getNickName());
+        mjyFfjl.setJsr1McEn(jsr1.getUserName());
         mjyFfjl.setJsr2Id(jsr2.getUserId());
         mjyFfjl.setJsr2Mc(jsr2.getNickName());
+        mjyFfjl.setJsr2McEn(jsr2.getUserName());
         mjyFfjl.setGhbz(form.getRemark());
         this.updateById(mjyFfjl);
         //endregion
@@ -444,7 +393,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         studyMjyService.returnBatch(mjy.getId());
         //endregion
 
-        //region 稽查轨迹
+        //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("入库位置", form.getRkwz());
         formData.put("入库条件", form.getRktj());
@@ -456,10 +405,8 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
-        formData.put("备注", form.getRemark());
-        formData.put("签名意义", "归还");
-        mjyFfjlJcgjService.saveJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
-        //endregion
+        mjyFfjlJcgjService.saveJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+
     }
 
 
@@ -469,9 +416,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void ff(FfForm form,Mjy mjy, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
-
         //region 新增发放记录
-//        form.getCkmz(),,,,,
         MjyFfjl mjyFfjl = new MjyFfjl();
         mjyFfjl.setMjyId(mjy.getId());
         mjyFfjl.setMc(mjy.getMc());
@@ -494,17 +439,19 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         mjyFfjl.setLqr2Mc(lqr2.getNickName());
         mjyFfjl.setFfr1Mc(ffr1.getNickName());
         mjyFfjl.setFfr2Mc(ffr2.getNickName());
+        mjyFfjl.setLqr1McEn(lqr1.getUserName());
+        mjyFfjl.setLqr2McEn(lqr2.getUserName());
+        mjyFfjl.setFfr1McEn(ffr1.getUserName());
+        mjyFfjl.setFfr2McEn(ffr2.getUserName());
         mjyFfjl.setFfzytj(form.getZytj());
         mjyFfjl.setFfrq(time);
         mjyFfjl.setFfbz(form.getRemark());
         mjyFfjl.setMdIds(form.getMdIds());
         mjyFfjl.setMdOther(form.getMdOther());
-        this.save(mjyFfjl);
-        //endregion
 
-        //region 新增试验物资
+        // 新增试验物资
+        List<StudyMjy> studyMjies=new ArrayList<>();
         if(StringUtils.isNoneBlank(form.getMdIds())){
-            List<StudyMjy> studyMjies=new ArrayList<>();
             String [] tmp=form.getMdIds().split(",");
             for(String s :tmp){
                 StudyMjy studyMjy=new StudyMjy();
@@ -512,22 +459,20 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
                 studyMjy.setResourceId(mjy.getId());
                 studyMjies.add(studyMjy);
             }
-            if(studyMjies.size()>0){
-                studyMjyService.insertBatch(studyMjies);
-            }
         }
-        //endregion
 
-        //region 稽查轨迹
+        //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", mjy.getKc() + mjy.getKcdw());
         formData.put("转移条件", form.getZytj());
         formData.put("出库毛重", form.getCkmz() + mjy.getKcdw());
         formData.put("目的", form.getMdMcs());
-        formData.put("备注", form.getRemark());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
-                SecurityUtils.getUserId(), SecurityUtils.getNickName());
-        //endregion
+
+        this.save(mjyFfjl);
+        mjyFfjlJcgjService.saveJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
+        if(studyMjies.size()>0){
+            studyMjyService.insertBatch(studyMjies);
+        }
     }
 
 

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.MjyJcgj;
+import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.MjyJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
@@ -68,7 +69,7 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
         mjyJcgj.setJcmcEn(MjyJcnrUtil.getQmyyEn(jcmc));
         mjyJcgj.setJcmcys(jcmcys);
         if(jcnr!=null){
-            mjyJcgj.setJcnr(JSONObject.toJSONString(jcnr));
+            mjyJcgj.setJcnr(JctUtil.formatStr(jcnr));
             mjyJcgj.setJcnrEn(MjyJcnrUtil.getJcnrEn(jcnr));
         }
         mjyJcgj.setQmrId(qmr.getUserId());
@@ -97,7 +98,7 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl
         mjyJcgj.setJcmcEn(MjyJcnrUtil.getQmyyEn(jcmc));
         mjyJcgj.setJcmcys(jcmcys);
         if(jcnr!=null){
-            mjyJcgj.setJcnr(JSONObject.toJSONString(jcnr));
+            mjyJcgj.setJcnr(JctUtil.formatStr(jcnr));
             mjyJcgj.setJcnrEn(MjyJcnrUtil.getJcnrEn(jcnr));
         }
         mjyJcgj.setQmrId(qmr.getUserId());

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

@@ -5,6 +5,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -17,57 +18,70 @@ public class MjyJcnrUtil {
     static {
         //region 稽查内容
 
-        mapJcnr.put("借阅开始时间","借阅开始时间");
-        mapJcnr.put("借阅结束时间","借阅结束时间");
-        mapJcnr.put("处置方式","处置方式");
-        mapJcnr.put("处置原因","处置原因");
-        mapJcnr.put("处置量","处置量");
-        mapJcnr.put("处置人","处置人");
-        mapJcnr.put("复核人","复核人");
-        mapJcnr.put("监督人","监督人");
-        mapJcnr.put("钥匙1领取人","钥匙1领取人");
-        mapJcnr.put("钥匙2领取人","钥匙2领取人");
-        mapJcnr.put("发放人","发放人");
-        mapJcnr.put("出库量","出库量");
-        mapJcnr.put("转移条件","转移条件");
-        mapJcnr.put("出库毛重","出库毛重");
-        mapJcnr.put("目的","目的");
-        mapJcnr.put("申请备注","申请备注");
-        mapJcnr.put("审核备注","审核备注");
-        mapJcnr.put("入库位置","入库位置");
-        mapJcnr.put("入库条件","入库条件");
-        mapJcnr.put("减少量","减少量");
-        mapJcnr.put("入库毛重","入库毛重");
-        mapJcnr.put("使用量","使用量");
-        mapJcnr.put("归还人1","归还人1");
-        mapJcnr.put("归还人2","归还人2");
-        mapJcnr.put("库管员1","库管员1");
-        mapJcnr.put("库管员2","库管员2");
+        mapJcnr.put("借阅开始时间","todo借阅开始时间");
+        mapJcnr.put("借阅结束时间","todo借阅结束时间");
+        mapJcnr.put("处置方式","todo处置方式");
+        mapJcnr.put("处置原因","todo处置原因");
+        mapJcnr.put("处置量","todo处置量");
+        mapJcnr.put("处置人","todo处置人");
+        mapJcnr.put("复核人","todo复核人");
+        mapJcnr.put("监督人","todo监督人");
+        mapJcnr.put("钥匙1领取人","todo钥匙1领取人");
+        mapJcnr.put("钥匙2领取人","todo钥匙2领取人");
+        mapJcnr.put("发放人","todo发放人");
+        mapJcnr.put("出库量","todo出库量");
+        mapJcnr.put("转移条件","todo转移条件");
+        mapJcnr.put("出库毛重","todo出库毛重");
+        mapJcnr.put("目的","todo目的");
+        mapJcnr.put("申请备注","todo申请备注");
+        mapJcnr.put("审核备注","todo审核备注");
+        mapJcnr.put("入库位置","todo入库位置");
+        mapJcnr.put("入库条件","todo入库条件");
+        mapJcnr.put("减少量","todo减少量");
+        mapJcnr.put("入库毛重","todo入库毛重");
+        mapJcnr.put("使用量","todo使用量");
+        mapJcnr.put("归还人1","todo归还人1");
+        mapJcnr.put("归还人2","todo归还人2");
+        mapJcnr.put("库管员1","todo库管员1");
+        mapJcnr.put("库管员2","todo库管员2");
 
         //endregion
 
         //region 稽查名称
 
-        mapQmyy.put("申请解档","申请解档");
-        mapQmyy.put("申请归档","申请归档");
-        mapQmyy.put("锁定麻精药","锁定麻精药");
-        mapQmyy.put("解锁麻精药","解锁麻精药");
-        mapQmyy.put("处置药剂","处置药剂");
-        mapQmyy.put("处置容器","处置容器");
-        mapQmyy.put("钥匙发放","钥匙发放");
-        mapQmyy.put("申请编辑","申请编辑");
-        mapQmyy.put("同意编辑","同意编辑");
-        mapQmyy.put("拒绝编辑","拒绝编辑");
-        mapQmyy.put("修改库存申请","修改库存申请");
-        mapQmyy.put("同意修改库存","同意修改库存");
-        mapQmyy.put("拒绝修改库存","拒绝修改库存");
-        mapQmyy.put("归还","归还");
+        mapQmyy.put("申请解档","todo申请解档");
+        mapQmyy.put("申请借阅","todo申请借阅");
+        mapQmyy.put("申请归档","todo申请归档");
+        mapQmyy.put("锁定麻精药","todo锁定麻精药");
+        mapQmyy.put("解锁麻精药","todo解锁麻精药");
+        mapQmyy.put("处置药剂","todo处置药剂");
+        mapQmyy.put("处置容器","todo处置容器");
+        mapQmyy.put("钥匙发放","todo钥匙发放");
+        mapQmyy.put("申请编辑","todo申请编辑");
+        mapQmyy.put("同意编辑","todo同意编辑");
+        mapQmyy.put("拒绝编辑","todo拒绝编辑");
+        mapQmyy.put("修改库存申请","todo修改库存申请");
+        mapQmyy.put("同意修改库存","todo同意修改库存");
+        mapQmyy.put("拒绝修改库存","todo拒绝修改库存");
+        mapQmyy.put("归还","todo归还");
+        mapQmyy.put("锁定发放记录","todo锁定发放记录");
+        mapQmyy.put("解锁发放记录","todo解锁发放记录");
+        mapQmyy.put("领取发放","todo领取发放");
+
 
 
         //endregion
 
     }
 
+
+
+    public static void main(String[] args) {
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("申请备注", "1111");
+        formData.put("审核备注", "22");
+        logger.info(getJcnrEn(formData));
+    }
     /**
      * 获取签名意义英文
      * @param qmyy
@@ -87,7 +101,7 @@ public class MjyJcnrUtil {
         for (Map.Entry<String, String> entry : map.entrySet()) {
             result.put(mapJcnr.get(entry.getKey()),entry.getValue());
         }
-        return JSONObject.toJSONString(result);
+        return JctUtil.formatStr(result);
     }
 
 }