fix:[暂存柜]台账

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

@@ -57,6 +57,16 @@ public class ZcgTz extends MpBaseEntity
     /** 签名意义 */
     private String qmyy;
 
+    /** 签名意义-英文 */
+    private String qmyyEn;
+
+    public String getQmyyEn() {
+        return qmyyEn;
+    }
+
+    public void setQmyyEn(String qmyyEn) {
+        this.qmyyEn = qmyyEn;
+    }
 
     public void setZcgId(Long zcgId)
     {

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

@@ -1,17 +1,20 @@
 package com.hxhq.business.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.ZcgTz;
+import com.hxhq.business.dto.study.StudyFormFillResource;
 import com.hxhq.business.enums.zykgl.zcgJyztEnum;
 import com.hxhq.business.form.zcg.ZcgYsffForm;
 import com.hxhq.business.form.zcg.ZcgYsghForm;
 import com.hxhq.business.form.zcg.ZcgSearchForm;
+import com.hxhq.business.service.ISystemLogService;
 import com.hxhq.business.service.IZcgTzService;
+import com.hxhq.business.utils.JctUtil;
+import com.hxhq.business.utils.lang.ZcgJcnrUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.security.utils.SecurityUtils;
@@ -37,6 +40,9 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
     private ISysUserService sysUserService;
     @Autowired
     private IZcgTzService zcgTzService;
+    @Autowired
+    private ISystemLogService systemLogService;
+
 
     /**
      * 查询暂存柜列表
@@ -86,6 +92,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
     @Transactional(rollbackFor = Exception.class)
     public void ysgh(ZcgYsghForm form) {
         SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id());
+        SysUser jsr = SecurityUtils.getLoginUser().getSysUser();
         if (ghr1 == null) {
             throw new SecurityException("归还人1不存在");
         }
@@ -94,7 +101,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
             throw new SecurityException("归还人2不存在");
         }
         //验证接收人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm(),true);
+        checkPassword(jsr,form.getJsrmm(),true);
         //验证钥匙1归还人密码
         checkPassword(ghr1,form.getGhr1mm(),true);
         //验证钥匙2归还人密码
@@ -110,6 +117,27 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
         if (!zcgOld.getZt().equals(zcgJyztEnum.jyz.getValue())) {
             throw new SecurityException("暂存柜未借用");
         }
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("接收人", jsr.getNickName());
+        formData.put("钥匙1归还人", ghr1.getNickName());
+        formData.put("钥匙2归还人", ghr2.getNickName());
+        formData.put("关联药剂", zcgOld.getGlyj());
+        systemLogService.saveInfo(zcgOld.getMc(), zcgOld.getMc(), "钥匙归还", ZcgJcnrUtil.getEn("钥匙归还"),
+                JctUtil.formatStr(formData), ZcgJcnrUtil.getJcnrEn(formData), jsr.getUserId(), jsr.getNickName(), jsr.getUserName(), null);
+        //存台账
+        ZcgTz zcgTz = new ZcgTz();
+        zcgTz.setZcgId(zcgOld.getId());
+        zcgTz.setGhr1Id(ghr1.getUserId());
+        zcgTz.setGhr1Mc(ghr1.getNickName());
+        zcgTz.setGhr2Id(ghr2.getUserId());
+        zcgTz.setGhr2Mc(ghr2.getNickName());
+        zcgTz.setJsrId(jsr.getUserId());
+        zcgTz.setJsrMc(jsr.getNickName());
+        zcgTz.setCreateTime(new Date());
+        zcgTz.setQmyy("钥匙归还");
+        zcgTz.setQmyyEn(ZcgJcnrUtil.getEn("钥匙归还"));
+        zcgTzService.save(zcgTz);
+        //更新
         zcgOld.setLqr1Id(null);
         zcgOld.setLqr1Mc(null);
         zcgOld.setLqr1McEn(null);
@@ -131,6 +159,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
     @Transactional(rollbackFor = Exception.class)
     public void ysghBatch(ZcgYsghForm form) {
         SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id());
+        SysUser jsr = SecurityUtils.getLoginUser().getSysUser();
         if (ghr1 == null) {
             throw new SecurityException("归还人1不存在");
         }
@@ -139,7 +168,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
             throw new SecurityException("归还人2不存在");
         }
         //验证接收人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm(),true);
+        checkPassword(jsr,form.getJsrmm(),true);
         //验证钥匙1归还人密码
         checkPassword(ghr1,form.getGhr1mm(),true);
         //验证钥匙2归还人密码
@@ -150,6 +179,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
         QueryWrapper<Zcg> queryWrapper = Wrappers.query();
         queryWrapper.in("id", form.getIds());
         List<Zcg> zcgList = this.list(queryWrapper);
+        List<ZcgTz> zcgTzList = new ArrayList<>();
         if (zcgList.size() > 0) {
             for (Zcg zcg : zcgList) {
                 if (!zcg.getZt().equals(zcgJyztEnum.jyz.getValue())) {
@@ -157,6 +187,28 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
                 }
             }
             for (Zcg zcg : zcgList) {
+                Map<String, String> formData = new LinkedHashMap<>();
+                formData.put("接收人", jsr.getNickName());
+                formData.put("钥匙1归还人", ghr1.getNickName());
+                formData.put("钥匙2归还人", ghr2.getNickName());
+                formData.put("关联药剂", zcg.getGlyj());
+                String mc=String.join(",",zcgList.stream().map(Zcg::getMc).collect(Collectors.toList()));
+                systemLogService.saveInfo(mc, mc, "批量钥匙归还", ZcgJcnrUtil.getEn("批量钥匙归还"),
+                        JctUtil.formatStr(formData), ZcgJcnrUtil.getJcnrEn(formData), jsr.getUserId(), jsr.getNickName(), jsr.getUserName(), null);
+                //存台账
+                ZcgTz zcgTz = new ZcgTz();
+                zcgTz.setZcgId(zcg.getId());
+                zcgTz.setGhr1Id(ghr1.getUserId());
+                zcgTz.setGhr1Mc(ghr1.getNickName());
+                zcgTz.setGhr2Id(ghr2.getUserId());
+                zcgTz.setGhr2Mc(ghr2.getNickName());
+                zcgTz.setJsrId(jsr.getUserId());
+                zcgTz.setJsrMc(jsr.getNickName());
+                zcgTz.setCreateTime(new Date());
+                zcgTz.setQmyy("批量钥匙归还");
+                zcgTz.setQmyyEn(ZcgJcnrUtil.getEn("批量钥匙归还"));
+                zcgTzList.add(zcgTz);
+                //更新
                 zcg.setLqr1Id(null);
                 zcg.setLqr1Mc(null);
                 zcg.setLqr1McEn(null);
@@ -167,6 +219,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
                 zcg.setZt(zcgJyztEnum.wjy.getValue());
             }
             this.updateBatchById(zcgList);
+            zcgTzService.saveBatch(zcgTzList);
         }
 
     }
@@ -179,6 +232,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void ysff(ZcgYsffForm form) {
+        SysUser ffr = SecurityUtils.getLoginUser().getSysUser();
         //获取领取人信息
         SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
         if (lqr1 == null) {
@@ -189,7 +243,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
             throw new SecurityException("领取人2不存在");
         }
         //验证发放人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getFfrmm(),true);
+        checkPassword(ffr,form.getFfrmm(),true);
         //验证钥匙1领取人密码
         checkPassword(lqr1,form.getLqr1mm(),true);
         //验证钥匙2领取人密码
@@ -217,6 +271,26 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS
         }
         zcgOld.setZt(zcgJyztEnum.jyz.getValue());
         this.updateById(zcgOld);
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("发放人", ffr.getNickName());
+        formData.put("钥匙1领取人", lqr1.getNickName());
+        formData.put("钥匙2领取人", lqr2.getNickName());
+        formData.put("关联药剂", zcgOld.getGlyj());
+        systemLogService.saveInfo(zcgOld.getMc(), zcgOld.getMc(), "钥匙发放", ZcgJcnrUtil.getEn("钥匙发放"),
+                JctUtil.formatStr(formData), ZcgJcnrUtil.getJcnrEn(formData), ffr.getUserId(), ffr.getNickName(), ffr.getUserName(), null);
+        //存台账
+        ZcgTz zcgTz = new ZcgTz();
+        zcgTz.setZcgId(zcgOld.getId());
+        zcgTz.setLqr1Id(lqr1.getUserId());
+        zcgTz.setLqr1Mc(lqr1.getNickName());
+        zcgTz.setLqr2Id(lqr2.getUserId());
+        zcgTz.setLqr2Mc(lqr2.getNickName());
+        zcgTz.setFfrId(ffr.getUserId());
+        zcgTz.setFfrMc(ffr.getNickName());
+        zcgTz.setCreateTime(new Date());
+        zcgTz.setQmyy("钥匙发放");
+        zcgTz.setQmyyEn(ZcgJcnrUtil.getEn("钥匙发放"));
+        zcgTzService.save(zcgTz);
     }
 
 

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

@@ -0,0 +1,73 @@
+package com.hxhq.business.utils.lang;
+
+import com.hxhq.business.utils.JctUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author tanfei
+ */
+public class ZcgJcnrUtil {
+    private static final Logger logger = LoggerFactory.getLogger(ZcgJcnrUtil.class.getName());
+    private static HashMap<String,String> mapLang=new HashMap<>();
+    static {
+        mapLang.put("关联药剂","Contained Substance");
+        mapLang.put("钥匙发放","Issue Key");
+        mapLang.put("钥匙归还","Return Key");
+        mapLang.put("批量钥匙归还","Batch Return");
+        mapLang.put("接收人","Recipient");
+        mapLang.put("发放人","Issuer");
+        mapLang.put("钥匙1归还人","Key 1 Returner");
+        mapLang.put("钥匙2归还人","Key 2 Returner");
+        mapLang.put("钥匙1领取人","Key 1 Recipient");
+        mapLang.put("钥匙2领取人","Key 2 Recipient");
+
+    }
+
+    public static void main(String[] args) {
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("申请备注", "1111");
+        formData.put("审核备注", "22");
+        logger.info(getJcnrEn(formData));
+    }
+    /**
+     * 获取英文
+     * @param name
+     * @return
+     */
+    public static String getEn(String name) {
+        return   mapLang.get(name);
+    }
+
+
+    /**
+     * 稽查名称英文
+     * @param map
+     * @return
+     */
+    public static String getJcnrEn(Map<String, String> map) {
+        Map<String, String> result =new LinkedHashMap<>();
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            result.put(mapLang.get(entry.getKey()),entry.getValue());
+        }
+        return JctUtil.formatStr(result);
+    }
+
+    /**
+     * 稽查名称英文
+     * @param map
+     * @return
+     */
+    public static Map<String, String> getMapEn(Map<String, String> map) {
+        Map<String, String> result =new LinkedHashMap<>();
+        for (Map.Entry<String, String> entry : map.entrySet()) {
+            result.put(mapLang.get(entry.getKey()),entry.getValue());
+        }
+        return result;
+    }
+
+}