diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java index d6fb9d7..a2c268b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java @@ -137,6 +137,10 @@ public class Gyzj extends MpBaseEntity @TableField(updateStrategy = FieldStrategy.IGNORED) private String bjrMc; + /** 编辑人名称-英文 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String bjrMcEn; + /** 库存编辑人id */ @TableField(updateStrategy = FieldStrategy.IGNORED) private Long kcbjrId; @@ -145,6 +149,9 @@ public class Gyzj extends MpBaseEntity @TableField(updateStrategy = FieldStrategy.IGNORED) private String kcbjrMc; + /** 库存编辑人名称-英文 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcbjrMcEn; /** 出库量 */ private String ckl; @@ -152,6 +159,12 @@ public class Gyzj extends MpBaseEntity /** 出库单位 */ private String ckldw; + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + /** 领取人1id */ private Long lqr1Id; @@ -222,6 +235,38 @@ public class Gyzj extends MpBaseEntity @TableField(updateStrategy = FieldStrategy.IGNORED) private String ghzytj; + public String getBjrMcEn() { + return bjrMcEn; + } + + public void setBjrMcEn(String bjrMcEn) { + this.bjrMcEn = bjrMcEn; + } + + public String getKcbjrMcEn() { + return kcbjrMcEn; + } + + public void setKcbjrMcEn(String kcbjrMcEn) { + this.kcbjrMcEn = kcbjrMcEn; + } + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + public String getCkl() { return ckl; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java index d4e33a0..ca58188 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java @@ -55,6 +55,12 @@ public class GyzjFfjl extends MpBaseEntity /** 出库量单位 */ private String ckldw; + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + /** 发放转移条件 */ private String ffzytj; @@ -82,6 +88,18 @@ public class GyzjFfjl 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; @@ -110,6 +128,12 @@ public class GyzjFfjl extends MpBaseEntity /** 入库单位 */ private String rkldw; + /** 入库毛重 */ + private String rkmz; + + /** 入库毛重单位 */ + private String rkmzdw; + /** 使用量 */ private String syl; @@ -140,6 +164,18 @@ public class GyzjFfjl 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; @@ -150,6 +186,11 @@ public class GyzjFfjl extends MpBaseEntity /** 归档申请人id */ private Long gdsqrId; + /** 归档申请人名称 */ + private Long gdsqrMc; + + /** 归档申请人名称-英文 */ + private Long gdsqrMcEn; /** 暂存柜id */ private Long zcgId; @@ -162,6 +203,118 @@ public class GyzjFfjl extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd") private Date jyjsrq; + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + + 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 getRkmz() { + return rkmz; + } + + public void setRkmz(String rkmz) { + this.rkmz = rkmz; + } + + public String getRkmzdw() { + return rkmzdw; + } + + public void setRkmzdw(String rkmzdw) { + this.rkmzdw = rkmzdw; + } + + 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 Long getGdsqrMc() { + return gdsqrMc; + } + + public void setGdsqrMc(Long gdsqrMc) { + this.gdsqrMc = gdsqrMc; + } + + public Long getGdsqrMcEn() { + return gdsqrMcEn; + } + + public void setGdsqrMcEn(Long gdsqrMcEn) { + this.gdsqrMcEn = gdsqrMcEn; + } + public String getMdOther() { return mdOther; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java index c8edb44..ad9b849 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjlJcgj.java @@ -24,18 +24,51 @@ public class GyzjFfjlJcgj 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/GyzjJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java index 44c6f5c..4453942 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjJcgj.java @@ -25,18 +25,51 @@ public class GyzjJcgj 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 getGyzjId() { return gyzjId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java index 89d2535..469da5a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjTz.java @@ -30,21 +30,87 @@ public class GyzjTz 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 getGyzjId() { return gyzjId; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java index 5fc2fcd..56898b8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java @@ -135,6 +135,10 @@ public class Mjy extends MpBaseEntity @TableField(updateStrategy = FieldStrategy.IGNORED) private String bjrMc; + /** 编辑人名称-英文 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String bjrMcEn; + /** 库存编辑人id */ @TableField(updateStrategy = FieldStrategy.IGNORED) private Long kcbjrId; @@ -143,6 +147,10 @@ public class Mjy extends MpBaseEntity @TableField(updateStrategy = FieldStrategy.IGNORED) private String kcbjrMc; + /** 库存编辑人名称-英文 */ + @TableField(updateStrategy = FieldStrategy.IGNORED) + private String kcbjrMcEn; + /** 出库量 */ private String ckl; @@ -205,6 +213,22 @@ public class Mjy extends MpBaseEntity /** 发放目的其他 */ private String mdOther; + public String getBjrMcEn() { + return bjrMcEn; + } + + public void setBjrMcEn(String bjrMcEn) { + this.bjrMcEn = bjrMcEn; + } + + public String getKcbjrMcEn() { + return kcbjrMcEn; + } + + public void setKcbjrMcEn(String kcbjrMcEn) { + this.kcbjrMcEn = kcbjrMcEn; + } + public String getMdOther() { return mdOther; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java index 3ea9c18..3b607b8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java @@ -47,6 +47,28 @@ public class FfForm { /** 发放人2密码 */ private String ffr2mm; + /** 出库毛重 */ + private String ckmz; + + /** 出库毛重单位 */ + private String ckmzdw; + + public String getCkmz() { + return ckmz; + } + + public void setCkmz(String ckmz) { + this.ckmz = ckmz; + } + + public String getCkmzdw() { + return ckmzdw; + } + + public void setCkmzdw(String ckmzdw) { + this.ckmzdw = ckmzdw; + } + public String getMdMcs() { return mdMcs; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java index b90b8a6..7c34bae 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/GhForm.java @@ -23,6 +23,18 @@ public class GhForm { /** 入库单位 */ private String rkldw; + /** 使用量 */ + private String syl; + + /** 使用单位 */ + private String syldw; + + /** 入库毛重 */ + private String rkmz; + + /** 入库毛重单位 */ + private String rkmzdw; + /** 归还人1id */ private Long ghr1Id; @@ -56,6 +68,37 @@ public class GhForm { /** 签名人密码 */ private String qmrmm; + public String getSyl() { + return syl; + } + + public void setSyl(String syl) { + this.syl = syl; + } + + public String getSyldw() { + return syldw; + } + + public void setSyldw(String syldw) { + this.syldw = syldw; + } + + public String getRkmz() { + return rkmz; + } + + public void setRkmz(String rkmz) { + this.rkmz = rkmz; + } + + public String getRkmzdw() { + return rkmzdw; + } + + public void setRkmzdw(String rkmzdw) { + this.rkmzdw = rkmzdw; + } public String getQmrmm() { return qmrmm; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java index 24382d1..ff66017 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java @@ -2,8 +2,11 @@ package com.hxhq.business.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.domain.GyzjFfjlJcgj; +import com.hxhq.business.domain.GyzjFfjlJcgj; +import com.hxhq.system.api.domain.SysUser; import java.util.List; +import java.util.Map; /** * 给药制剂发放记录-稽查轨迹Service接口 @@ -28,8 +31,21 @@ public interface IGyzjFfjlJcgjService 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 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 GyzjFfjlJcgj getJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java index b3ebbc8..63ef315 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java @@ -1,13 +1,16 @@ package com.hxhq.business.service; import java.util.List; +import java.util.Map; import com.hxhq.business.domain.GyzjJcgj; import com.hxhq.business.domain.GyzjJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.domain.GyzjJcgj; +import com.hxhq.system.api.domain.SysUser; /** - * 麻精药-稽查轨迹Service接口 + * 给药制剂-稽查轨迹Service接口 * * @author hxhq * @date 2025-12-18 @@ -16,21 +19,45 @@ public interface IGyzjJcgjService extends IService { /** * 查询稽查轨迹列表 - * @param gyzjJcgj 麻精药 + * @param gyzjJcgj 给药制剂 * @return */ public List queryList(GyzjJcgj gyzjJcgj); /** * 新增稽查轨迹 - * @param gyzjId 麻精药id + * @param mjyId 给药制剂id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + */ + 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 GyzjJcgj 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 jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 */ - public void saveJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public GyzjJcgj 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/IGyzjTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java index 0fb9ed3..331e3d3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java @@ -5,6 +5,8 @@ import java.util.List; import com.hxhq.business.domain.GyzjJcgj; import com.hxhq.business.domain.GyzjTz; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.domain.MjyTz; +import com.hxhq.system.api.domain.SysUser; /** * 给药制剂-台账Service接口 @@ -21,20 +23,38 @@ public interface IGyzjTzService extends IService * @return */ public List queryList(GyzjTz gyzjTz); + /** + * 新增台账 + * @param gyzjId 给药制剂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 void saveTz(Long gyzjId, 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 gyzjId 给药制剂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 gyzjId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark); + public GyzjTz getTz(Long gyzjId, 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/GyzjFfjlJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlJcgjServiceImpl.java index 5a33eca..1f62d47 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlJcgjServiceImpl.java @@ -4,14 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hxhq.business.domain.GyzjFfjlJcgj; +import com.hxhq.business.domain.GyzjFfjlJcgj; import com.hxhq.business.mapper.GyzjFfjlJcgjMapper; import com.hxhq.business.service.IGyzjFfjlJcgjService; +import com.hxhq.business.utils.JctUtil; +import com.hxhq.business.utils.GyzjJcnrUtil; 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 java.rmi.ServerException; import java.util.List; +import java.util.Map; /** * 麻精药发放记录-稽查轨迹Service业务层处理 @@ -53,20 +58,56 @@ public class GyzjFfjlJcgjServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark){ GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj(); gyzjFfjlJcgj.setFfjlId(ffjlId); gyzjFfjlJcgj.setJcgjlx(jcgjlx); gyzjFfjlJcgj.setJcmc(jcmc); + gyzjFfjlJcgj.setJcmcEn(GyzjJcnrUtil.getQmyyEn(jcmc)); gyzjFfjlJcgj.setJcmcys(jcmcys); - gyzjFfjlJcgj.setJcnr(jcnr); - gyzjFfjlJcgj.setQmrId(jcrId); - gyzjFfjlJcgj.setQmrMc(jcrMc); + if(jcnr!=null){ + gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(jcnr)); + gyzjFfjlJcgj.setJcnrEn(GyzjJcnrUtil.getJcnrEn(jcnr)); + } + gyzjFfjlJcgj.setQmrId(qmr.getUserId()); + gyzjFfjlJcgj.setQmrMc(qmr.getNickName()); + gyzjFfjlJcgj.setQmrMcEn(qmr.getUserName()); + gyzjFfjlJcgj.setRemark(remark); this.save(gyzjFfjlJcgj); } + /** + * 新增稽查轨迹 + * @param ffjlId 发放记录id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public GyzjFfjlJcgj getJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr,SysUser qmr,String remark){ + GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj(); + gyzjFfjlJcgj.setFfjlId(ffjlId); + gyzjFfjlJcgj.setJcgjlx(jcgjlx); + gyzjFfjlJcgj.setJcmc(jcmc); + gyzjFfjlJcgj.setJcmcEn(GyzjJcnrUtil.getQmyyEn(jcmc)); + gyzjFfjlJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(jcnr)); + gyzjFfjlJcgj.setJcnrEn(GyzjJcnrUtil.getJcnrEn(jcnr)); + } + gyzjFfjlJcgj.setQmrId(qmr.getUserId()); + gyzjFfjlJcgj.setQmrMc(qmr.getNickName()); + gyzjFfjlJcgj.setQmrMcEn(qmr.getUserName()); + gyzjFfjlJcgj.setRemark(remark); + return gyzjFfjlJcgj; + } + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java index 598fb44..d7170ea 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java @@ -122,11 +122,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是未锁定状态，不能加签"); } //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - formData.put("签名意义", "补充说明"); - formData.put("签名人", SecurityUtils.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); } /** @@ -161,10 +157,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i Map 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()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); } /** @@ -205,12 +198,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjlOld.setJlzt(JlztEnum.djd.getValue()); this.updateById(gyzjFfjlOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请解档"); - formData.put("签名人", SecurityUtils.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); } /** @@ -239,25 +227,10 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i for (GyzjFfjl gyzjFfjl : gyzjFfjlList) { //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； gyzjFfjl.setJlzt(JlztEnum.dgd.getValue()); - - //region 稽查轨迹 - GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj(); - gyzjFfjlJcgj.setFfjlId(gyzjFfjl.getId()); - gyzjFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjFfjlJcgj.setJcmc("申请归档"); - gyzjFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请归档"); - formData.put("签名人", SecurityUtils.getNickName()); - gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjFfjlJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjFfjlJcgjList.add(gyzjFfjlJcgj); - //endregion - + // 稽查轨迹 + gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark())); } - this.saveOrUpdateBatch(gyzjFfjlList); + this.updateBatchById(gyzjFfjlList); gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList); } } @@ -286,12 +259,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjlOld.setJlzt(JlztEnum.dgd.getValue()); this.updateById(gyzjFfjlOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请归档"); - formData.put("签名人", SecurityUtils.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); } @@ -319,24 +287,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i for (GyzjFfjl gyzjFfjl : gyzjFfjlList) { //锁定 gyzjFfjl.setJlzt(JlztEnum.ysd.getValue()); - - //region 稽查轨迹 - GyzjFfjlJcgj gyzjFfjlJcgj = new GyzjFfjlJcgj(); - gyzjFfjlJcgj.setFfjlId(gyzjFfjl.getId()); - gyzjFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjFfjlJcgj.setJcmc("锁定发放记录"); - gyzjFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - formData.put("签名意义", "锁定发放记录"); - formData.put("签名人", SecurityUtils.getNickName()); - - gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjFfjlJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjFfjlJcgjList.add(gyzjFfjlJcgj); - //endregion - + // 稽查轨迹 + gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark())); } this.saveOrUpdateBatch(gyzjFfjlList); gyzjFfjlJcgjService.saveBatch(gyzjFfjlJcgjList); @@ -366,11 +318,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjlOld.setJlzt(JlztEnum.ysd.getValue()); this.updateById(gyzjFfjlOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - formData.put("签名意义", "锁定发放记录"); - formData.put("签名人", SecurityUtils.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); } @@ -399,11 +347,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjlOld.setJlzt(JlztEnum.wsd.getValue()); this.updateById(gyzjFfjlOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - formData.put("签名意义", "解锁发放记录"); - formData.put("签名人", SecurityUtils.getNickName()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); } @@ -417,48 +361,50 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i if (gyzjFfjl == null) { throw new ServiceException("发放记录不存在或已删除"); } - //region 更新发放记录 - BigDecimal syl = new BigDecimal(gyzj.getKc()).subtract(new BigDecimal(form.getRkl())); + // 更新发放记录 gyzjFfjl.setFfzytj(form.getGhzytj()); gyzjFfjl.setRkwz(form.getRkwz()); gyzjFfjl.setRktj(form.getRktj()); gyzjFfjl.setGhzytj(form.getGhzytj()); gyzjFfjl.setRkl(form.getRkl()); gyzjFfjl.setRkldw(gyzj.getKcdw()); - gyzjFfjl.setSyl(syl.toString()); + gyzjFfjl.setSyl(form.getSyl()); gyzjFfjl.setSyldw(gyzj.getKcdw()); gyzjFfjl.setGhr1Id(ghr1.getUserId()); gyzjFfjl.setGhr1Mc(ghr1.getNickName()); + gyzjFfjl.setGhr1McEn(ghr1.getNickName()); gyzjFfjl.setGhrq(new Date()); gyzjFfjl.setGhr2Id(ghr2.getUserId()); gyzjFfjl.setGhr2Mc(ghr2.getNickName()); + gyzjFfjl.setGhr2McEn(ghr2.getNickName()); gyzjFfjl.setJsr1Id(jsr1.getUserId()); gyzjFfjl.setJsr1Mc(jsr1.getNickName()); + gyzjFfjl.setJsr1McEn(jsr1.getNickName()); gyzjFfjl.setJsr2Id(jsr2.getUserId()); gyzjFfjl.setJsr2Mc(jsr2.getNickName()); + gyzjFfjl.setJsr2McEn(jsr2.getNickName()); gyzjFfjl.setGhbz(form.getRemark()); this.updateById(gyzjFfjl); - //endregion - //region 归还试验物资 + // 归还试验物资 studyGyzjService.returnBatch(gyzj.getId()); - //endregion - //region 稽查轨迹 + // 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("入库位置", form.getRkwz()); formData.put("入库条件", form.getRktj()); formData.put("转移条件", form.getGhzytj()); formData.put("入库净重", form.getRkl() + gyzj.getKcdw()); - formData.put("使用量", syl + gyzj.getKcdw()); + formData.put("入库毛重", form.getRkmz() + gyzj.getKcdw()); + formData.put("使用量", form.getSyl() + gyzj.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()); formData.put("签名意义", "归还"); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion + gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); + } @@ -490,6 +436,10 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i gyzjFfjl.setLqr2Mc(lqr2.getNickName()); gyzjFfjl.setFfr1Mc(ffr1.getNickName()); gyzjFfjl.setFfr2Mc(ffr2.getNickName()); + gyzjFfjl.setLqr1McEn(lqr1.getUserName()); + gyzjFfjl.setLqr2McEn(lqr2.getUserName()); + gyzjFfjl.setFfr1McEn(ffr1.getUserName()); + gyzjFfjl.setFfr2McEn(ffr2.getUserName()); gyzjFfjl.setFfzytj(form.getZytj()); gyzjFfjl.setFfrq(time); gyzjFfjl.setFfbz(form.getRemark()); @@ -520,10 +470,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i formData.put("转移条件", form.getZytj()); formData.put("出库净重", gyzj.getKc() + gyzj.getKcdw()); formData.put("目的", form.getMdMcs()); - formData.put("备注", form.getRemark()); - gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), - SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion + gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java index 01447ee..6bb755d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjJcgjServiceImpl.java @@ -1,12 +1,18 @@ package com.hxhq.business.service.impl; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.GyzjJcgj; import com.hxhq.business.domain.GyzjJcgj; +import com.hxhq.business.domain.GyzjJcgj; +import com.hxhq.business.utils.JctUtil; +import com.hxhq.business.utils.GyzjJcnrUtil; 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.GyzjJcgjMapper; import com.hxhq.business.domain.GyzjJcgj; @@ -48,25 +54,88 @@ public class GyzjJcgjServiceImpl extends ServiceImpl i /** * 新增稽查轨迹 - * @param gyzjId id + * @param gyzjId 麻精药id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 + * @param remark 备注 */ @Override - public void saveJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){ + public void saveJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ GyzjJcgj gyzjJcgj = new GyzjJcgj(); gyzjJcgj.setGyzjId(gyzjId); gyzjJcgj.setJcgjlx(jcgjlx); gyzjJcgj.setJcmc(jcmc); + gyzjJcgj.setJcmcEn(GyzjJcnrUtil.getQmyyEn(jcmc)); gyzjJcgj.setJcmcys(jcmcys); - gyzjJcgj.setJcnr(jcnr); - gyzjJcgj.setQmrId(jcrId); - gyzjJcgj.setQmrMc(jcrMc); + if(jcnr!=null){ + gyzjJcgj.setJcnr(JctUtil.formatStr(jcnr)); + gyzjJcgj.setJcnrEn(GyzjJcnrUtil.getJcnrEn(jcnr)); + } + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrMcEn(qmr.getUserName()); + gyzjJcgj.setRemark(remark); this.save(gyzjJcgj); } + /** + * 新增稽查轨迹 + * @param gyzjId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public GyzjJcgj getJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzjId); + gyzjJcgj.setJcgjlx(jcgjlx); + gyzjJcgj.setJcmc(jcmc); + gyzjJcgj.setJcmcEn(GyzjJcnrUtil.getQmyyEn(jcmc)); + gyzjJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + gyzjJcgj.setJcnr(JctUtil.formatStr(jcnr)); + gyzjJcgj.setJcnrEn(GyzjJcnrUtil.getJcnrEn(jcnr)); + } + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrMcEn(qmr.getUserName()); + gyzjJcgj.setRemark(remark); + return gyzjJcgj; + } + + /** + * 新增稽查轨迹 + * @param gyzjId 麻精药id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public GyzjJcgj getJcgj(Long gyzjId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){ + GyzjJcgj gyzjJcgj = new GyzjJcgj(); + gyzjJcgj.setGyzjId(gyzjId); + gyzjJcgj.setJcgjlx(jcgjlx); + gyzjJcgj.setJcmc(jcmc); + gyzjJcgj.setJcmcEn(GyzjJcnrUtil.getQmyyEn(jcmc)); + gyzjJcgj.setJcmcys(jcmcys); + gyzjJcgj.setJcnr(jcnr); + gyzjJcgj.setJcnrEn(jcnrEn); + gyzjJcgj.setQmrId(qmr.getUserId()); + gyzjJcgj.setQmrMc(qmr.getNickName()); + gyzjJcgj.setQmrMcEn(qmr.getUserName()); + gyzjJcgj.setRemark(remark); + return gyzjJcgj; + } + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index ed1334c..83656b7 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -156,9 +156,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setZjzt(ZjztEnum.djd.getValue()); this.updateById(gyzjOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); + } /** @@ -193,8 +192,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG Map formData = new LinkedHashMap<>(); formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); - formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } /** @@ -223,21 +221,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG for (Gyzj gyzj : gyzjList) { //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； gyzj.setZjzt(ZjztEnum.dgd.getValue()); - - //region 稽查轨迹 - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzj.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("申请归档"); - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); - gyzjJcgj.setRemark(form.getRemark()); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjList.add(gyzjJcgj); - //endregion - + //稽查轨迹 + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark())); } - this.saveOrUpdateBatch(gyzjList); + this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); } } @@ -266,9 +253,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setZjzt(ZjztEnum.dgd.getValue()); this.updateById(gyzjOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } @@ -296,23 +281,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG for (Gyzj gyzj : gyzjList) { //锁定 gyzj.setZjzt(ZjztEnum.ysd.getValue()); - //region 稽查轨迹 - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzj.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("锁定给药制剂"); - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjList.add(gyzjJcgj); - //endregion - + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark())); } - this.saveOrUpdateBatch(gyzjList); + this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); } @@ -340,9 +312,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setZjzt(ZjztEnum.ysd.getValue()); this.updateById(gyzjOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } @@ -370,9 +340,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setZjzt(ZjztEnum.rk.getValue()); this.updateById(gyzjOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } /** @@ -384,14 +352,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Transactional(rollbackFor = Exception.class) 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(fhr,form.getFhrmm()); - //验证监督人密码 - checkPassword(jdr,form.getJdrmm()); + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.in("id", form.getIds()); queryWrapper.eq("zjzt", ZjztEnum.rk.getValue()); @@ -418,46 +381,23 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } //验证库存 BigDecimal kc = new BigDecimal(gyzj.getKc()); - if (kc.compareTo(BigDecimal.ZERO) <= 0) { - throw new ServiceException("给药制剂【" + gyzj.getMc() + "】库存不足，不能处置"); - } - if (kc.compareTo(czl) < 0) { - throw new ServiceException("给药制剂【" + gyzj.getMc() + "】处置量大于库存量"); - } + gyzj.setKc(kc.subtract(czl).toString()); - //region 稽查轨迹 - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzj.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("处置药剂"); - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("处置方式", gyzjPlffItemFilter.get(0).getCzfs()); formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy()); formData.put("处置量", gyzjPlffItemFilter.get(0).getCzl() + gyzj.getKcdw()); formData.put("处置人", clr.getNickName()); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), null)); + //台账 + gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",gyzjPlffItemFilter.get(0).getCzl(),gyzj.getKcdw(),gyzjPlffItemFilter.get(0).getCzyy())); - gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjList.add(gyzjJcgj); - //endregion - //region 台账 - GyzjTz gyzjTz = new GyzjTz(); - gyzjTz.setGyzjId(gyzj.getId()); - gyzjTz.setQmyy("处置药剂"); - gyzjTz.setQmrId(clr.getUserId()); - gyzjTz.setQmrMc(clr.getNickName()); - gyzjTz.setCzl(gyzjPlffItemFilter.get(0).getCzl()); - gyzjTz.setCzldw(gyzj.getKcdw()); - gyzjTz.setRemark(gyzjPlffItemFilter.get(0).getCzyy()); - gyzjTzList.add(gyzjTz); - //endregion } else { throw new ServiceException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); } } - this.saveOrUpdateBatch(gyzjList); + this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); gyzjTzService.saveBatch(gyzjTzList); } @@ -472,15 +412,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Transactional(rollbackFor = Exception.class) 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(fhr,form.getFhrmm()); - //验证监督人密码 - checkPassword(jdr,form.getJdrmm()); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -510,25 +444,15 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } //更新库存 gyzjOld.setKc(kc.subtract(czl).toString()); - - - //region 稽查轨迹 - + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("处置方式", form.getCzfs()); formData.put("处置原因", form.getCzyy()); formData.put("处置量", form.getCzl() + gyzjOld.getKcdw()); formData.put("处置人", clr.getNickName()); - - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion - - //region 台账 - gyzjTzService.saveTz(gyzjOld.getId(), "", "", - "", "", clr.getUserId(), clr.getNickName(), - "处置药剂", form.getCzl(), gyzjOld.getKcdw(), form.getCzyy()); - //endregion - + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null); + //台账 + gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",form.getCzl(),gyzjOld.getKcdw(),form.getCzyy()); this.updateById(gyzjOld); } @@ -542,14 +466,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG @Transactional(rollbackFor = Exception.class) 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(fhr,form.getFhrmm()); - //验证监督人密码 - checkPassword(jdr,form.getJdrmm()); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -569,44 +487,20 @@ public class GyzjServiceImpl extends ServiceImpl implements IG .filter(p -> p.getId().equals(gyzj.getId())) .collect(Collectors.toList()); if (gyzjPlffItemFilter.size() > 0) { - - //region 稽查轨迹 - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzj.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("处置容器"); - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); - + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("处置方式", gyzjPlffItemFilter.get(0).getCzfs()); formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy()); formData.put("处置人", clr.getNickName()); - formData.put("复核人", fhr.getNickName()); - formData.put("监督人", jdr.getNickName()); - - gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjList.add(gyzjJcgj); - //endregion - - //region 台账 - GyzjTz gyzjTz = new GyzjTz(); - gyzjTz.setGyzjId(gyzj.getId()); - gyzjTz.setQmyy("处置容器"); - gyzjTz.setQmrId(clr.getUserId()); - gyzjTz.setQmrMc(clr.getNickName()); - gyzjTz.setRemark(gyzjPlffItemFilter.get(0).getCzyy()); - gyzjTzList.add(gyzjTz); - //endregion - + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null)); + //台账 + gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,gyzjPlffItemFilter.get(0).getCzyy())); gyzj.setRqzt(RqztEnum.ycz.getValue()); } else { throw new ServiceException("给药制剂【" + gyzj.getMc() + "】不存在或已删除"); } } - - this.saveOrUpdateBatch(gyzjList); + this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); gyzjTzService.saveBatch(gyzjTzList); } @@ -641,22 +535,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (!gyzjOld.getRqzt().equals(RqztEnum.wcz.getValue())) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】已经处置过容器了，不能重复操作"); } - //region 稽查轨迹 + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("处置方式", form.getCzfs()); formData.put("处置原因", form.getCzyy()); formData.put("处置人", clr.getNickName()); formData.put("复核人", fhr.getNickName()); formData.put("监督人", jdr.getNickName()); - - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion - - //region 台账 - gyzjTzService.saveTz(gyzjOld.getId(), "", "", - "", "", clr.getUserId(), clr.getNickName(), - "处置容器", "", "", form.getCzyy()); - //endregion + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); + //台账 + gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,form.getCzyy()); gyzjOld.setRqzt(RqztEnum.ycz.getValue()); this.updateById(gyzjOld); } @@ -700,25 +588,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } else { glyj += "," + gyzj.getMc(); } - - //region 稽查轨迹 - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzj.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("钥匙发放"); - gyzjJcgj.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()); - - gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjList.add(gyzjJcgj); - //endregion + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null)); } if (StringUtils.isBlank(zcg.getGlyj())) { zcg.setGlyj(glyj); @@ -731,7 +606,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG zcg.setLqr2Mc(lqr2.getNickName()); zcg.setZt(zcgJyztEnum.jyz.getValue()); zcgService.updateById(zcg); - this.saveOrUpdateBatch(gyzjList); + this.updateBatchById(gyzjList); gyzjJcgjService.saveBatch(gyzjJcgjList); } @@ -769,25 +644,19 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } Date now = new Date(); - //region 发放记录，试验物资 + //region 发放记录，试验物资 todo gyzjFfjlService.ff( form,gyzjOld, lqr1, lqr2, ffr1, ffr2, now); //endregion - //region 稽查轨迹 + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw()); formData.put("转移条件", form.getZytj()); - formData.put("目的", form.getMdMcs()); - formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), - SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion - - //region 台账 - gyzjTzService.saveTz(gyzjOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "", - ffr1.getNickName() + "," + ffr2.getNickName(), "", null, "", - "领取发放", gyzjOld.getKc(), gyzjOld.getKcdw(), form.getRemark()); - //endregion + formData.put("出库毛重", form.getCkmz() + gyzjOld.getKcdw()); + formData.put("目的", form.getMdIds()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark()); + //台账 + gyzjTzService.saveTz(gyzjOld.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",gyzjOld.getKc(),gyzjOld.getKcdw(),form.getRemark()); //region 更新发放信息 gyzjOld.setCkl(gyzjOld.getKc()); @@ -852,37 +721,17 @@ public class GyzjServiceImpl extends ServiceImpl implements IG .filter(p -> p.getId().equals(gyzj.getId())) .collect(Collectors.toList()); if (plffItemFilter.size() > 0) { + //发放 todo gyzjFfjlService.ff(plffItemFilter.get(0), gyzj, lqr1, lqr2, ffr1, ffr2, now); - - //region 稽查轨迹 - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzj.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("领取发放"); - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("出库量", gyzj.getKc() + gyzj.getKcdw()); formData.put("转移条件", plffItemFilter.get(0).getZytj()); + formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw()); formData.put("目的", plffItemFilter.get(0).getMdIds()); - formData.put("备注", plffItemFilter.get(0).getRemark()); - gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjList.add(gyzjJcgj); - //endregion - - //region 台账 - GyzjTz gyzjTz = new GyzjTz(); - gyzjTz.setGyzjId(gyzj.getId()); - gyzjTz.setLqrMc(lqr1.getNickName() + "," + lqr2.getNickName()); - gyzjTz.setFfrMc(ffr1.getNickName() + "," + ffr2.getNickName()); - gyzjTz.setQmyy("领取发放"); - gyzjTz.setCzl(gyzj.getKc()); - gyzjTz.setCzldw(gyzj.getKcdw()); - gyzjTz.setRemark(plffItemFilter.get(0).getRemark()); - gyzjTzList.add(gyzjTz); - //endregion - + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),plffItemFilter.get(0).getRemark())); + //台账 + gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",gyzj.getKc(),gyzj.getKcdw(),plffItemFilter.get(0).getRemark())); //region 更新发放信息 gyzj.setCkl(gyzj.getKc()); gyzj.setCkldw(gyzj.getKcdw()); @@ -941,15 +790,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG throw new ServiceException("你没有修改任何内容"); } for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzjOld.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("申请编辑"); - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); - gyzjJcgj.setJcnr(fieldChange.toString()); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjList.add(gyzjJcgj); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(),null)); } gyzjOld.setMcbj(form.getMc()); gyzjOld.setNdbj(form.getNd()); @@ -961,6 +802,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setBjbz(form.getBjbz()); gyzjOld.setBjrId(SecurityUtils.getUserId()); gyzjOld.setBjrMc(SecurityUtils.getNickName()); + gyzjOld.setBjrMcEn(SecurityUtils.getLoginUser().getUsername()); gyzjOld.setBjzt(BjEnum.shz.getValue()); this.updateById(gyzjOld); gyzjJcgjService.saveBatch(gyzjJcgjList); @@ -989,26 +831,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能审核编辑"); } - //region 稽查轨迹 - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzjOld.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc(ShbjEnum.getEnumByValue(form.getQmyy()).getText()); - if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); - } else { - gyzjJcgj.setJcmcys(JcmcysEnum.red.getValue()); - } + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("申请备注", gyzjOld.getBjbz()); formData.put("审核备注", form.getRemark()); - gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjService.save(gyzjJcgj); - //endregion - - //region 更新 if (form.getQmyy().equals(ShbjEnum.ty.getValue())) { gyzjOld.setCcwz(gyzjOld.getCcwzbj()); gyzjOld.setCctj(gyzjOld.getCctjbj()); @@ -1016,8 +842,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzjOld.setNddw(gyzjOld.getNddwbj()); gyzjOld.setNd(gyzjOld.getNdbj()); gyzjOld.setMc(gyzjOld.getMcbj()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); + } else { + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); } - //清空编辑信息 gyzjOld.setMcbj(null); gyzjOld.setNddwbj(null); @@ -1062,17 +890,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG throw new ServiceException("你没有修改任何内容"); } List gyzjJcgjList = new ArrayList<>(); + //region 稽查轨迹 for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzjOld.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc("修改库存申请"); - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); - gyzjJcgj.setJcnr(fieldChange.toString()); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjList.add(gyzjJcgj); + gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(),null)); } //endregion @@ -1111,45 +932,25 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (!(gyzjOld.getZjzt().equals(ZjztEnum.rk.getValue()) || gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue()))) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是入库或已发放状态，不能审核修改库存"); } - //region 稽查轨迹 - GyzjJcgj gyzjJcgj = new GyzjJcgj(); - gyzjJcgj.setGyzjId(gyzjOld.getId()); - gyzjJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gyzjJcgj.setJcmc(ShXgkcEnum.getEnumByValue(form.getQmyy()).getText()); - if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { - gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue()); - } else { - gyzjJcgj.setJcmcys(JcmcysEnum.red.getValue()); - } + //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("申请备注", gyzjOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); - gyzjJcgj.setJcnr(JctUtil.formatStr(formData)); - gyzjJcgj.setQmrId(SecurityUtils.getUserId()); - gyzjJcgj.setQmrMc(SecurityUtils.getNickName()); - gyzjJcgjService.save(gyzjJcgj); - //endregion - - //region 更新 if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); gyzjOld.setKcdw(gyzjOld.getKcdwbj()); gyzjOld.setKc(gyzjOld.getKcbj()); + } else { + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null); } + //台账 + gyzjTzService.getTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,null,"修改库存",gyzjOld.getKcbj(),gyzjOld.getKcdw(),gyzjOld.getKcbjbz()); + gyzjOld.setKcbj(null); gyzjOld.setKcdwbj(null); gyzjOld.setKcbjbz(null); gyzjOld.setKcbjzt(KcbjEnum.wbj.getValue()); this.updateById(gyzjOld); - //endregion - - //region 台账 - if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { - gyzjTzService.saveTz(gyzjOld.getId(), "", "", - "", "", SecurityUtils.getUserId(), SecurityUtils.getNickName(), - "修改库存", gyzjOld.getKc(), gyzjOld.getKcdw(), gyzjOld.getKcbjbz()); - } - //endregion - } @@ -1188,10 +989,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG formData.put("归还人1", SecurityUtils.getNickName()); formData.put("归还人2", ghr2.getNickName()); formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); //endregion gyzjOld.setGhzytj(form.getGhzytj()); + gyzjOld.setGhzytj(form.getGhzytj()); + gyzjOld.setGhzytj(form.getGhzytj()); + + gyzjOld.setGhzytj(form.getGhzytj()); gyzjOld.setRkwz(form.getRkwz()); gyzjOld.setRktj(form.getRktj()); gyzjOld.setGhr1Id(SecurityUtils.getUserId()); @@ -1234,23 +1039,22 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } BigDecimal syl = new BigDecimal(gyzjOld.getKc()).subtract(new BigDecimal(form.getRkl())); gyzjFfjlService.gh(form, gyzjOld, ghr1, ghr2, jsr1, jsr2); - //region 台账 - gyzjTzService.saveTz(gyzjOld.getId(), "", gyzjOld.getGhr1Mc() + "," + gyzjOld.getGhr2Mc(), - "", jsr1.getNickName() + "," + jsr2.getNickName(), null, null, - "确认归还", form.getRkl(), gyzjOld.getKcdw(), form.getRemark()); - //endregion - //region 稽查轨迹 + // 台账 + gyzjTzService.saveTz(gyzjOld.getId(),null,null,ghr1,ghr2,null,null,jsr1,jsr2,null,"确认归还",form.getRkl(), gyzjOld.getKcdw(),form.getRemark()); + + // 稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("入库位置", form.getRkwz()); formData.put("入库条件", form.getRktj()); formData.put("转移条件", form.getGhzytj()); formData.put("入库净重", form.getRkl() + gyzjOld.getKcdw()); + formData.put("入库毛重", form.getRkmz() + gyzjOld.getKcdw()); formData.put("使用量", syl + gyzjOld.getKcdw()); formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.getNickName()); - formData.put("备注", form.getRemark()); - gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - //endregion + gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), SecurityUtils.getNickName()); + + // 更新 gyzjOld.setKc(form.getRkl()); gyzjOld.setGhzytj(null); gyzjOld.setRkwz(null); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java index dd085d1..a2adcc1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java @@ -4,7 +4,10 @@ import java.util.List; 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.GyzjTz; +import com.hxhq.business.utils.GyzjJcnrUtil; import com.hxhq.common.core.exception.ServiceException; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GyzjTzMapper; import com.hxhq.business.domain.GyzjTz; @@ -39,32 +42,101 @@ public class GyzjTzServiceImpl extends ServiceImpl impleme /** * 新增台账 - * @param gyzjId 麻精药id - * @param lqrMc 领取人名称 - * @param ghrMc 归还人名称 - * @param ffrMc 发放人名称 - * @param jsrMc 接收人名称 - * @param qmrId 签名人id - * @param qmrMc 签名人名称 - * @param qmyy 签名意义 - * @param czl 操作量 - * @param czldw 操作量单位 + * + * @param gyzjId 麻精药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 gyzjId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark){ + public void saveTz(Long gyzjId, 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) { GyzjTz gyzjTz = new GyzjTz(); gyzjTz.setGyzjId(gyzjId); - gyzjTz.setLqrMc(lqrMc); - gyzjTz.setGhrMc(ghrMc); - gyzjTz.setFfrMc(ffrMc); - gyzjTz.setJsrMc(jsrMc); - gyzjTz.setQmrId(qmrId); - gyzjTz.setQmrMc(qmrMc); + if (lqr1 != null && lqr2 != null) { + gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName()); + gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName()); + } + + if (ghr1 != null && ghr2 != null) { + gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName()); + gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName()); + } + if (ffr1 != null && ffr2 != null) { + gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName()); + gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName()); + } + if (jsr1 != null && jsr2 != null) { + gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName()); + gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName()); + } + if (qmr != null && qmr != null) { + gyzjTz.setQmrId(qmr.getUserId()); + gyzjTz.setQmrMc(qmr.getNickName()); + gyzjTz.setQmrMcEn(qmr.getUserName()); + } gyzjTz.setQmyy(qmyy); + gyzjTz.setQmyyEn(GyzjJcnrUtil.getQmyyEn(qmyy)); gyzjTz.setCzldw(czldw); gyzjTz.setCzl(czl); gyzjTz.setRemark(remark); this.save(gyzjTz); } + + /** + * 新增台账 + * + * @param gyzjId 麻精药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 GyzjTz getTz(Long gyzjId, 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) { + GyzjTz gyzjTz = new GyzjTz(); + gyzjTz.setGyzjId(gyzjId); + if (lqr1 != null && lqr2 != null) { + gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName()); + gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName()); + } + + if (ghr1 != null && ghr2 != null) { + gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName()); + gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName()); + } + if (ffr1 != null && ffr2 != null) { + gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName()); + gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName()); + } + if (jsr1 != null && jsr2 != null) { + gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName()); + gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName()); + } + if (qmr != null && qmr != null) { + gyzjTz.setQmrId(qmr.getUserId()); + gyzjTz.setQmrMc(qmr.getNickName()); + gyzjTz.setQmrMcEn(qmr.getUserName()); + } + gyzjTz.setQmyy(qmyy); + gyzjTz.setQmyyEn(GyzjJcnrUtil.getQmyyEn(qmyy)); + gyzjTz.setCzldw(czldw); + gyzjTz.setCzl(czl); + gyzjTz.setRemark(remark); + return gyzjTz; + } } 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 0bd342e..687fdc1 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 @@ -188,7 +188,6 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS Map formData = new LinkedHashMap<>(); formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); - //稽查轨迹 mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()); } @@ -374,9 +373,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS 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("处置量填写不正确"); + } if (mjyPlffItemFilter.size() > 0) { BigDecimal kc = new BigDecimal(mjy.getKc()); - mjy.setKc(kc.subtract(new BigDecimal(mjyPlffItemFilter.get(0).getCzl())).toString()); + mjy.setKc(kc.subtract(czl).toString()); //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("处置方式", mjyPlffItemFilter.get(0).getCzfs()); @@ -804,6 +809,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setBjbz(form.getBjbz()); mjyOld.setBjrId(SecurityUtils.getUserId()); mjyOld.setBjrMc(SecurityUtils.getNickName()); + mjyOld.setBjrMcEn(SecurityUtils.getLoginUser().getUsername()); mjyOld.setBjzt(BjEnum.shz.getValue()); this.updateById(mjyOld); mjyJcgjService.saveBatch(mjyJcgjList); @@ -900,6 +906,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyOld.setKcbj(form.getKc()); mjyOld.setKcbjrId(SecurityUtils.getUserId()); mjyOld.setKcbjrMc(SecurityUtils.getNickName()); + mjyOld.setKcbjrMcEn(SecurityUtils.getLoginUser().getUsername()); mjyOld.setKcbjzt(KcbjEnum.shz.getValue()); mjyOld.setKcbjbz(form.getKcbjbz()); this.updateById(mjyOld); @@ -983,13 +990,11 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (!mjyOld.getZjzt().equals(ZjztEnum.yff.getValue())) { throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是已发放状态，不能归还"); } - BigDecimal kc = new BigDecimal(mjyOld.getKc()); - BigDecimal syl = new BigDecimal(form.getSyl()); BigDecimal leftKc = new BigDecimal(mjyOld.getKc()).subtract(new BigDecimal(form.getSyl())); mjyFfjlService.gh(form, mjyOld, ghr1, ghr2, jsr1, jsr2); - //region 台账 + // 台账 mjyTzService.saveTz(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()); @@ -1002,7 +1007,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS formData.put("库管员1", jsr1.getNickName()); formData.put("库管员2", jsr2.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()); this.updateById(mjyOld); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java new file mode 100644 index 0000000..502093f --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java @@ -0,0 +1,106 @@ +package com.hxhq.business.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * @author tanfei + */ +public class GyzjJcnrUtil { + private static final Logger logger = LoggerFactory.getLogger(GyzjJcnrUtil.class.getName()); + private static HashMap mapJcnr=new HashMap<>(); + private static HashMap mapQmyy=new HashMap<>(); + static { + //region 稽查内容 + + 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("申请解档","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 formData = new LinkedHashMap<>(); + formData.put("申请备注", "1111"); + formData.put("审核备注", "22"); + logger.info(getJcnrEn(formData)); + } + /** + * 获取签名意义英文 + * @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 JctUtil.formatStr(result); + } + +}