From 34df1afbad554782d81dd226dbd52bd37d2d053a Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 15 Jan 2026 11:24:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/domain/Gsp.java | 16 +- .../java/com/hxhq/business/domain/GspFfjlJcgj.java | 39 ++- .../java/com/hxhq/business/domain/GspJcgj.java | 30 ++ .../java/com/hxhq/business/domain/GspRkjl.java | 18 +- .../java/com/hxhq/business/domain/GspRkjlJcgj.java | 27 ++ .../main/java/com/hxhq/business/domain/GspTz.java | 72 ++++- .../src/main/java/com/hxhq/business/domain/Yq.java | 10 +- .../main/java/com/hxhq/business/domain/YqJcgj.java | 40 ++- .../hxhq/business/service/IGspFfjlJcgjService.java | 6 +- .../com/hxhq/business/service/IGspJcgjService.java | 6 +- .../hxhq/business/service/IGspRkjlJcgjService.java | 6 +- .../com/hxhq/business/service/IGspTzService.java | 26 +- .../com/hxhq/business/service/IYqJcgjService.java | 2 +- .../service/impl/GspFfjlJcgjServiceImpl.java | 10 +- .../business/service/impl/GspFfjlServiceImpl.java | 113 +++++--- .../business/service/impl/GspJcgjServiceImpl.java | 10 +- .../service/impl/GspRkjlJcgjServiceImpl.java | 10 +- .../business/service/impl/GspRkjlServiceImpl.java | 87 ++++-- .../hxhq/business/service/impl/GspServiceImpl.java | 308 +++++++++++++++------ .../business/service/impl/GspTzServiceImpl.java | 52 +++- .../business/service/impl/YqJcgjServiceImpl.java | 5 +- .../hxhq/business/service/impl/YqServiceImpl.java | 19 +- 22 files changed, 670 insertions(+), 242 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java index 2d5db2a..f81cfd6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java @@ -34,22 +34,22 @@ public class Gsp extends MpBaseEntity private Integer kcbjzt; /** 名称 */ - @Compare(name = "名称") + @Compare(name = "名称", nameEn = "Name") private String mc; /** 编号 */ private String bh; /** 批号 */ - @Compare(name = "批号") + @Compare(name = "批号", nameEn = "Batch Number") private String ph; /** 规格 */ - @Compare(name = "规格") + @Compare(name = "规格", nameEn = "Specification") private String gg; /** 规格 */ - @Compare(name = "规格单位") + @Compare(name = "规格单位", nameEn = "Specification Unit") private String ggdw; /** 库存数量 */ @@ -59,21 +59,21 @@ public class Gsp extends MpBaseEntity private String kcdw; /** 有效期 */ - @Compare(name = "有效期") + @Compare(name = "有效期", nameEn = "Validity Period") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date yxq; /** 接收日期 */ - @Compare(name = "接收日期") + @Compare(name = "接收日期", nameEn = "Date Received") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date jsrq; /** 存储条件 */ - @Compare(name = "存储条件") + @Compare(name = "存储条件", nameEn = "Storage Condition") private String cctj; /** 注意事项 */ - @Compare(name = "注意事项") + @Compare(name = "注意事项", nameEn = "Notification") private String zysx; /** 名称编辑 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjlJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjlJcgj.java index 3db12d4..58236ea 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjlJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspFfjlJcgj.java @@ -23,20 +23,19 @@ public class GspFfjlJcgj extends MpBaseEntity /** 稽查名称 */ private String jcmc; - + private String jcmcEn; /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ private Integer jcmcys; /** 稽查内容 */ private String jcnr; - - /** 签名意义 */ - private String qmyy; + private String jcnrEn; /** 签名人id */ private Long qmrId; private String qmrMc; + private String qmrMcEn; public String getQmrMc() { return qmrMc; @@ -96,15 +95,6 @@ public class GspFfjlJcgj extends MpBaseEntity return jcnr; } - public void setQmyy(String qmyy) - { - this.qmyy = qmyy; - } - - public String getQmyy() - { - return qmyy; - } public void setQmrId(Long qmrId) { @@ -116,4 +106,27 @@ public class GspFfjlJcgj extends MpBaseEntity return qmrId; } + 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; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspJcgj.java index df39e1e..edbab50 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspJcgj.java @@ -24,18 +24,24 @@ public class GspJcgj 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 void setGspId(Long gspId) { this.gspId = gspId; @@ -103,4 +109,28 @@ public class GspJcgj extends MpBaseEntity public void setQmrMc(String qmrMc) { this.qmrMc = qmrMc; } + + 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; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java index 190da6f..0a167e4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjl.java @@ -25,40 +25,40 @@ public class GspRkjl extends MpBaseEntity private Integer jyzt; /** 名称 */ - @Compare(name = "名称") + @Compare(name = "名称", nameEn = "Name") private String mc; /** 批号 */ - @Compare(name = "批号") + @Compare(name = "批号", nameEn = "Batch Number") private String ph; /** 规格 */ - @Compare(name = "规格") + @Compare(name = "规格", nameEn = "Specification") private String gg; /** 规格 */ - @Compare(name = "规格单位") + @Compare(name = "规格单位", nameEn = "Specification Unit") private String ggdw; /** 入库数量 */ - @Compare(name = "入库量") + @Compare(name = "入库量", nameEn = "Amount In") private String rkl; /** 入库单位 */ - @Compare(name = "入库量单位") + @Compare(name = "入库量单位", nameEn = "Amount In Unit") private String rkdw; /** 入库时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Compare(name = "入库时间") + @Compare(name = "入库时间", nameEn = "Into Storage Date") private Date rksj; /** 存储条件 */ - @Compare(name = "存储条件") + @Compare(name = "存储条件", nameEn = "Storage Condition") private String cctj; /** 注意事项 */ - @Compare(name = "注意事项") + @Compare(name = "注意事项", nameEn = "Notification") private String zysx; /** 归档申请人id */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjlJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjlJcgj.java index 3abfa2f..8f7ea77 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjlJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspRkjlJcgj.java @@ -23,18 +23,21 @@ public class GspRkjlJcgj 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 Long getGspRkjlId() { return gspRkjlId; @@ -91,4 +94,28 @@ public class GspRkjlJcgj extends MpBaseEntity public void setQmrMc(String qmrMc) { this.qmrMc = qmrMc; } + + 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; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspTz.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspTz.java index 4bd1be8..44e13cc 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspTz.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GspTz.java @@ -20,15 +20,19 @@ public class GspTz extends MpBaseEntity /** 领取人名称 */ private String lqrMc; + private String lqrMcEn; /** 归还人名称 */ private String ghrMc; + private String ghrMcEn; /** 发放人名称 */ private String ffrMc; + private String ffrMcEn; /** 接收人名称 */ private String jsrMc; + private String jsrMcEn; /** 操作量 */ private String czl; @@ -39,7 +43,10 @@ public class GspTz extends MpBaseEntity /** 签名意义 */ private String qmyy; + private String qmyyEn; + /** 签名人名称 */ + private String qmrMcEn; private String qmrMc; /** 签名人id */ @@ -126,16 +133,6 @@ public class GspTz extends MpBaseEntity return qmyy; } - public void setQmrMc(String qmrMc) - { - this.qmrMc = qmrMc; - } - - public String getQmrMc() - { - return qmrMc; - } - public void setQmrId(Long qmrId) { this.qmrId = qmrId; @@ -146,4 +143,59 @@ public class GspTz extends MpBaseEntity return qmrId; } + 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 String getQmrMc() { + return qmrMc; + } + + public void setQmrMc(String qmrMc) { + this.qmrMc = qmrMc; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Yq.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Yq.java index 2e10e4e..a780278 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Yq.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Yq.java @@ -29,7 +29,7 @@ public class Yq extends MpBaseEntity { */ @NotEmpty(message = "请输入仪器名称") @Length(max = 50, message = "仪器名称不能超过50字") - @Compare(name = "仪器名称") + @Compare(name = "仪器名称", nameEn = "Name") private String mc; /** @@ -37,7 +37,7 @@ public class Yq extends MpBaseEntity { */ @NotEmpty(message = "请输入仪器编号") @Length(max = 50, message = "仪器编号不能超过50字") - @Compare(name = "仪器编号") + @Compare(name = "仪器编号", nameEn = "ID") private String bh; /** @@ -45,7 +45,7 @@ public class Yq extends MpBaseEntity { */ @NotEmpty(message = "请输入仪器型号") @Length(max = 50, message = "仪器型号不能超过50字") - @Compare(name = "仪器型号") + @Compare(name = "仪器型号", nameEn = "Type") private String xh; /** @@ -53,7 +53,7 @@ public class Yq extends MpBaseEntity { */ @NotEmpty(message = "请输入仪器来源") @Length(max = 50, message = "仪器来源不能超过50字") - @Compare(name = "仪器来源") + @Compare(name = "仪器来源", nameEn = "Source") private String ly; /** @@ -61,7 +61,7 @@ public class Yq extends MpBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd") @NotNull(message = "请选择校准日期") - @Compare(name = "下次校准日期") + @Compare(name = "下次校准日期", nameEn = "Next Calibration") private Date jzrq; /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/YqJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/YqJcgj.java index 7ca9314..39a463e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/YqJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/YqJcgj.java @@ -24,14 +24,15 @@ public class YqJcgj extends MpBaseEntity /** 稽查名称 */ private String jcmc; + private String jcmcEn; + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ private Integer jcmcys; /** 稽查内容 */ private String jcnr; - /** 签名意义 */ - private String qmyy; + private String jcnrEn; /** 签名人id */ private Long qmrId; @@ -39,6 +40,7 @@ public class YqJcgj extends MpBaseEntity /** 签名人名称 */ private String qmrMc; + private String qmrMcEn; public void setYqId(Long yqId) { @@ -90,16 +92,6 @@ public class YqJcgj extends MpBaseEntity return jcnr; } - public void setQmyy(String qmyy) - { - this.qmyy = qmyy; - } - - public String getQmyy() - { - return qmyy; - } - public void setQmrId(Long qmrId) { this.qmrId = qmrId; @@ -117,4 +109,28 @@ public class YqJcgj extends MpBaseEntity public void setQmrMc(String qmrMc) { this.qmrMc = qmrMc; } + + 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; + } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java index 9546a57..18513bf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java @@ -3,6 +3,7 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.GspFfjlJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 供试品发放记录-稽查轨迹Service接口 @@ -27,8 +28,7 @@ public interface IGspFfjlJcgjService extends IService * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 稽查人 */ - public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java index cae935c..8aa18d9 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java @@ -3,6 +3,7 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.GspJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 供试品管理-稽查轨迹Service接口 @@ -27,8 +28,7 @@ public interface IGspJcgjService extends IService * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 */ - public void saveJcgj(Long gspId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public void saveJcgj(Long gspId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlJcgjService.java index f0d08ec..5a509b1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlJcgjService.java @@ -3,6 +3,7 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.GspRkjlJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 供试品入库记录-稽查轨迹Service接口 @@ -27,8 +28,7 @@ public interface IGspRkjlJcgjService extends IService * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 */ - public void saveJcgj(Long gspRkjlId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public void saveJcgj(Long gspRkjlId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java index 4523f66..b63b550 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java @@ -3,6 +3,7 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.GspTz; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 供试品-台账Service接口 @@ -20,19 +21,28 @@ public interface IGspTzService extends IService */ public List queryList(GspTz gspTz); + public void saveTz(Long gspId, SysUser qmr, String qmyy,String qmyyEn, + String czl, String czldw, String remark); + /** - * 新增台账 + * 新增领取台账 * @param gspId 供试品id - * @param lqrMc 领取人名称 - * @param ghrMc 归还人名称 - * @param ffrMc 发放人名称 - * @param jsrMc 接收人名称 - * @param qmrId 签名人id - * @param qmrMc 签名人名称 + * @param lqr1 领取人1 + * @param lqr2 领取人2 + * @param ffr1 发放人1 + * @param ffr2 发放人2 + * @param qmr 签名人 * @param qmyy 签名意义 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 */ - public void saveTz(Long gspId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String czl,String czldw,String remark); + public void saveFfTz(Long gspId, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, SysUser qmr, String qmyy, String qmyyEn, + String czl, String czldw, String remark); + + /** + * 新增归还台账 + */ + public void saveGhTz(Long gspId, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy,String qmyyEn, + String czl, String czldw, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java index eef8b92..9976d7c 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java @@ -28,5 +28,5 @@ public interface IYqJcgjService extends IService * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 */ - public void saveJcgj(Long yqId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr); + public void saveJcgj(Long yqId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java index 1830423..1155b3d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.MjyFfjlJcgj; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GspFfjlJcgjMapper; import com.hxhq.business.domain.GspFfjlJcgj; @@ -37,15 +38,18 @@ public class GspFfjlJcgjServiceImpl extends ServiceImpl impl formData.put("转移条件", zytj); formData.put("目的", mdIds); formData.put("备注", remark); - gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), - SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Out Amount", gsp.getKc() + gsp.getKcdw()); + formDataEn.put("Transfer Condition", zytj); + formDataEn.put("Purpose", mdIds); + formDataEn.put("Comment", remark); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", "Distribution", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), ffr1); //endregion } @@ -161,8 +167,21 @@ public class GspFfjlServiceImpl extends ServiceImpl impl formData.put("库管员2", jsr2.getNickName()); } formData.put("备注", form.getRemark()); - formData.put("签名意义", "归还"); - gspFfjlJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Transfer Condition", form.getGhzytj()); + formDataEn.put("Amount In", form.getRkl() + form.getRkldw()); + formDataEn.put("Returner1", ghr1.getNickName()); + if(ghr2 != null) { + formDataEn.put("Returner 2", ghr2.getNickName()); + } + formDataEn.put("Warehouse Keeper", jsr1.getNickName()); + if(jsr2 != null) { + formDataEn.put("Warehouse Keeper 2", jsr2.getNickName()); + } + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "归还", "Return", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), jsr1); //endregion } @@ -170,7 +189,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void jd(FfjlJdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -187,9 +207,11 @@ public class GspFfjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请解档"); - formData.put("签名人", qmr.getNickName()); - gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @@ -197,7 +219,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void plgd(FfjlGdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -220,14 +242,17 @@ public class GspFfjlServiceImpl extends ServiceImpl impl gspFfjlJcgj.setFfjlId(gspFfjl.getId()); gspFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspFfjlJcgj.setJcmc("申请归档"); + gspFfjlJcgj.setJcmcEn("Apply for Archiving"); gspFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请归档"); - formData.put("签名人", qmr.getNickName()); gspFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgj.setJcnrEn(JctUtil.formatStr(formDataEn)); gspFfjlJcgj.setQmrId(SecurityUtils.getUserId()); gspFfjlJcgj.setQmrMc(SecurityUtils.getNickName()); + gspFfjlJcgj.setQmrMcEn(SecurityUtils.getUsername()); gspFfjlJcgjList.add(gspFfjlJcgj); //endregion @@ -241,6 +266,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void gd(FfjlGdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); + sysUserService.checkPassword(qmr, form.getQmrmm(), false); //验证签名人密码 todo if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); @@ -260,9 +286,11 @@ public class GspFfjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请归档"); - formData.put("签名人", qmr.getNickName()); - gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档","Apply for Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @@ -275,7 +303,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void plsd(FfjlSdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -296,15 +325,17 @@ public class GspFfjlServiceImpl extends ServiceImpl impl gspFfjlJcgj.setFfjlId(gspFfjl.getId()); gspFfjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspFfjlJcgj.setJcmc("锁定发放记录"); + gspFfjlJcgj.setJcmcEn("Lock"); gspFfjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "锁定发放记录"); - formData.put("签名人", qmr.getNickName()); - gspFfjlJcgj.setJcnr(JctUtil.formatStr(formData)); + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgj.setJcnrEn(JctUtil.formatStr(formDataEn)); gspFfjlJcgj.setQmrId(SecurityUtils.getUserId()); gspFfjlJcgj.setQmrMc(SecurityUtils.getNickName()); + gspFfjlJcgj.setQmrMcEn(SecurityUtils.getUsername()); gspFfjlJcgjList.add(gspFfjlJcgj); //endregion @@ -323,7 +354,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void sd(FfjlSdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -339,9 +371,11 @@ public class GspFfjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "锁定发放记录"); - formData.put("签名人", qmr.getNickName()); - gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", "Lock", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @@ -355,7 +389,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void js(FfjlJsForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -372,9 +407,11 @@ public class GspFfjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "解锁发放记录"); - formData.put("签名人", qmr.getNickName()); - gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", "Unlock", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @@ -387,7 +424,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void jy(FfjlJyForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -411,9 +449,13 @@ public class GspFfjlServiceImpl extends ServiceImpl impl formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请借阅"); - formData.put("签名人", qmr.getNickName()); - gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Start Date", DateUtils.dateTime(form.getStartDate())); + formDataEn.put("End Date", DateUtils.dateTime(form.getEndDate())); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out", + JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } /** @@ -425,7 +467,8 @@ public class GspFfjlServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void jq(FfjlJqForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -439,9 +482,11 @@ public class GspFfjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "补充说明"); - formData.put("签名人", qmr.getNickName()); - gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "补充说明", "Sign", + JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java index 6ce728f..a1e6bc2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java @@ -9,6 +9,7 @@ import com.hxhq.business.domain.MjyJcgj; import com.hxhq.business.domain.SjJcgj; import com.hxhq.common.core.domain.MpBaseEntity; import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GspJcgjMapper; import com.hxhq.business.domain.GspJcgj; @@ -50,15 +51,18 @@ public class GspJcgjServiceImpl extends ServiceImpl impl } @Override - public void saveJcgj(Long gspId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, Long jcrId, String jcrMc) { + public void saveJcgj(Long gspId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr) { GspJcgj gspJcgj = new GspJcgj(); gspJcgj.setGspId(gspId); gspJcgj.setJcgjlx(jcgjlx); gspJcgj.setJcmc(jcmc); + gspJcgj.setJcmcEn(jcmcEn); gspJcgj.setJcmcys(jcmcys); gspJcgj.setJcnr(jcnr); - gspJcgj.setQmrId(jcrId); - gspJcgj.setQmrMc(jcrMc); + gspJcgj.setJcnr(jcnrEn); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setQmrMcEn(qmr.getUserName()); this.save(gspJcgj); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java index b434acb..b6a7c58 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java @@ -3,6 +3,7 @@ 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.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GspRkjlJcgjMapper; import com.hxhq.business.domain.GspRkjlJcgj; @@ -36,15 +37,18 @@ public class GspRkjlJcgjServiceImpl extends ServiceImpl impl @Override public void add(GspRkjlForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); GspRkjl gspRkjl = new GspRkjl(); BeanUtils.copyProperties(form, gspRkjl); gspRkjl.setJlzt(JlztEnum.wsd.getValue()); @@ -65,14 +65,18 @@ public class GspRkjlServiceImpl extends ServiceImpl impl Map formData = new LinkedHashMap<>(); formData.put("备注", form.getQmbz()); - gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "新增供试品入库记录", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), - qmr.getUserId(), qmr.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getQmbz()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "新增供试品入库记录", "Add", JcmcysEnum.blue.getValue(), + JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void update(GspRkjlForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + GspRkjl gspRkjl = this.getById(form.getId()); if(gspRkjl == null) { throw new ServiceException("供试品入库记录不存在或已删除"); @@ -96,8 +100,10 @@ public class GspRkjlServiceImpl extends ServiceImpl impl gspRkjlJcgj.setGspRkjlId(gspRkjl.getId()); gspRkjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspRkjlJcgj.setJcmc("编辑供试品入库记录"); + gspRkjlJcgj.setJcmcEn("Edit"); gspRkjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); gspRkjlJcgj.setJcnr(fieldChange.toString()); + gspRkjlJcgj.setJcnrEn(fieldChange.toEnString()); gspRkjlJcgj.setQmrId(qmr.getUserId()); gspRkjlJcgj.setQmrMc(qmr.getNickName()); gspRkjlJcgj.setRemark(form.getQmbz()); @@ -109,7 +115,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl @Override public void sd(GspSdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -125,14 +132,19 @@ public class GspRkjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "锁定供试品入库记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "锁定供试品入库记录", "Lock", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void js(GspJsForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -148,14 +160,19 @@ public class GspRkjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "解锁供试品入库记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "解锁供试品入库记录", "Unlock", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void plsd(GspSdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -176,13 +193,19 @@ public class GspRkjlServiceImpl extends ServiceImpl impl gspRkjlJcgj.setGspRkjlId(gspRkjl.getId()); gspRkjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspRkjlJcgj.setJcmc("锁定供试品入库记录"); + gspRkjlJcgj.setJcmcEn("Lock"); gspRkjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspRkjlJcgj.setJcnr(JctUtil.formatStr(formData)); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgj.setJcnrEn(JctUtil.formatStr(formDataEn)); + gspRkjlJcgj.setQmrId(SecurityUtils.getUserId()); gspRkjlJcgj.setQmrMc(SecurityUtils.getNickName()); + gspRkjlJcgj.setQmrMcEn(SecurityUtils.getUsername()); gspRkjlJcgjList.add(gspRkjlJcgj); //endregion @@ -194,7 +217,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl @Override public void jd(GspJdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -211,14 +235,19 @@ public class GspRkjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void plgd(GspGdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -243,14 +272,18 @@ public class GspRkjlServiceImpl extends ServiceImpl impl gspRkjlJcgj.setGspRkjlId(gspRkjl.getId()); gspRkjlJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspRkjlJcgj.setJcmc("申请归档"); + gspRkjlJcgj.setJcmcEn("Apply for Archiving"); gspRkjlJcgj.setJcmcys(JcmcysEnum.green.getValue()); Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请归档"); - formData.put("签名人", qmr.getNickName()); gspRkjlJcgj.setJcnr(JctUtil.formatStr(formData)); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgj.setJcnrEn(JctUtil.formatStr(formDataEn)); gspRkjlJcgj.setQmrId(SecurityUtils.getUserId()); gspRkjlJcgj.setQmrMc(SecurityUtils.getNickName()); + gspRkjlJcgj.setQmrMcEn(SecurityUtils.getUsername()); gspRkjlJcgjList.add(gspRkjlJcgj); //endregion @@ -263,7 +296,8 @@ public class GspRkjlServiceImpl extends ServiceImpl impl @Override public void gd(GspGdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -282,16 +316,19 @@ public class GspRkjlServiceImpl extends ServiceImpl impl //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请归档"); - formData.put("签名人", qmr.getNickName()); - gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档","Apply for Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void jy(GspJyForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -315,9 +352,13 @@ public class GspRkjlServiceImpl extends ServiceImpl impl formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); formData.put("备注", form.getRemark()); - formData.put("签名意义", "申请借阅"); - formData.put("签名人", qmr.getNickName()); - gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Start Date", DateUtils.dateTime(form.getStartDate())); + formDataEn.put("End Date", DateUtils.dateTime(form.getEndDate())); + formDataEn.put("Comment", form.getRemark()); + gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out", + JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java index 73d2287..d4c6f1a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java @@ -11,7 +11,6 @@ import com.hxhq.business.domain.*; import com.hxhq.business.dto.gsp.GspListDto; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gsp.*; -import com.hxhq.business.form.gyzj.SearchForm; import com.hxhq.business.service.*; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; @@ -88,7 +87,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Override public void save(GspForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); Gsp gsp = new Gsp(); BeanUtils.copyProperties(form, gsp); @@ -103,6 +102,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspJcgj.setGspId(gsp.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspJcgj.setJcmc("新增供试品"); + gspJcgj.setJcmcEn("Add Test"); gspJcgj.setJcmcys(JcmcysEnum.blue.getValue()); gspJcgj.setRemark(form.getQmbz()); gspJcgj.setQmrId(qmr.getUserId()); @@ -114,8 +114,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Transactional(rollbackFor = Exception.class) public void edit(GspBjForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo - + sysUserService.checkPassword(qmr, form.getQmrmm(), false); Gsp gspOld = this.getById(form.getId()); if(gspOld == null) { @@ -152,10 +151,13 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspJcgj.setGspId(gspOld.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspJcgj.setJcmc("申请编辑"); + gspJcgj.setJcmcEn("Apply for Edit"); gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); gspJcgj.setJcnr(fieldChange.toString()); + gspJcgj.setJcnrEn(fieldChange.toEnString()); gspJcgj.setQmrId(qmr.getUserId()); gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setQmrMcEn(qmr.getUserName()); gspJcgj.setRemark(form.getBjbz()); gspJcgjList.add(gspJcgj); } @@ -167,7 +169,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Transactional(rollbackFor = Exception.class) public void shbj(GspShbjForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -194,9 +197,15 @@ public class GspServiceImpl extends ServiceImpl implements IGspS Map formData = new LinkedHashMap<>(); formData.put("申请备注", gspOld.getBjbz()); formData.put("审核备注", form.getRemark()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Application Comment", gspOld.getBjbz()); + formDataEn.put("Approve Comment", form.getRemark()); gspJcgj.setJcnr(JctUtil.formatStr(formData)); + gspJcgj.setJcnrEn(JctUtil.formatStr(formDataEn)); gspJcgj.setQmrId(qmr.getUserId()); gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setQmrMcEn(qmr.getUserName()); gspJcgjService.save(gspJcgj); //endregion @@ -232,7 +241,10 @@ public class GspServiceImpl extends ServiceImpl implements IGspS SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); SysUser ffr1 = sysUserService.selectUserById(form.getFfrId()); - //验证领取人1,领取人2,发放人密码 todo + sysUserService.checkPassword(lqr1, form.getLqr1mm(), true); + sysUserService.checkPassword(lqr2, form.getLqr2mm(), true); + sysUserService.checkPassword(ffr1, form.getFfrmm(), true); + Zcg zcg = zcgService.getById(form.getZcgId()); if (zcg == null) { throw new ServiceException("暂存柜不存在或已删除"); @@ -261,17 +273,29 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspJcgj.setGspId(gsp.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspJcgj.setJcmc("钥匙发放"); + gspJcgj.setJcmcEn("Key Distribution"); gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); formData.put("钥匙1领取人", lqr1.getNickName()); - formData.put("钥匙2领取人", lqr2.getNickName()); + if(lqr2 != null) { + formData.put("钥匙2领取人", lqr2.getNickName()); + } formData.put("发放人", ffr1.getNickName()); + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + formDataEn.put("Key Recipient", lqr1.getUserName()); + if(lqr2 != null) { + formDataEn.put("Key Recipient 2", lqr2.getUserName()); + } + formDataEn.put("Issuer", ffr1.getUserName()); + gspJcgj.setJcnr(JctUtil.formatStr(formData)); gspJcgj.setQmrId(SecurityUtils.getUserId()); gspJcgj.setQmrMc(SecurityUtils.getNickName()); + gspJcgj.setQmrMcEn(SecurityUtils.getUsername()); gspJcgjList.add(gspJcgj); //endregion } @@ -289,6 +313,22 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Override public void ff(FfGspForm form) { + //验证领取人1、领取人2、发放人1、发放人2密码 + SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); + sysUserService.checkPassword(lqr1, form.getLqr1mm(), true); + SysUser lqr2 = null; + if(form.getLqr2Id() != null) { + lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + sysUserService.checkPassword(lqr2, form.getLqr2mm(), true); + } + SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); + sysUserService.checkPassword(ffr1, form.getFfr1mm(), true); + SysUser ffr2 = null; + if(form.getFfr2Id() != null) { + ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + sysUserService.checkPassword(ffr2, form.getFfr2mm(), true); + } + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -299,11 +339,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS if (!gspOld.getZjzt().equals(ZjztEnum.rk.getValue())) { throw new ServiceException("供试品【" + gspOld.getMc() + "】不是入库状态，不能发放"); } - SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); - SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); - SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - //验证领取人1、领取人2、发放人1、发放人2密码 todo + Date now = new Date(); gspFfjlService.ff(gspOld.getKc(), gspOld.getKcdw(), form.getZytj(),form.getRemark(),form.getMdIds(),gspOld,lqr1,lqr2,ffr1,ffr2,now); //region 稽查轨迹 @@ -312,21 +348,19 @@ public class GspServiceImpl extends ServiceImpl implements IGspS formData.put("转移条件", form.getZytj()); formData.put("目的", form.getMdIds()); formData.put("备注", form.getRemark()); - gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), - SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Out Amount", gspOld.getKc()+ gspOld.getKcdw()); + formDataEn.put("Transfer Condition", form.getZytj()); + formDataEn.put("Purpose", form.getMdIds()); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", "Distribution", JcmcysEnum.green.getValue(), + JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), + ffr1); //endregion //region 台账 - String lqrMc = lqr1.getNickName(); - if(lqr2 != null) { - lqrMc = lqrMc + "," + lqr2.getNickName(); - } - String ffrMc = ffr1.getNickName(); - if(ffr2 != null) { - ffrMc = ffrMc + "," + ffr2.getNickName(); - } - gspTzService.saveTz(gspOld.getId(), lqrMc, "", - ffrMc, "", null, "", - "领取发放", gspOld.getKc(), gspOld.getKcdw(), form.getRemark()); + gspTzService.saveFfTz(gspOld.getId(), lqr1, lqr2, ffr1,ffr2, ffr1, "领取发放", + "Distribution", gspOld.getKc(), gspOld.getKcdw(), form.getRemark()); //endregion //region 更新发放信息 gspOld.setFfzytj(form.getZytj()); @@ -353,11 +387,21 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Override @Transactional(rollbackFor = Exception.class) public void plff(GspPlffForm form) { + //验证领取人1、领取人2、发放人1、发放人2密码 SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id()); - SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + sysUserService.checkPassword(lqr1, form.getLqr1mm(), true); + SysUser lqr2 = null; + if(form.getLqr2Id() != null) { + lqr2 = sysUserService.selectUserById(form.getLqr2Id()); + sysUserService.checkPassword(lqr2, form.getLqr2mm(), true); + } SysUser ffr1 = sysUserService.selectUserById(form.getFfr1Id()); - SysUser ffr2 = sysUserService.selectUserById(form.getFfr2Id()); - //验证领取人1、领取人2、发放人1、发放人2密码 todo + sysUserService.checkPassword(ffr1, form.getFfr1mm(), true); + SysUser ffr2 = null; + if(form.getFfr2Id() != null) { + ffr2 = sysUserService.selectUserById(form.getFfr2Id()); + sysUserService.checkPassword(ffr2, form.getFfr2mm(), true); + } List gspIdList = form.getList().stream().map(GspPlffItem::getId).collect(Collectors.toList()); @@ -382,6 +426,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspJcgj.setGspId(gsp.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspJcgj.setJcmc("领取发放"); + gspJcgj.setJcmcEn("Distribution"); gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); Map formData = new LinkedHashMap<>(); formData.put("出库量", gsp.getKc()+ gsp.getKcdw()); @@ -389,32 +434,44 @@ public class GspServiceImpl extends ServiceImpl implements IGspS formData.put("目的", plffItemFilter.get(0).getMdIds()); formData.put("备注", plffItemFilter.get(0).getRemark()); gspJcgj.setJcnr(JctUtil.formatStr(formData)); + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Out Amount", gsp.getKc()+ gsp.getKcdw()); + formDataEn.put("Transfer Condition", plffItemFilter.get(0).getZytj()); + formDataEn.put("Purpose", plffItemFilter.get(0).getMdIds()); + formDataEn.put("Comment", plffItemFilter.get(0).getRemark()); + gspJcgj.setJcnrEn(JctUtil.formatStr(formDataEn)); gspJcgj.setQmrId(SecurityUtils.getUserId()); gspJcgj.setQmrMc(SecurityUtils.getNickName()); + gspJcgj.setQmrMcEn(SecurityUtils.getUsername()); gspJcgjList.add(gspJcgj); //endregion //region 台账 GspTz gspTz = new GspTz(); gspTz.setGspId(gsp.getId()); - gspTz.setLqrMc(lqr1.getNickName() + "," + lqr2.getNickName()); - gspTz.setFfrMc(ffr1.getNickName() + "," + ffr2.getNickName()); + gspTz.setLqrMc(lqr2 == null ? lqr1.getNickName() : lqr1.getNickName() + "," + lqr2.getNickName()); + gspTz.setLqrMcEn(lqr2 == null ? lqr1.getUserName() : lqr1.getUserName() + "," + lqr2.getUserName()); + gspTz.setFfrMc(ffr2 == null ? ffr1.getNickName() : ffr1.getNickName() + "," + ffr2.getNickName()); + gspTz.setFfrMcEn(ffr2 == null ? ffr1.getUserName() : ffr1.getUserName() + "," + ffr2.getUserName()); gspTz.setQmyy("领取发放"); + gspTz.setQmyyEn("Distribution"); gspTz.setCzl(gsp.getKc()); gspTz.setCzldw(gsp.getKcdw()); + gspTz.setQmrId(ffr1.getUserId()); + gspTz.setQmrMc(ffr1.getNickName()); + gspTz.setQmrMcEn(ffr1.getUserName()); gspTz.setRemark(plffItemFilter.get(0).getRemark()); mjyTzList.add(gspTz); //endregion //region 更新发放信息 gsp.setFfzytj(plffItemFilter.get(0).getZytj()); gsp.setLqr1Id(lqr1.getUserId()); - gsp.setLqr2Id(lqr2.getUserId()); - gsp.setFfr1Id(ffr1.getUserId()); - gsp.setFfr2Id(ffr2.getUserId()); gsp.setLqr1Mc(lqr1.getNickName()); - gsp.setLqr2Mc(lqr2.getNickName()); + gsp.setLqr2Id(lqr2 == null ? null : lqr2.getUserId()); + gsp.setLqr2Mc(lqr2 == null ? "" : lqr2.getNickName()); + gsp.setFfr1Id(ffr1.getUserId()); gsp.setFfr1Mc(ffr1.getNickName()); - gsp.setFfr2Mc(ffr2.getNickName()); - gsp.setFfr2Mc(ffr2.getNickName()); + gsp.setFfr2Id(ffr2 == null ? null : ffr2.getUserId()); + gsp.setFfr2Mc(ffr2 == null ? "" : ffr2.getNickName()); gsp.setFfrq(now); gsp.setFfbz(plffItemFilter.get(0).getRemark()); gsp.setMdIds(plffItemFilter.get(0).getMdIds()); @@ -433,7 +490,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Transactional(rollbackFor = Exception.class) public void xgkc(GspXgkcForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -458,10 +515,12 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspJcgj.setGspId(gspOld.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspJcgj.setJcmc("修改库存申请"); + gspJcgj.setJcmcEn("Apply for Change Inventory"); gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); gspJcgj.setJcnr(fieldChange.toString()); gspJcgj.setQmrId(qmr.getUserId()); gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setQmrMcEn(qmr.getUserName()); gspJcgj.setRemark(form.getKcbjbz()); gspJcgjList.add(gspJcgj); } @@ -482,8 +541,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Transactional(rollbackFor = Exception.class) public void shxgkc(GspShxgkcForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo - if (form.getId() == null || form.getId().longValue() < 0) { + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + + if (form.getId() == null || form.getId() < 0) { throw new ServiceException("参数id不正确"); } Gsp gspOld = this.getById(form.getId()); @@ -500,18 +560,27 @@ public class GspServiceImpl extends ServiceImpl implements IGspS GspJcgj gspJcgj = new GspJcgj(); gspJcgj.setGspId(gspOld.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); - gspJcgj.setJcmc( ShXgkcEnum.getEnumByValue(form.getQmyy()).getText()); if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { + gspJcgj.setJcmc( ShXgkcEnum.ty.getText()); + gspJcgj.setJcmcEn("Approve Inventory Change"); gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); } else { + gspJcgj.setJcmc( ShXgkcEnum.jj.getText()); + gspJcgj.setJcmcEn("Reject Inventory Change"); gspJcgj.setJcmcys(JcmcysEnum.red.getValue()); } Map formData = new LinkedHashMap<>(); formData.put("申请备注", gspOld.getKcbjbz()); formData.put("审核备注", form.getRemark()); gspJcgj.setJcnr(JctUtil.formatStr(formData)); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Application Comment", gspOld.getBjbz()); + formDataEn.put("Approve Comment", form.getRemark()); + gspJcgj.setJcnrEn(JctUtil.formatStr(formDataEn)); gspJcgj.setQmrId(qmr.getUserId()); gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setQmrMcEn(qmr.getUserName()); gspJcgjService.save(gspJcgj); //endregion @@ -529,9 +598,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS //region 台账 if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) { - gspTzService.saveTz(gspOld.getId(), "", "", - "", "", qmr.getUserId(), qmr.getNickName(), - "修改库存", form.getKc(), form.getKcdw(), gspOld.getKcbjbz()); + gspTzService.saveTz(gspOld.getId(), qmr, + "修改库存", "Change Inventory", form.getKc(), form.getKcdw(), gspOld.getKcbjbz()); } //endregion } @@ -539,7 +607,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Override public void plsd(GspSdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getIds() == null || form.getIds().length < 0) { throw new ServiceException("参数ids不正确"); } @@ -559,12 +628,18 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspJcgj.setGspId(gsp.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.lc.getValue()); gspJcgj.setJcmc("锁定供试品"); + gspJcgj.setJcmcEn("Lock"); gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); gspJcgj.setJcnr(JctUtil.formatStr(formData)); - gspJcgj.setQmrId(SecurityUtils.getUserId()); - gspJcgj.setQmrMc(SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgj.setJcnrEn(JctUtil.formatStr(formDataEn)); + gspJcgj.setQmrId(qmr.getUserId()); + gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setQmrMcEn(qmr.getUserName()); gspJcgjList.add(gspJcgj); //endregion @@ -576,7 +651,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Override public void sd(GspSdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -592,13 +667,18 @@ public class GspServiceImpl extends ServiceImpl implements IGspS //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "锁定供试品", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "锁定供试品", "Lock ", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void js(GspJsForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -615,14 +695,19 @@ public class GspServiceImpl extends ServiceImpl implements IGspS //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "解锁供试品", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "解锁供试品", "Unlock ", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override @Transactional(rollbackFor = Exception.class) public void cz(GspCzForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId() < 0) { throw new SecurityException("参数id不正确"); } @@ -645,31 +730,38 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspOld.setKc(kc.toString()); updateById(gspOld); - LinkedHashMap jcnrMap = new LinkedHashMap<>(); - jcnrMap.put("处置方式", form.getCzfs()); - jcnrMap.put("处置量", form.getCzl()); - jcnrMap.put("原因", form.getRemark()); + GspJcgj gspJcgj = new GspJcgj(); gspJcgj.setGspId(gspOld.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.bj.getValue()); gspJcgj.setJcmc("处置"); + gspJcgj.setJcmcEn("Dispose"); + LinkedHashMap jcnrMap = new LinkedHashMap<>(); + jcnrMap.put("处置方式", form.getCzfs()); + jcnrMap.put("处置量", form.getCzl()); + jcnrMap.put("原因", form.getRemark()); gspJcgj.setJcnr(JctUtil.formatStr(jcnrMap)); + LinkedHashMap jcnrMapEn = new LinkedHashMap<>(); + jcnrMapEn.put("Dispose Method", form.getCzfs()); + jcnrMapEn.put("Amount", form.getCzl()); + jcnrMapEn.put("Reason", form.getRemark()); + gspJcgj.setJcnrEn(JctUtil.formatStr(jcnrMapEn)); gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); gspJcgj.setQmrId(qmr.getUserId()); gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setQmrMcEn(qmr.getUserName()); gspJcgjService.save(gspJcgj); // 台账 - gspTzService.saveTz(gspOld.getId(), null, null, null, null, qmr.getUserId(), qmr.getNickName(), - "处置", form.getCzl(), gspOld.getKcdw(), form.getRemark()); + gspTzService.saveTz(gspOld.getId(), qmr, + "处置", "Dispose", form.getCzl(), gspOld.getKcdw(), form.getRemark()); } @Override public void plcz(GspPlczForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo - + sysUserService.checkPassword(qmr, form.getQmrmm(), false); List gspList = new ArrayList<>(); Map map = new HashMap<>(); for (GspPlczItemForm itemForm : form.getList()) { @@ -704,18 +796,25 @@ public class GspServiceImpl extends ServiceImpl implements IGspS for (GspPlczItemForm itemForm : form.getList()) { Gsp gsp = map.get(itemForm.getId()); - LinkedHashMap jcnrMap = new LinkedHashMap<>(); - jcnrMap.put("处置方式", itemForm.getCzfs()); - jcnrMap.put("处置量", itemForm.getCzl()); - jcnrMap.put("原因", itemForm.getRemark()); GspJcgj gspJcgj = new GspJcgj(); gspJcgj.setGspId(gsp.getId()); gspJcgj.setJcgjlx(JcgjlxEnum.bj.getValue()); gspJcgj.setJcmc("处置"); + gspJcgj.setJcmcEn("Dispose"); + LinkedHashMap jcnrMap = new LinkedHashMap<>(); + jcnrMap.put("处置方式", itemForm.getCzfs()); + jcnrMap.put("处置量", itemForm.getCzl()); + jcnrMap.put("原因", itemForm.getRemark()); gspJcgj.setJcnr(JctUtil.formatStr(jcnrMap)); + LinkedHashMap jcnrMapEn = new LinkedHashMap<>(); + jcnrMapEn.put("Dispose Method", itemForm.getCzfs()); + jcnrMapEn.put("Amount", itemForm.getCzl()); + jcnrMapEn.put("Reason", itemForm.getRemark()); + gspJcgj.setJcnrEn(JctUtil.formatStr(jcnrMapEn)); gspJcgj.setJcmcys(JcmcysEnum.green.getValue()); gspJcgj.setQmrId(qmr.getUserId()); gspJcgj.setQmrMc(qmr.getNickName()); + gspJcgj.setQmrMcEn(qmr.getUserName()); gspJcgjList.add(gspJcgj); // 台账 @@ -723,7 +822,9 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspTz.setGspId(gsp.getId()); gspTz.setQmrId(qmr.getUserId()); gspTz.setQmrMc(qmr.getNickName()); + gspTz.setQmrMcEn(qmr.getUserName()); gspTz.setQmyy("处置"); + gspTz.setQmyyEn("Dispose"); gspTz.setCzl(itemForm.getCzl()); gspTz.setCzldw(gsp.getKcdw()); gspTz.setRemark(itemForm.getRemark()); @@ -736,7 +837,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Override public void jy(GspJyForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); } @@ -760,14 +861,21 @@ public class GspServiceImpl extends ServiceImpl implements IGspS formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate())); formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate())); formData.put("备注", form.getRemark()); - gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), qmr.getUserId(), qmr.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Start Date", DateUtils.dateTime(form.getStartDate())); + formDataEn.put("End Date", DateUtils.dateTime(form.getEndDate())); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out", + JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void jd(GspJdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); + if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); } @@ -784,13 +892,17 @@ public class GspServiceImpl extends ServiceImpl implements IGspS //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), qmr.getUserId(), qmr.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "申请解档", + JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void gd(GspGdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo + sysUserService.checkPassword(qmr, form.getQmrmm(), false); if (form.getId() == null || form.getId().longValue() < 0) { throw new SecurityException("参数id不正确"); } @@ -807,15 +919,18 @@ public class GspServiceImpl extends ServiceImpl implements IGspS //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), qmr.getUserId(), qmr.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } @Override public void plgd(GspGdForm form) { SysUser qmr = sysUserService.selectUserById(form.getQmrId()); - //验证签名人密码 todo - + sysUserService.checkPassword(qmr, form.getQmrmm(), false); List gspList = new ArrayList<>(); for (Long id : form.getIds()) { if (id == null || id < 0) { @@ -838,7 +953,11 @@ public class GspServiceImpl extends ServiceImpl implements IGspS for (Gsp gsp : gspList) { Map formData = new LinkedHashMap<>(); formData.put("备注", form.getRemark()); - gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), qmr.getUserId(), qmr.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr); } } @@ -846,11 +965,19 @@ public class GspServiceImpl extends ServiceImpl implements IGspS @Transactional(rollbackFor = Exception.class) public void gh(GspGhForm form) { SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id()); - SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id()); + sysUserService.checkPassword(ghr1, form.getGhr1mm(), true); + SysUser ghr2 = null; + if(form.getGhr2Id() != null) { + ghr2 = sysUserService.selectUserById(form.getGhr2Id()); + sysUserService.checkPassword(ghr2, form.getGhr2mm(), true); + } SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id()); - SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id()); - SysUser qmr = sysUserService.selectUserById(form.getJsr1Id()); - //验证密码 todo + sysUserService.checkPassword(jsr1, form.getJsr1mm(), true); + SysUser jsr2 = null; + if(form.getJsr2Id() != null) { + jsr2 = sysUserService.selectUserById(form.getJsr2Id()); + sysUserService.checkPassword(jsr2, form.getJsr2mm(), true); + } if (form.getId() == null || form.getId().longValue() < 0) { throw new ServiceException("参数id不正确"); } @@ -868,17 +995,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS gspFfjlService.gh(form,gspOld,ghr1,ghr2,jsr1,jsr2); //region 台账 - String ghrMc = ghr1.getNickName(); - if(ghr2 != null) { - ghrMc = ghrMc + "," + ghr2.getNickName(); - } - String jsrMc = jsr1.getNickName(); - if(jsr2 != null) { - jsrMc = jsrMc + "," + jsr2.getNickName(); - } - gspTzService.saveTz(gspOld.getId(), "", ghrMc, - "", jsrMc, null, null, - "归还", gspOld.getKc(), gspOld.getKcdw(), form.getRemark()); + gspTzService.saveGhTz(gspOld.getId(),ghr1, ghr2, jsr1, jsr2, jsr1, + "归还", "Return", gspOld.getKc(), gspOld.getKcdw(), form.getRemark()); //endregion //region 稽查轨迹 Map formData = new LinkedHashMap<>(); @@ -893,7 +1011,21 @@ public class GspServiceImpl extends ServiceImpl implements IGspS formData.put("库管员2", jsr2.getNickName()); } formData.put("备注", form.getRemark()); - gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + + Map formDataEn = new LinkedHashMap<>(); + formDataEn.put("Transfer Condition", form.getGhzytj()); + formDataEn.put("Amount out", form.getRkl()+form.getRkldw()); + formDataEn.put("Returner", ghr1.getNickName()); + if(ghr2 != null) { + formDataEn.put("Returner 2", ghr2.getNickName()); + } + formDataEn.put("Warehouse Keeper", jsr1.getNickName()); + if(jsr2 != null) { + formDataEn.put("Warehouse Keeper 2", jsr2.getNickName()); + } + formDataEn.put("Comment", form.getRemark()); + gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "归还", "Return", + JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), jsr1); //endregion } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspTzServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspTzServiceImpl.java index 4585836..5046b1e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspTzServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspTzServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.MjyTz; import com.hxhq.business.domain.SjTz; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.GspTzMapper; import com.hxhq.business.domain.GspTz; @@ -39,16 +40,53 @@ public class GspTzServiceImpl extends ServiceImpl implements } @Override - public void saveTz(Long gspId, String lqrMc, String ghrMc, String ffrMc, String jsrMc, Long qmrId, String qmrMc, String qmyy, String czl, String czldw, String remark) { + public void saveTz(Long gspId, SysUser qmr, String qmyy, String qmyyEn, String czl, String czldw, String remark) { GspTz gspTz = new GspTz(); gspTz.setGspId(gspId); - gspTz.setLqrMc(lqrMc); - gspTz.setGhrMc(ghrMc); - gspTz.setFfrMc(ffrMc); - gspTz.setJsrMc(jsrMc); - gspTz.setQmrId(qmrId); - gspTz.setQmrMc(qmrMc); + gspTz.setQmrId(qmr.getUserId()); + gspTz.setQmrMc(qmr.getNickName()); + gspTz.setQmrMcEn(qmr.getUserName()); gspTz.setQmyy(qmyy); + gspTz.setQmyyEn(qmyyEn); + gspTz.setCzldw(czldw); + gspTz.setCzl(czl); + gspTz.setRemark(remark); + this.save(gspTz); + } + + @Override + public void saveFfTz(Long gspId, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, SysUser qmr, String qmyy, String qmyyEn, + String czl, String czldw, String remark){ + GspTz gspTz = new GspTz(); + gspTz.setGspId(gspId); + gspTz.setLqrMc(lqr2 == null ? lqr1.getNickName() : lqr1.getNickName() + "," + lqr2.getNickName()); + gspTz.setLqrMcEn(lqr2 == null ? lqr1.getUserName() : lqr1.getUserName() + "," + lqr2.getUserName()); + gspTz.setFfrMc(ffr2 == null ? ffr1.getNickName() : ffr1.getNickName() + "," + ffr2.getNickName()); + gspTz.setFfrMcEn(ffr2 == null ? ffr1.getUserName() : ffr1.getUserName() + "," + ffr2.getUserName()); + gspTz.setQmrId(qmr.getUserId()); + gspTz.setQmrMc(qmr.getNickName()); + gspTz.setQmrMcEn(qmr.getUserName()); + gspTz.setQmyy(qmyy); + gspTz.setQmyyEn(qmyyEn); + gspTz.setCzldw(czldw); + gspTz.setCzl(czl); + gspTz.setRemark(remark); + this.save(gspTz); + } + + @Override + public void saveGhTz(Long gspId, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String qmyyEn, String czl, String czldw, String remark) { + GspTz gspTz = new GspTz(); + gspTz.setGspId(gspId); + gspTz.setGhrMc(ghr2 == null ? ghr1.getNickName() : ghr1.getNickName() + "," + ghr2.getNickName()); + gspTz.setGhrMcEn(ghr2 == null ? ghr1.getUserName() : ghr1.getUserName() + "," + ghr2.getUserName()); + gspTz.setJsrMc(jsr2 == null ? jsr1.getNickName() : jsr1.getNickName() + "," + jsr2.getNickName()); + gspTz.setFfrMcEn(jsr2 == null ? jsr1.getUserName() : jsr1.getUserName() + "," + jsr2.getUserName()); + gspTz.setQmrId(qmr.getUserId()); + gspTz.setQmrMc(qmr.getNickName()); + gspTz.setQmrMcEn(qmr.getUserName()); + gspTz.setQmyy(qmyy); + gspTz.setQmyyEn(qmyyEn); gspTz.setCzldw(czldw); gspTz.setCzl(czl); gspTz.setRemark(remark); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqJcgjServiceImpl.java index 1e0c6ca..ae22cb5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqJcgjServiceImpl.java @@ -49,16 +49,19 @@ public class YqJcgjServiceImpl extends ServiceImpl impleme } @Override - public void saveJcgj(Long yqId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr) { + public void saveJcgj(Long yqId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn) { SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); YqJcgj yqJcgj = new YqJcgj(); yqJcgj.setYqId(yqId); yqJcgj.setJcgjlx(jcgjlx); yqJcgj.setJcmc(jcmc); + yqJcgj.setJcmcEn(jcmcEn); yqJcgj.setJcmcys(jcmcys); yqJcgj.setJcnr(jcnr); + yqJcgj.setJcnrEn(jcnrEn); yqJcgj.setQmrId(sysUser.getUserId()); yqJcgj.setQmrMc(sysUser.getNickName()); + yqJcgj.setQmrMcEn(sysUser.getUserName()); this.save(yqJcgj); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java index c5b9f66..9f7a153 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/YqServiceImpl.java @@ -20,6 +20,7 @@ import com.hxhq.business.utils.ObjectCompareUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.security.utils.SecurityUtils; import com.hxhq.system.api.domain.SysUser; +import com.hxhq.system.service.ISysUserService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,6 +42,9 @@ public class YqServiceImpl extends ServiceImpl implements IYqServi @Autowired private IYqJcgjService yqJcgjService; + @Autowired + private ISysUserService sysUserService; + /** * 查询仪器管理列表 * @return 仪器管理 @@ -66,16 +70,19 @@ public class YqServiceImpl extends ServiceImpl implements IYqServi @Override public void addYq(YqForm yqForm) { + SysUser qmr = sysUserService.selectUserById(yqForm.getQmrId()); + sysUserService.checkPassword(qmr, yqForm.getQmrmm(), false); Yq yq = new Yq(); BeanUtils.copyProperties(yqForm, yq); save(yq); - yqJcgjService.saveJcgj(yq.getId(), JcgjlxEnum.bj.getValue(), "新增仪器", JcmcysEnum.blue.getValue(), null); + yqJcgjService.saveJcgj(yq.getId(), JcgjlxEnum.bj.getValue(), "新增仪器", "Add Instrument", JcmcysEnum.blue.getValue(), null, null); } @Override @Transactional(rollbackFor = Exception.class) public void updateYq(YqForm yqForm) { - SysUser sysUser = SecurityUtils.getLoginUser().getSysUser(); + SysUser qmr = sysUserService.selectUserById(yqForm.getQmrId()); + sysUserService.checkPassword(qmr, yqForm.getQmrmm(), false); Yq yq = getById(yqForm.getId()); if(yq == null) { @@ -96,11 +103,13 @@ public class YqServiceImpl extends ServiceImpl implements IYqServi yqJcgj.setYqId(yq.getId()); yqJcgj.setJcgjlx(JcgjlxEnum.bj.getValue()); yqJcgj.setJcmc("编辑仪器"); - yqJcgj.setQmyy("编辑"); + yqJcgj.setJcmcEn("Edit Instrument Information"); yqJcgj.setJcmcys(JcmcysEnum.orange.getValue()); yqJcgj.setJcnr(fieldChange.toString()); - yqJcgj.setQmrId(sysUser.getUserId()); - yqJcgj.setQmrMc(sysUser.getNickName()); + yqJcgj.setJcnrEn(fieldChange.toEnString()); + yqJcgj.setQmrId(qmr.getUserId()); + yqJcgj.setQmrMc(qmr.getNickName()); + yqJcgj.setQmrMcEn(qmr.getUserName()); yqJcgjList.add(yqJcgj); } yqJcgjService.saveBatch(yqJcgjList);