diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjlJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjlJcgj.java index 5597f86..2b47aca 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjlJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjlJcgj.java @@ -24,18 +24,51 @@ public class MjyFfjlJcgj extends MpBaseEntity /** 稽查名称 */ private String jcmc; + /** 稽查名称-英文 */ + private String jcmcEn; + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ private Integer jcmcys; /** 稽查内容 */ private String jcnr; + /** 稽查内容-英文 */ + private String jcnrEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getJcmcEn() { + return jcmcEn; + } + + public void setJcmcEn(String jcmcEn) { + this.jcmcEn = jcmcEn; + } + + public String getJcnrEn() { + return jcnrEn; + } + + public void setJcnrEn(String jcnrEn) { + this.jcnrEn = jcnrEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } + public Long getFfjlId() { return ffjlId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java index fa7a476..01f0bed 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyJcgj.java @@ -24,18 +24,51 @@ public class MjyJcgj extends MpBaseEntity /** 稽查名称 */ private String jcmc; + /** 稽查名称-英文 */ + private String jcmcEn; + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ private Integer jcmcys; /** 稽查内容 */ private String jcnr; + /** 稽查内容-英文 */ + private String jcnrEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getJcmcEn() { + return jcmcEn; + } + + public void setJcmcEn(String jcmcEn) { + this.jcmcEn = jcmcEn; + } + + public String getJcnrEn() { + return jcnrEn; + } + + public void setJcnrEn(String jcnrEn) { + this.jcnrEn = jcnrEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } + public Long getMjyId() { return mjyId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java index 07631f5..46dea03 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java @@ -30,21 +30,87 @@ public class MjyTz extends MpBaseEntity /** 接收人名称 */ private String jsrMc; + /** 领取人名称-英文 */ + private String lqrMcEn; + + /** 归还人名称-英文 */ + private String ghrMcEn; + + /** 发放人名称-英文 */ + private String ffrMcEn; + + /** 接收人名称-英文 */ + private String jsrMcEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + /** 签名意义 */ private String qmyy; + /** 签名意义英文 */ + private String qmyyEn; + /** 操作量 */ private String czl; /** 操作量单位 */ private String czldw; + public String getLqrMcEn() { + return lqrMcEn; + } + + public void setLqrMcEn(String lqrMcEn) { + this.lqrMcEn = lqrMcEn; + } + + public String getGhrMcEn() { + return ghrMcEn; + } + + public void setGhrMcEn(String ghrMcEn) { + this.ghrMcEn = ghrMcEn; + } + + public String getFfrMcEn() { + return ffrMcEn; + } + + public void setFfrMcEn(String ffrMcEn) { + this.ffrMcEn = ffrMcEn; + } + + public String getJsrMcEn() { + return jsrMcEn; + } + + public void setJsrMcEn(String jsrMcEn) { + this.jsrMcEn = jsrMcEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } + + public String getQmyyEn() { + return qmyyEn; + } + + public void setQmyyEn(String qmyyEn) { + this.qmyyEn = qmyyEn; + } + public Long getMjyId() { return mjyId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShbjEnum.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShbjEnum.java index 2b392c0..97f5c2c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShbjEnum.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/zykgl/ShbjEnum.java @@ -14,9 +14,7 @@ public enum ShbjEnum { /** * 同意编辑 */ - ty(10, "同意编辑"), - - ; + ty(10, "同意编辑"); private int value; private String text; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/ZcgMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/ZcgMapper.java index e2fc155..669bdb8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/ZcgMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/ZcgMapper.java @@ -1,6 +1,7 @@ package com.hxhq.business.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.hxhq.business.domain.StudyMjy; import com.hxhq.business.domain.Zcg; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -30,4 +31,5 @@ public interface ZcgMapper extends BaseMapper * @return */ Zcg queryInfo(@Param("id") Long id); + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java index 2fe394a..9d21488 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java @@ -1,10 +1,12 @@ package com.hxhq.business.service; import java.util.List; +import java.util.Map; import com.hxhq.business.domain.GyzjJcgj; import com.hxhq.business.domain.MjyJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 麻精药-稽查轨迹Service接口 @@ -28,9 +30,33 @@ public interface IMjyJcgjService 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 mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public void saveJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + + /** + * 新增稽查轨迹 + * @param mjyId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + */ + public MjyJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + /** + * 新增稽查轨迹 + * @param mjyId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + public MjyJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java index 3b610c6..b7d7fa6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java @@ -5,6 +5,7 @@ import java.util.List; import com.hxhq.business.domain.MjyJcgj; import com.hxhq.business.domain.MjyTz; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 麻精药-台账Service接口 @@ -25,16 +26,35 @@ public interface IMjyTzService extends IService /** * 新增台账 * @param mjyId 麻精药id - * @param lqrMc 领取人名称 - * @param ghrMc 归还人名称 - * @param ffrMc 发放人名称 - * @param jsrMc 接收人名称 - * @param qmrId 签名人id - * @param qmrMc 签名人名称 + * @param lqr1 领取人1 + * @param lqr2 领取人2 + * @param ghr1 归还人1 + * @param ghr2 归还人2 + * @param ffr1 发放人1 + * @param ffr2 发放人2 + * @param qmr 签名人 * @param qmyy 签名意义 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 */ - public void saveTz(Long mjyId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark); + public void saveTz(Long mjyId, SysUser lqr1,SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1,SysUser ffr2, SysUser jsr1,SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark); + + + /** + * 新增台账 + * @param mjyId 麻精药id + * @param lqr1 领取人1 + * @param lqr2 领取人2 + * @param ghr1 归还人1 + * @param ghr2 归还人2 + * @param ffr1 发放人1 + * @param ffr2 发放人2 + * @param qmr 签名人 + * @param qmyy 签名意义 + * @param czl 操作量 + * @param czldw 操作量单位 + * @param remark 备注 + */ + public MjyTz getTz(Long mjyId, SysUser lqr1,SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1,SysUser ffr2, SysUser jsr1,SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java index c36a22b..e86b62c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyJcgjServiceImpl.java @@ -1,15 +1,18 @@ 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.GyzjJcgj; import com.hxhq.business.domain.MjyJcgj; +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.MjyJcgjMapper; -import com.hxhq.business.domain.MjyJcgj; import com.hxhq.business.service.IMjyJcgjService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -53,20 +56,83 @@ public class MjyJcgjServiceImpl extends ServiceImpl impl * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 + * @param remark 备注 */ @Override - public void saveJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){ + public void saveJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ MjyJcgj mjyJcgj = new MjyJcgj(); mjyJcgj.setMjyId(mjyId); mjyJcgj.setJcgjlx(jcgjlx); mjyJcgj.setJcmc(jcmc); + mjyJcgj.setJcmcEn(MjyJcnrUtil.getQmyyEn(jcmc)); mjyJcgj.setJcmcys(jcmcys); - mjyJcgj.setJcnr(jcnr); - mjyJcgj.setQmrId(jcrId); - mjyJcgj.setQmrMc(jcrMc); + if(jcnr!=null){ + mjyJcgj.setJcnr(JSONObject.toJSONString(jcnr)); + mjyJcgj.setJcnrEn(MjyJcnrUtil.getJcnrEn(jcnr)); + } + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrMcEn(qmr.getUserName()); + mjyJcgj.setRemark(remark); this.save(mjyJcgj); } + /** + * 新增稽查轨迹 + * @param mjyId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public MjyJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ + MjyJcgj mjyJcgj = new MjyJcgj(); + mjyJcgj.setMjyId(mjyId); + mjyJcgj.setJcgjlx(jcgjlx); + mjyJcgj.setJcmc(jcmc); + mjyJcgj.setJcmcEn(MjyJcnrUtil.getQmyyEn(jcmc)); + mjyJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + mjyJcgj.setJcnr(JSONObject.toJSONString(jcnr)); + mjyJcgj.setJcnrEn(MjyJcnrUtil.getJcnrEn(jcnr)); + } + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrMcEn(qmr.getUserName()); + mjyJcgj.setRemark(remark); + return mjyJcgj; + } + + /** + * 新增稽查轨迹 + * @param mjyId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public MjyJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){ + MjyJcgj mjyJcgj = new MjyJcgj(); + mjyJcgj.setMjyId(mjyId); + mjyJcgj.setJcgjlx(jcgjlx); + mjyJcgj.setJcmc(jcmc); + mjyJcgj.setJcmcEn(MjyJcnrUtil.getQmyyEn(jcmc)); + mjyJcgj.setJcmcys(jcmcys); + mjyJcgj.setJcnr(jcnr); + mjyJcgj.setJcnrEn(jcnrEn); + mjyJcgj.setQmrId(qmr.getUserId()); + mjyJcgj.setQmrMc(qmr.getNickName()); + mjyJcgj.setQmrMcEn(qmr.getUserName()); + mjyJcgj.setRemark(remark); + return mjyJcgj; + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index ab9d5f0..d37c8dd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -15,7 +15,6 @@ import com.hxhq.business.service.*; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; import com.hxhq.common.core.exception.ServiceException; -import com.hxhq.common.core.text.Convert; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; @@ -29,7 +28,6 @@ import com.hxhq.business.mapper.MjyMapper; import com.hxhq.business.domain.Mjy; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; /** * 麻精药Service业务层处理 @@ -138,9 +136,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void jd( JdForm form) { + public void jd(JdForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -155,9 +153,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setZjzt(ZjztEnum.djd.getValue()); this.updateById(mjyOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } /** @@ -167,9 +163,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void jy( JyForm form) { + public void jy(JyForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -192,8 +188,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); - formData.put("备注", form.getRemark()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //稽查轨迹 + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } /** @@ -203,9 +199,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plgd( GdForm form) { + public void plgd(GdForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -222,21 +218,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS for (Mjy mjy : mjyList) { //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； mjy.setZjzt(ZjztEnum.dgd.getValue()); - - //region 稽查轨迹 - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjy.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("申请归档"); - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setRemark(form.getRemark()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjList.add(mjyJcgj); - //endregion - + //稽查轨迹 + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark())); } - this.saveOrUpdateBatch(mjyList); + this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); } } @@ -248,9 +233,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void gd( GdForm form) { + public void gd(GdForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -265,9 +250,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setZjzt(ZjztEnum.dgd.getValue()); this.updateById(mjyOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } @@ -278,9 +261,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plsd( SdForm form) { + public void plsd(SdForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -295,23 +278,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS for (Mjy mjy : mjyList) { //锁定 mjy.setZjzt(ZjztEnum.ysd.getValue()); - - //region 稽查轨迹 - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjy.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("锁定麻精药"); - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - mjyJcgj.setJcnr(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjList.add(mjyJcgj); - //endregion - + //稽查轨迹 + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark())); } - this.saveOrUpdateBatch(mjyList); + this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); } @@ -323,9 +293,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void sd( SdForm form) { + public void sd(SdForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -339,9 +309,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setZjzt(ZjztEnum.ysd.getValue()); this.updateById(mjyOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } @@ -352,9 +320,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void js( JsForm form) { + public void js(JsForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -369,9 +337,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setZjzt(ZjztEnum.rk.getValue()); this.updateById(mjyOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } /** @@ -381,16 +347,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plczyj( PlczyjForm form) { + public void plczyj(PlczyjForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr,form.getClrmm()); + checkPassword(clr, form.getClrmm()); //验证复核人密码 - checkPassword(fhr,form.getFhrmm()); + checkPassword(fhr, form.getFhrmm()); //验证监督人密码 - checkPassword(jdr,form.getJdrmm()); + checkPassword(jdr, form.getJdrmm()); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); @@ -405,32 +371,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS List mjyPlffItemFilter = form.getList().stream() .filter(p -> p.getId().equals(mjy.getId())) .collect(Collectors.toList()); + if (StringUtils.isBlank(mjyPlffItemFilter.get(0).getCzl())) { + throw new ServiceException("处置量不能为空"); + } if (mjyPlffItemFilter.size() > 0) { - //region 验证 - if (StringUtils.isBlank(mjyPlffItemFilter.get(0).getCzl())) { - throw new ServiceException("处置量不能为空"); - } - BigDecimal czl = BigDecimal.ZERO; - try { - czl = new BigDecimal(mjyPlffItemFilter.get(0).getCzl()); - } catch (Exception ex) { - throw new ServiceException("处置量填写不正确"); - } - //验证库存 BigDecimal kc = new BigDecimal(mjy.getKc()); - if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new ServiceException("麻精药【" + mjy.getMc() + "】库存不足，不能处置"); - } - if (kc.compareTo(czl) < 0) { - throw new ServiceException("麻精药【" + mjy.getMc() + "】处置量大于库存量"); - } - mjy.setKc(kc.subtract(czl).toString()); - //region 稽查轨迹 - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjy.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("处置药剂"); - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); + mjy.setKc(kc.subtract(new BigDecimal(mjyPlffItemFilter.get(0).getCzl())).toString()); + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("处置方式", mjyPlffItemFilter.get(0).getCzfs()); formData.put("处置原因", mjyPlffItemFilter.get(0).getCzyy()); @@ -438,28 +385,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("处置人", clr.getNickName()); formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - - mjyJcgj.setJcnr(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjList.add(mjyJcgj); - //endregion - //region 台账 - MjyTz mjyTz = new MjyTz(); - mjyTz.setMjyId(mjy.getId()); - mjyTz.setQmyy("处置药剂"); - mjyTz.setQmrId(clr.getUserId()); - mjyTz.setQmrMc(clr.getNickName()); - mjyTz.setCzl(mjyPlffItemFilter.get(0).getCzl()); - mjyTz.setCzldw(mjy.getKcdw()); - mjyTz.setRemark(mjyPlffItemFilter.get(0).getCzyy()); - mjyTzList.add(mjyTz); - //endregion + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), null)); + //台账 + mjyTzList.add(mjyTzService.getTz(mjy.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",mjyPlffItemFilter.get(0).getCzl(),mjy.getKcdw(),mjyPlffItemFilter.get(0).getCzyy())); } else { throw new ServiceException("麻精药【" + mjy.getMc() + "】不存在或已删除"); } } - this.saveOrUpdateBatch(mjyList); + this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); mjyTzService.saveBatch(mjyTzList); } @@ -472,18 +405,18 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void czyj( CzyjForm form) { + public void czyj(CzyjForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr,form.getClrmm()); + checkPassword(clr, form.getClrmm()); //验证复核人密码 - checkPassword(fhr,form.getFhrmm()); + checkPassword(fhr, form.getFhrmm()); //验证监督人密码 - checkPassword(jdr,form.getJdrmm()); + checkPassword(jdr, form.getJdrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -497,26 +430,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (StringUtils.isBlank(form.getCzl())) { throw new ServiceException("处置量不能为空"); } - BigDecimal czl = BigDecimal.ZERO; - try { - czl = new BigDecimal(form.getCzl()); - } catch (Exception ex) { - throw new ServiceException("处置量填写不正确"); - } - //验证库存 BigDecimal kc = new BigDecimal(mjyOld.getKc()); - if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new ServiceException("麻精药【" + mjyOld.getMc() + "】库存不足，不能处置"); - } - if (kc.compareTo(czl) < 0) { - throw new ServiceException("麻精药【" + mjyOld.getMc() + "】处置量大于库存量"); - } - //更新库存 - mjyOld.setKc(kc.subtract(czl).toString()); - - - //region 稽查轨迹 + mjyOld.setKc(kc.subtract(new BigDecimal(form.getCzl())).toString()); + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("处置方式", form.getCzfs()); formData.put("处置原因", form.getCzyy()); @@ -524,16 +441,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("处置人", clr.getNickName()); formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion - - //region 台账 - mjyTzService.saveTz(mjyOld.getId(), "", "", - "", "", clr.getUserId(), clr.getNickName(), - "处置药剂", form.getCzl(), mjyOld.getKcdw(), form.getCzyy()); - //endregion - + //台账 + mjyTzService.saveTz(mjyOld.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",form.getCzl(),mjyOld.getKcdw(),form.getCzyy()); this.updateById(mjyOld); } @@ -545,16 +456,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plczrq( PlczrqForm form) { + public void plczrq(PlczrqForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr,form.getClrmm()); + checkPassword(clr, form.getClrmm()); //验证复核人密码 - checkPassword(fhr,form.getFhrmm()); + checkPassword(fhr, form.getFhrmm()); //验证监督人密码 - checkPassword(jdr,form.getJdrmm()); + checkPassword(jdr, form.getJdrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); @@ -566,7 +477,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS List mjyList = this.list(queryWrapper); List mjyJcgjList = new ArrayList<>(); List mjyTzList = new ArrayList<>(); - if (mjyList.size() <= 0) { throw new ServiceException("麻精药已经处置过容器了，不能重复操作"); } @@ -575,44 +485,23 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS .filter(p -> p.getId().equals(mjy.getId())) .collect(Collectors.toList()); if (mjyPlffItemFilter.size() > 0) { - - //region 稽查轨迹 - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjy.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("处置容器"); - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - + //稽查轨迹 Map 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(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjList.add(mjyJcgj); - //endregion - - //region 台账 - MjyTz mjyTz = new MjyTz(); - mjyTz.setMjyId(mjy.getId()); - mjyTz.setQmyy("处置容器"); - mjyTz.setQmrId(clr.getUserId()); - mjyTz.setQmrMc(clr.getNickName()); - mjyTz.setRemark(mjyPlffItemFilter.get(0).getCzyy()); - mjyTzList.add(mjyTz); - //endregion - + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null)); + //台账 + mjyTzList.add(mjyTzService.getTz(mjy.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,mjyPlffItemFilter.get(0).getCzyy())); mjy.setRqzt(RqztEnum.ycz.getValue()); + } else { throw new ServiceException("麻精药【" + mjy.getMc() + "】不存在或已删除"); } } - - this.saveOrUpdateBatch(mjyList); + this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); mjyTzService.saveBatch(mjyTzList); } @@ -624,16 +513,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void czrq( CzrqForm form) { + public void czrq(CzrqForm form) { SysUser clr = sysUserService.selectUserById(form.getClrId()); SysUser fhr = sysUserService.selectUserById(form.getFhrId()); SysUser jdr = sysUserService.selectUserById(form.getJdrId()); //验证处理人密码 - checkPassword(clr,form.getClrmm()); + checkPassword(clr, form.getClrmm()); //验证复核人密码 - checkPassword(fhr,form.getFhrmm()); + checkPassword(fhr, form.getFhrmm()); //验证监督人密码 - checkPassword(jdr,form.getJdrmm()); + checkPassword(jdr, form.getJdrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -648,24 +537,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!mjyOld.getRqzt().equals(RqztEnum.wcz.getValue())) { throw new ServiceException("麻精药【" + mjyOld.getMc() + "】已经处置过容器了，不能重复操作"); } - //region 稽查轨迹 + mjyOld.setRqzt(RqztEnum.ycz.getValue()); + this.updateById(mjyOld); + //稽查轨迹 Map 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(), formData, SecurityUtils.getLoginUser().getSysUser(),null); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion - - //region 台账 - mjyTzService.saveTz(mjyOld.getId(), "", "", - "", "", clr.getUserId(), clr.getNickName(), - "处置容器", "", "", form.getCzyy()); - //endregion - mjyOld.setRqzt(RqztEnum.ycz.getValue()); - this.updateById(mjyOld); + //台账 + mjyTzService.saveTz(mjyOld.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,form.getCzyy()); } @@ -676,16 +560,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void ysff( YsffForm form) { + public void ysff(YsffForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = sysUserService.selectUserById(form.getFfrId()); //验证领取人1密码 - checkPassword(lqr1,form.getLqr1mm()); + checkPassword(lqr1, form.getLqr1mm()); //验证领取人2密码 - checkPassword(lqr2,form.getLqr2mm()); + checkPassword(lqr2, form.getLqr2mm()); //验证发放人密码 - checkPassword(ffr1,form.getFfrmm()); + checkPassword(ffr1, form.getFfrmm()); Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { @@ -708,25 +592,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } else { glyj += "," + mjy.getMc(); } - - //region 稽查轨迹 - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjy.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("钥匙发放"); - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - + //稽查轨迹 Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); formData.put("钥匙1领取人", lqr1.getNickName()); formData.put("钥匙2领取人", lqr2.getNickName()); formData.put("发放人", ffr1.getNickName()); - - mjyJcgj.setJcnr(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjList.add(mjyJcgj); - //endregion + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null)); } if (StringUtils.isBlank(zcg.getGlyj())) { zcg.setGlyj(glyj); @@ -739,9 +610,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS zcg.setLqr2Mc(lqr2.getNickName()); zcg.setZt(zcgJyztEnum.jyz.getValue()); zcgService.updateById(zcg); - this.saveOrUpdateBatch(mjyList); + this.updateBatchById(mjyList); mjyJcgjService.saveBatch(mjyJcgjList); - } @@ -752,19 +622,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void ff( FfForm form) { + public void ff(FfForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1,form.getLqr1mm()); + checkPassword(lqr1, form.getLqr1mm()); //验证领取人2密码 - checkPassword(lqr2,form.getLqr2mm()); + checkPassword(lqr2, form.getLqr2mm()); //验证发放人1密码 - checkPassword(ffr1,form.getFfr1mm()); + checkPassword(ffr1, form.getFfr1mm()); //验证发放人2密码 - checkPassword(ffr2,form.getFfr2mm()); + checkPassword(ffr2, form.getFfr2mm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -777,29 +647,22 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是入库状态，不能发放"); } Date now = new Date(); - - //region 发放记录，试验物资 - mjyFfjlService.ff(form,mjyOld,lqr1,lqr2,ffr1,ffr2,now); + + //region 发放记录，试验物资 todo + mjyFfjlService.ff(form, mjyOld, lqr1, lqr2, ffr1, ffr2, now); //endregion - //region 稽查轨迹 + //稽查轨迹 Map formData = new LinkedHashMap<>(); - formData.put("出库量", mjyOld.getKc()+ mjyOld.getKcdw()); + formData.put("出库量", mjyOld.getKc() + mjyOld.getKcdw()); 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(), JctUtil.formatStr(formData), - SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion - - //region 台账 - mjyTzService.saveTz(mjyOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "", - ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "", - "领取发放", mjyOld.getKc(), mjyOld.getKcdw(), form.getRemark()); - //endregion + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); + //台账 + mjyTzService.saveTz(mjyOld.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",mjyOld.getKc(),mjyOld.getKcdw(),form.getRemark()); - //region 更新发放信息 + //更新发放信息 mjyOld.setCkl(mjyOld.getKc()); mjyOld.setCkldw(mjyOld.getKcdw()); mjyOld.setFfzytj(form.getZytj()); @@ -813,12 +676,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setLqr2Mc(lqr2.getNickName()); mjyOld.setFfr1Mc(ffr1.getNickName()); mjyOld.setFfr2Mc(ffr2.getNickName()); - mjyOld.setFfr2Mc(ffr2.getNickName()); mjyOld.setFfrq(now); mjyOld.setFfbz(form.getRemark()); mjyOld.setMdIds(form.getMdIds()); mjyOld.setZjzt(ZjztEnum.yff.getValue()); - //endregion this.updateById(mjyOld); } @@ -830,19 +691,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void plff( PlffForm form) { + public void plff(PlffForm form) { SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); //验证领取人1密码 - checkPassword(lqr1,form.getLqr1mm()); + checkPassword(lqr1, form.getLqr1mm()); //验证领取人2密码 - checkPassword(lqr2,form.getLqr2mm()); + checkPassword(lqr2, form.getLqr2mm()); //验证发放人1密码 - checkPassword(ffr1,form.getFfr1mm()); + checkPassword(ffr1, form.getFfr1mm()); //验证发放人2密码 - checkPassword(ffr2,form.getFfr2mm()); + checkPassword(ffr2, form.getFfr2mm()); QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); @@ -864,36 +725,18 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS .filter(p -> p.getId().equals(mjy.getId())) .collect(Collectors.toList()); if (plffItemFilter.size() > 0) { - mjyFfjlService.ff(plffItemFilter.get(0),mjy,lqr1,lqr2,ffr1,ffr2,now); - //region 稽查轨迹 - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjy.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("领取发放"); - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); + //发放 todo + mjyFfjlService.ff(plffItemFilter.get(0), mjy, lqr1, lqr2, ffr1, ffr2, now); + //稽查轨迹 Map formData = new LinkedHashMap<>(); - formData.put("出库量", mjy.getKc()+ mjy.getKcdw()); + formData.put("出库量", mjy.getKc() + mjy.getKcdw()); 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(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjList.add(mjyJcgj); - //endregion - //region 台账 - MjyTz mjyTz = new MjyTz(); - mjyTz.setMjyId(mjy.getId()); - mjyTz.setLqrMc(lqr1.getNickName() + "," + lqr2.getNickName()); - mjyTz.setFfrMc(ffr1.getNickName() + "," + ffr2.getNickName()); - mjyTz.setQmyy("领取发放"); - mjyTz.setCzl(mjy.getKc()); - mjyTz.setCzldw(mjy.getKcdw()); - mjyTz.setRemark(plffItemFilter.get(0).getRemark()); - mjyTzList.add(mjyTz); - //endregion - //region 更新发放信息 + mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),plffItemFilter.get(0).getRemark())); + //台账 + mjyTzList.add(mjyTzService.getTz(mjy.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",mjy.getKc(),mjy.getKcdw(),plffItemFilter.get(0).getRemark())); + //更新发放信息 mjy.setCkl(mjy.getKc()); mjy.setCkldw(mjy.getKcdw()); mjy.setFfzytj(plffItemFilter.get(0).getZytj()); @@ -907,19 +750,17 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjy.setLqr2Mc(lqr2.getNickName()); mjy.setFfr1Mc(ffr1.getNickName()); mjy.setFfr2Mc(ffr2.getNickName()); - mjy.setFfr2Mc(ffr2.getNickName()); mjy.setFfrq(now); mjy.setFfbz(plffItemFilter.get(0).getRemark()); mjy.setMdIds(plffItemFilter.get(0).getMdIds()); mjy.setZjzt(ZjztEnum.yff.getValue()); - //endregion } else { throw new ServiceException("麻精药【" + mjy.getMc() + "】不存在或已删除"); } } mjyJcgjService.saveBatch(mjyJcgjList); mjyTzService.saveBatch(mjyTzList); - this.saveOrUpdateBatch(mjyList); + this.updateBatchById(mjyList); } /** @@ -929,9 +770,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void bj( BjForm form) { + public void bj(BjForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -952,15 +793,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS throw new ServiceException("你没有修改任何内容"); } for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjyOld.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("申请编辑"); - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - mjyJcgj.setJcnr(fieldChange.toString()); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjList.add(mjyJcgj); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(),null)); } mjyOld.setMcbj(form.getMc()); mjyOld.setNdbj(form.getNd()); @@ -968,7 +801,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setSxrqbj(form.getSxrq()); mjyOld.setCctjbj(form.getCctj()); mjyOld.setCcwzbj(form.getCcwz()); - mjyOld.setBjbz(form.getBjbz()); mjyOld.setBjrId(SecurityUtils.getUserId()); mjyOld.setBjrMc(SecurityUtils.getNickName()); @@ -984,9 +816,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void shbj( ShbjForm form) { + public void shbj(ShbjForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1000,26 +832,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue()) || mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能审核编辑"); } - //region 稽查轨迹 - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjyOld.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc(ShbjEnum.getEnumByValue(form.getQmyy()).getText()); - if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - } else { - mjyJcgj.setJcmcys(JcmcysEnum.red.getValue()); - } + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("申请备注", mjyOld.getBjbz()); formData.put("审核备注", form.getRemark()); - mjyJcgj.setJcnr(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjService.save(mjyJcgj); - //endregion - - //region 更新 if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { mjyOld.setCcwz(mjyOld.getCcwzbj()); mjyOld.setCctj(mjyOld.getCctjbj()); @@ -1027,8 +843,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setNddw(mjyOld.getNddwbj()); mjyOld.setNd(mjyOld.getNdbj()); mjyOld.setMc(mjyOld.getMcbj()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); + } else { + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); } - //清空编辑信息 mjyOld.setMcbj(null); mjyOld.setNddwbj(null); @@ -1041,7 +859,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setBjrMc(null); mjyOld.setBjzt(BjEnum.wbj.getValue()); this.updateById(mjyOld); - //endregion } @@ -1052,9 +869,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void xgkc( XgkcForm form) { + public void xgkc(XgkcForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1075,15 +892,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS List mjyJcgjList = new ArrayList<>(); //region 稽查轨迹 for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjyOld.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc("修改库存申请"); - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - mjyJcgj.setJcnr(fieldChange.toString()); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjList.add(mjyJcgj); + mjyJcgjList.add(mjyJcgjService.getJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(),null)); } //endregion @@ -1106,9 +915,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void shxgkc( ShxgkcForm form) { + public void shxgkc(ShxgkcForm form) { //验证签名人密码 - checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm()); + checkPassword(SecurityUtils.getLoginUser().getSysUser(), form.getQmrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -1122,45 +931,25 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!(mjyOld.getZjzt().equals(ZjztEnum.rk.getValue()) || mjyOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是入库或已发放状态，不能审核修改库存"); } - //region 稽查轨迹 - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(mjyOld.getId()); - mjyJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - mjyJcgj.setJcmc( ShXgkcEnum.getEnumByValue(form.getQmyy()).getText()); - if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { - mjyJcgj.setJcmcys(JcmcysEnum.green.getValue()); - } else { - mjyJcgj.setJcmcys(JcmcysEnum.red.getValue()); - } + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("申请备注", mjyOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); - mjyJcgj.setJcnr(JctUtil.formatStr(formData)); - mjyJcgj.setQmrId(SecurityUtils.getUserId()); - mjyJcgj.setQmrMc(SecurityUtils.getNickName()); - mjyJcgjService.save(mjyJcgj); - //endregion - - //region 更新 if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); mjyOld.setKcdw(mjyOld.getKcdwbj()); mjyOld.setKc(mjyOld.getKcbj()); + } else { + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); } + //台账 + mjyTzService.getTz(mjyOld.getId(),null,null,null,null,null,null,null,null,null,"修改库存",mjyOld.getKcbj(),mjyOld.getKcdw(),mjyOld.getKcbjbz()); + mjyOld.setKcbj(null); mjyOld.setKcdwbj(null); mjyOld.setKcbjbz(null); mjyOld.setKcbjzt(KcbjEnum.wbj.getValue()); this.updateById(mjyOld); - //endregion - - //region 台账 - if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { - mjyTzService.saveTz(mjyOld.getId(), "", "", - "", "", SecurityUtils.getUserId(), SecurityUtils.getNickName(), - "修改库存", mjyOld.getKc(), mjyOld.getKcdw(), mjyOld.getKcbjbz()); - } - //endregion - } /** @@ -1170,19 +959,19 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS */ @Override @Transactional(rollbackFor = Exception.class) - public void gh( GhForm form) { + public void gh(GhForm form) { SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); SysUser jsr1 = SecurityUtils.getLoginUser().getSysUser(); SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); //验证归还人1密码 - checkPassword(ghr1,form.getGhr1mm()); + checkPassword(ghr1, form.getGhr1mm()); //验证归还人2密码 - checkPassword(ghr2,form.getGhr2mm()); + checkPassword(ghr2, form.getGhr2mm()); //验证接收人1密码 - checkPassword(jsr1,form.getJsr1mm()); + checkPassword(jsr1, form.getJsr1mm()); //验证接收人2密码 - checkPassword(jsr2,form.getJsr2mm()); + checkPassword(jsr2, form.getJsr2mm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -1196,30 +985,23 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } BigDecimal kc = new BigDecimal(mjyOld.getKc()); BigDecimal syl = new BigDecimal(form.getSyl()); - if (syl.compareTo(kc) > 0) { - throw new ServiceException("使用量不能大于出库量"); - } BigDecimal leftKc = new BigDecimal(mjyOld.getKc()).subtract(new BigDecimal(form.getSyl())); - mjyFfjlService.gh(form,mjyOld,ghr1,ghr2,jsr1,jsr2); + mjyFfjlService.gh(form, mjyOld, ghr1, ghr2, jsr1, jsr2); //region 台账 - mjyTzService.saveTz(mjyOld.getId(), "", ghr1.getNickName() + "," + ghr2.getNickName(), - "", jsr1.getNickName() + "," + jsr2.getNickName(), null, null, - "归还", form.getRkmz(), mjyOld.getKcdw(), form.getRemark()); - //endregion + mjyTzService.getTz(mjyOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"归还",form.getRkmz(),mjyOld.getKcdw(),form.getRemark()); //region 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("入库位置", form.getRkwz()); formData.put("入库条件", form.getRktj()); formData.put("转移条件", form.getGhzytj()); - formData.put("入库毛重", form.getRkmz()+mjyOld.getKcdw()); - formData.put("减少量", form.getJsl()+mjyOld.getKcdw()); - formData.put("使用量", form.getSyl()+mjyOld.getKcdw()); + formData.put("入库毛重", form.getRkmz() + mjyOld.getKcdw()); + formData.put("减少量", form.getJsl() + mjyOld.getKcdw()); + formData.put("使用量", form.getSyl() + mjyOld.getKcdw()); formData.put("归还人1", ghr1.getNickName()); formData.put("归还人2", ghr2.getNickName()); formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); - formData.put("备注", form.getRemark()); - mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); //endregion mjyOld.setKc(leftKc.toString()); mjyOld.setZjzt(ZjztEnum.rk.getValue()); @@ -1227,17 +1009,18 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } - /** * 验证密码 + * * @param user * @param qmrmm */ - public void checkPassword(SysUser user,String qmrmm){ - if(StringUtils.isBlank(qmrmm)){ + public void checkPassword(SysUser user, String qmrmm) { + if (StringUtils.isBlank(qmrmm)) { throw new ServiceException("签名密码不能为空"); } - sysUserService.checkPassword(user,qmrmm,false); + sysUserService.checkPassword(user, qmrmm, false); } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java index 8b0e9a4..d919f03 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java @@ -1,10 +1,12 @@ package com.hxhq.business.service.impl; import java.util.List; + 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.MjyJcnrUtil; import com.hxhq.common.core.exception.ServiceException; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.MjyTzMapper; import com.hxhq.business.domain.MjyTz; @@ -18,53 +20,122 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * @date 2025-12-18 */ @Service -public class MjyTzServiceImpl extends ServiceImpl implements IMjyTzService -{ +public class MjyTzServiceImpl extends ServiceImpl implements IMjyTzService { /** * 查询台账列表 + * * @param mjyTz 麻精药 * @return */ @Override - public List queryList(MjyTz mjyTz){ + public List queryList(MjyTz mjyTz) { QueryWrapper queryWrapper = Wrappers.query(); - if(mjyTz.getMjyId()==null||mjyTz.getMjyId().longValue()<0){ + if (mjyTz.getMjyId() == null || mjyTz.getMjyId().longValue() < 0) { throw new ServiceException("麻精药id不能为空"); } - queryWrapper.eq("mjy_id",mjyTz.getMjyId()); + queryWrapper.eq("mjy_id", mjyTz.getMjyId()); queryWrapper.orderByDesc("id"); return this.list(queryWrapper); } /** * 新增台账 - * @param mjyId 麻精药id - * @param lqrMc 领取人名称 - * @param ghrMc 归还人名称 - * @param ffrMc 发放人名称 - * @param jsrMc 接收人名称 - * @param qmrId 签名人id - * @param qmrMc 签名人名称 - * @param qmyy 签名意义 - * @param czl 操作量 - * @param czldw 操作量单位 + * + * @param mjyId 麻精药id + * @param lqr1 领取人1 + * @param lqr2 领取人2 + * @param ghr1 归还人1 + * @param ghr2 归还人2 + * @param ffr1 发放人1 + * @param ffr2 发放人2 + * @param qmr 签名人 + * @param qmyy 签名意义 + * @param czl 操作量 + * @param czldw 操作量单位 * @param remark 备注 */ @Override - public void saveTz(Long mjyId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark){ + public void saveTz(Long mjyId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark) { MjyTz mjyTz = new MjyTz(); mjyTz.setMjyId(mjyId); - mjyTz.setLqrMc(lqrMc); - mjyTz.setGhrMc(ghrMc); - mjyTz.setFfrMc(ffrMc); - mjyTz.setJsrMc(jsrMc); - mjyTz.setQmrId(qmrId); - mjyTz.setQmrMc(qmrMc); + if (lqr1 != null && lqr2 != null) { + mjyTz.setLqrMc(lqr1.getNickName() + lqr2.getNickName()); + mjyTz.setLqrMcEn(lqr1.getUserName() + lqr2.getUserName()); + } + + if (ghr1 != null && ghr2 != null) { + mjyTz.setGhrMc(ghr1.getNickName() + ghr2.getNickName()); + mjyTz.setGhrMcEn(ghr1.getUserName() + ghr2.getUserName()); + } + if (ffr1 != null && ffr2 != null) { + mjyTz.setFfrMc(ffr1.getNickName() + ffr2.getNickName()); + mjyTz.setFfrMcEn(ffr1.getUserName() + ffr2.getUserName()); + } + if (jsr1 != null && jsr2 != null) { + mjyTz.setJsrMc(jsr1.getNickName() + jsr2.getNickName()); + mjyTz.setJsrMcEn(jsr1.getUserName() + jsr2.getUserName()); + } + if (qmr != null && qmr != null) { + mjyTz.setQmrId(qmr.getUserId()); + mjyTz.setQmrMc(qmr.getNickName()); + mjyTz.setQmrMcEn(qmr.getUserName()); + } mjyTz.setQmyy(qmyy); + mjyTz.setQmyyEn(MjyJcnrUtil.getQmyyEn(qmyy)); mjyTz.setCzldw(czldw); mjyTz.setCzl(czl); mjyTz.setRemark(remark); this.save(mjyTz); } + + /** + * 新增台账 + * + * @param mjyId 麻精药id + * @param lqr1 领取人1 + * @param lqr2 领取人2 + * @param ghr1 归还人1 + * @param ghr2 归还人2 + * @param ffr1 发放人1 + * @param ffr2 发放人2 + * @param qmr 签名人 + * @param qmyy 签名意义 + * @param czl 操作量 + * @param czldw 操作量单位 + * @param remark 备注 + */ + @Override + public MjyTz getTz(Long mjyId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark) { + MjyTz mjyTz = new MjyTz(); + mjyTz.setMjyId(mjyId); + if (lqr1 != null && lqr2 != null) { + mjyTz.setLqrMc(lqr1.getNickName() + lqr2.getNickName()); + mjyTz.setLqrMcEn(lqr1.getUserName() + lqr2.getUserName()); + } + + if (ghr1 != null && ghr2 != null) { + mjyTz.setGhrMc(ghr1.getNickName() + ghr2.getNickName()); + mjyTz.setGhrMcEn(ghr1.getUserName() + ghr2.getUserName()); + } + if (ffr1 != null && ffr2 != null) { + mjyTz.setFfrMc(ffr1.getNickName() + ffr2.getNickName()); + mjyTz.setFfrMcEn(ffr1.getUserName() + ffr2.getUserName()); + } + if (jsr1 != null && jsr2 != null) { + mjyTz.setJsrMc(jsr1.getNickName() + jsr2.getNickName()); + mjyTz.setJsrMcEn(jsr1.getUserName() + jsr2.getUserName()); + } + if (qmr != null && qmr != null) { + mjyTz.setQmrId(qmr.getUserId()); + mjyTz.setQmrMc(qmr.getNickName()); + mjyTz.setQmrMcEn(qmr.getUserName()); + } + mjyTz.setQmyy(qmyy); + mjyTz.setQmyyEn(MjyJcnrUtil.getQmyyEn(qmyy)); + mjyTz.setCzldw(czldw); + mjyTz.setCzl(czl); + mjyTz.setRemark(remark); + return mjyTz; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java index 2d5c47b..317a46f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java @@ -150,7 +150,6 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); List zcgList = this.list(queryWrapper); - List zcgTzList = new ArrayList<>(); if (zcgList.size() > 0) { for (Zcg zcg : zcgList) { if (!zcg.getZt().equals(zcgJyztEnum.jyz.getValue())) { @@ -167,8 +166,7 @@ public class ZcgServiceImpl extends ServiceImpl implements IZcgS zcg.setGlyj(null); zcg.setZt(zcgJyztEnum.wjy.getValue()); } - this.saveOrUpdateBatch(zcgList); - zcgTzService.saveBatch(zcgTzList); + this.updateBatchById(zcgList); } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java new file mode 100644 index 0000000..58318e6 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java @@ -0,0 +1,93 @@ +package com.hxhq.business.utils; + +import com.alibaba.fastjson2.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author tanfei + */ +public class MjyJcnrUtil { + private static final Logger logger = LoggerFactory.getLogger(MjyJcnrUtil.class.getName()); + private static HashMap mapJcnr=new HashMap<>(); + private static HashMap mapQmyy=new HashMap<>(); + 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"); + + //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("归还","归还"); + + + //endregion + + } + + /** + * 获取签名意义英文 + * @param qmyy + * @return + */ + public static String getQmyyEn(String qmyy) { + return mapQmyy.get(qmyy); + } + + /** + * 稽查名称英文 + * @param map + * @return + */ + public static String getJcnrEn(Map map) { + Map result =new HashMap<>(); + for (Map.Entry entry : map.entrySet()) { + result.put(mapJcnr.get(entry.getKey()),entry.getValue()); + } + return JSONObject.toJSONString(result); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/ZcgMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/ZcgMapper.xml index 97f62e1..3f561d4 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/ZcgMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/ZcgMapper.xml @@ -19,4 +19,5 @@ + \ No newline at end of file