From 60022912924e15b6a2dff89cf32c45971c3c3374 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 15 Jan 2026 12:58:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/domain/Gyzj.java | 10 +-- .../main/java/com/hxhq/business/domain/Mjy.java | 8 +-- .../com/hxhq/business/domain/StudyFormApply.java | 6 +- .../com/hxhq/business/domain/StudyFormFill.java | 4 +- .../com/hxhq/business/domain/StudyFormPlan.java | 4 +- .../com/hxhq/business/domain/StudyFormPre.java | 13 ++-- .../java/com/hxhq/business/utils/GyzjJcnrUtil.java | 84 +++++++++++----------- .../java/com/hxhq/business/utils/MjyJcnrUtil.java | 78 ++++++++++---------- .../com/hxhq/business/utils/StudyFormUtil.java | 26 +++---- 9 files changed, 118 insertions(+), 115 deletions(-) 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 00d78dd..538089f 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 @@ -25,7 +25,7 @@ public class Gyzj extends MpBaseEntity private static final long serialVersionUID = 1L; /** 名称 */ - @Compare(name = "名称") + @Compare(name = "名称",nameEn = "Name") private String mc; /** 编号 */ @@ -36,19 +36,19 @@ public class Gyzj extends MpBaseEntity private String nd; /** 浓度单位 */ - @Compare(name = "浓度单位",nameEn = "Concentration") + @Compare(name = "浓度单位",nameEn = "Concentration Unit") private String nddw; /** 库存 */ - @Compare(name = "库存",nameEn = "Concentration") + @Compare(name = "库存",nameEn = "Inventory") private String kc; /** 库存单位 */ - @Compare(name = "库存单位",nameEn = "Concentration") + @Compare(name = "库存单位",nameEn = "Inventory Unit") private String kcdw; /** 失效日期 */ - @Compare(name = "失效日期",nameEn = "Concentration") + @Compare(name = "失效日期",nameEn = "Expiration") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxrq; 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 bcc6c5f..9e3f044 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 @@ -23,7 +23,7 @@ public class Mjy extends MpBaseEntity private static final long serialVersionUID = 1L; /** 名称 */ - @Compare(name = "名称") + @Compare(name = "名称",nameEn = "Name") private String mc; /** 编号 */ @@ -34,7 +34,7 @@ public class Mjy extends MpBaseEntity private String nd; /** 浓度单位 */ - @Compare(name = "浓度单位",nameEn = "todo") + @Compare(name = "浓度单位",nameEn = "Concentration Unit") private String nddw; /** 库存 */ @@ -42,11 +42,11 @@ public class Mjy extends MpBaseEntity private String kc; /** 库存单位 */ - @Compare(name = "库存单位",nameEn = "todo") + @Compare(name = "库存单位",nameEn = "Inventory Unit") private String kcdw; /** 失效日期 */ - @Compare(name = "失效日期",nameEn = "todo") + @Compare(name = "失效日期",nameEn = "Expiration") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sxrq; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java index 3185914..cd0a82a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java @@ -30,11 +30,11 @@ public class StudyFormApply extends MpBaseEntity private String bdbh; /** 表单名称 */ - @Compare(name = "表单名称",nameEn = "Concentration") + @Compare(name = "表单名称",nameEn = "Preset Name") private String bdmc; /** 表单说明 */ - @Compare(name = "表单说明",nameEn = "Concentration") + @Compare(name = "表单说明",nameEn = "Preset Description") private String bdsm; /** 模板id */ @@ -53,7 +53,7 @@ public class StudyFormApply extends MpBaseEntity private String userMcEn; /** 是否补录 */ - @Compare(name = "是否补录",nameEn = "Concentration") + @Compare(name = "是否补录",nameEn = "是否补录") private String sfbl; /** 表单状态：1：填报中；3：已提交；5：已复核；6：未通过；7：已完成；9：待废止；11：已废止 */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java index 81baf06..10e96fe 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java @@ -31,11 +31,11 @@ public class StudyFormFill extends MpBaseEntity private String bdbh; /** 表单名称 */ - @Compare(name = "表单名称",nameEn = "Concentration") + @Compare(name = "表单名称",nameEn = "Preset Name") private String bdmc; /** 表单说明 */ - @Compare(name = "表单说明",nameEn = "Concentration") + @Compare(name = "表单说明",nameEn = "Preset Description") private String bdsm; /** 模板id */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java index ae85915..c1e34fe 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java @@ -28,11 +28,11 @@ public class StudyFormPlan extends MpBaseEntity private String bdbh; /** 表单名称 */ - @Compare(name = "表单名称",nameEn = "Concentration") + @Compare(name = "表单名称",nameEn = "Preset Name") private String bdmc; /** 表单说明 */ - @Compare(name = "表单说明",nameEn = "Concentration") + @Compare(name = "表单说明",nameEn = "Preset Description") private String bdsm; /** 模板id */ diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java index 425ec8d..5337019 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java @@ -31,11 +31,11 @@ public class StudyFormPre extends MpBaseEntity private String bdbh; /** 表单名称 */ - @Compare(name = "表单名称",nameEn = "Concentration") + @Compare(name = "表单名称",nameEn = "Preset Name") private String bdmc; /** 表单说明 */ - @Compare(name = "表单说明",nameEn = "Concentration") + @Compare(name = "表单说明",nameEn = "Preset Description") private String bdsm; /** 模板id */ @@ -56,8 +56,9 @@ public class StudyFormPre extends MpBaseEntity /** 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 */ private Integer bdzt; - /** 是否需要负责人审核：1：否；10：是 */ - private Integer fzrsh; + /** 是否需要负责人审核 */ + @Compare(name = "是否需要负责人审核",nameEn = "是否需要负责人审核") + private String fzrsh; /** 负责人审核状态：1：未审核；5：审核中；10：已审核 */ private Integer fzrshzt; @@ -176,11 +177,11 @@ public class StudyFormPre extends MpBaseEntity this.studySubjectId = studySubjectId; } - public Integer getFzrsh() { + public String getFzrsh() { return fzrsh; } - public void setFzrsh(Integer fzrsh) { + public void setFzrsh(String fzrsh) { this.fzrsh = fzrsh; } 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 index 6fce5f1..0a2e8db 100644 --- 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 @@ -17,64 +17,64 @@ public class GyzjJcnrUtil { 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"); - mapJcnr.put("钥匙2领取人","todo"); - mapJcnr.put("发放人","todo"); - mapJcnr.put("出库量","todo"); - mapJcnr.put("转移条件","todo"); - mapJcnr.put("出库毛重","todo"); + mapJcnr.put("借阅开始时间","Checkout Start Date"); + mapJcnr.put("借阅结束时间","Checkout End Date"); + mapJcnr.put("处置方式","Dispose Method"); + mapJcnr.put("处置原因","Reason"); + mapJcnr.put("处置量","Amount"); + mapJcnr.put("处置人","Operator"); + mapJcnr.put("复核人","Reviewer"); + mapJcnr.put("监督人","Supervisor"); + mapJcnr.put("钥匙1领取人","Key 1 User"); + mapJcnr.put("钥匙2领取人","Key 2 User"); + mapJcnr.put("发放人","Issuer"); + mapJcnr.put("出库量","Out Amount"); + mapJcnr.put("转移条件","Transfer Condition"); + mapJcnr.put("出库毛重","Check-out Gross Weight"); + mapJcnr.put("入库毛重","Check-in Gross Weight"); + mapJcnr.put("使用量","Usage Amount"); + mapJcnr.put("归还人1","Returner 1"); + mapJcnr.put("归还人2","Returner 2"); + mapJcnr.put("库管员1","Warehouse Keeper 1"); + mapJcnr.put("库管员2","Warehouse Keeper 2"); + mapJcnr.put("签名人1","Signed By 1"); + mapJcnr.put("签名人2","Signed By 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("归还人1","todo"); - mapJcnr.put("归还人2","todo"); - mapJcnr.put("库管员1","todo"); - mapJcnr.put("库管员2","todo"); - mapJcnr.put("入库净重","todo"); - mapJcnr.put("签名人1","todo"); - mapJcnr.put("签名人2","todo"); //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("申请解档","Apply for De-archiving"); + mapQmyy.put("申请借阅","Apply for Check-out"); + mapQmyy.put("申请归档","Apply for Archiving"); + mapQmyy.put("锁定给药制剂","Lock Drug"); + mapQmyy.put("解锁给药制剂","Unlock Drug"); + mapQmyy.put("处置药剂","Dispose Substance"); + mapQmyy.put("处置容器","Dispose Container"); + mapQmyy.put("钥匙发放","Issue Key"); + mapQmyy.put("申请编辑","Apply Edit"); + mapQmyy.put("同意编辑","Approve Edit"); + mapQmyy.put("拒绝编辑","Reject Edit"); + mapQmyy.put("修改库存申请","Apply Edit Inventory"); + mapQmyy.put("同意修改库存","Approve Edit Inventory"); + mapQmyy.put("拒绝修改库存","Reject Edit Inventory"); + mapQmyy.put("归还","Return"); + mapQmyy.put("确认归还","Confirm Check-in"); + mapQmyy.put("领取发放","Distribution"); + mapQmyy.put("锁定发放记录","todo"); mapQmyy.put("解锁发放记录","todo"); - mapQmyy.put("领取发放","todo"); mapQmyy.put("给药制剂入库","todo"); mapQmyy.put("同意入库","todo"); mapQmyy.put("拒绝入库","todo"); - - //endregion } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java index 0ca8a59..87c14f0 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java @@ -18,57 +18,59 @@ public class MjyJcnrUtil { 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"); - mapJcnr.put("钥匙2领取人","todo"); - mapJcnr.put("发放人","todo"); - mapJcnr.put("出库量","todo"); - mapJcnr.put("转移条件","todo"); - mapJcnr.put("出库毛重","todo"); + mapJcnr.put("借阅开始时间","Checkout Start Date"); + mapJcnr.put("借阅结束时间","Checkout End Date"); + mapJcnr.put("处置方式","Dispose Method"); + mapJcnr.put("处置原因","Reason"); + mapJcnr.put("处置量","Amount"); + mapJcnr.put("处置人","Operator"); + mapJcnr.put("复核人","Reviewer"); + mapJcnr.put("监督人","Supervisor"); + mapJcnr.put("钥匙1领取人","Key 1 User"); + mapJcnr.put("钥匙2领取人","Key 2 User"); + mapJcnr.put("发放人","Issuer"); + mapJcnr.put("出库量","Out Amount"); + mapJcnr.put("转移条件","Transfer Condition"); + mapJcnr.put("出库毛重","Check-out Gross Weight"); + mapJcnr.put("入库毛重","Check-in Gross Weight"); + mapJcnr.put("使用量","Usage Amount"); + mapJcnr.put("归还人1","Returner 1"); + mapJcnr.put("归还人2","Returner 2"); + mapJcnr.put("库管员1","Warehouse Keeper 1"); + mapJcnr.put("库管员2","Warehouse Keeper 2"); + mapJcnr.put("签名人1","Signed By 1"); + mapJcnr.put("签名人2","Signed By 2"); + mapJcnr.put("目的","todo"); mapJcnr.put("申请备注","todo"); mapJcnr.put("审核备注","todo"); mapJcnr.put("入库位置","todo"); mapJcnr.put("入库条件","todo"); mapJcnr.put("减少量","todo"); - mapJcnr.put("入库毛重","todo"); - mapJcnr.put("使用量","todo"); - mapJcnr.put("归还人1","todo"); - mapJcnr.put("归还人2","todo"); - mapJcnr.put("库管员1","todo"); - mapJcnr.put("库管员2","todo"); - mapJcnr.put("签名人1","todo"); - mapJcnr.put("签名人2","todo"); //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("申请解档","Apply for De-archiving"); + mapQmyy.put("申请借阅","Apply for Check-out"); + mapQmyy.put("申请归档","Apply for Archiving"); + mapQmyy.put("锁定麻精药","Lock Drug"); + mapQmyy.put("解锁麻精药","Unlock Drug"); + mapQmyy.put("处置药剂","Dispose Substance"); + mapQmyy.put("处置容器","Dispose Container"); + mapQmyy.put("钥匙发放","Issue Key"); + mapQmyy.put("申请编辑","Apply Edit"); + mapQmyy.put("同意编辑","Approve Edit"); + mapQmyy.put("拒绝编辑","Reject Edit"); + mapQmyy.put("修改库存申请","Apply Edit Inventory"); + mapQmyy.put("同意修改库存","Approve Edit Inventory"); + mapQmyy.put("拒绝修改库存","Reject Edit Inventory"); + mapQmyy.put("归还","Return"); + mapQmyy.put("领取发放","Distribution"); + mapQmyy.put("锁定发放记录","todo"); mapQmyy.put("解锁发放记录","todo"); - mapQmyy.put("领取发放","todo"); mapQmyy.put("麻精药入库","todo"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java index 79c0509..0e6293e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/StudyFormUtil.java @@ -17,21 +17,26 @@ public class StudyFormUtil { static { //region 稽查内容 - mapJcnr.put("字段名","todo"); - mapJcnr.put("原值","todo"); - mapJcnr.put("新值","todo"); - mapJcnr.put("原因","todo"); + mapJcnr.put("字段名","Field"); + mapJcnr.put("原值","Old Value"); + mapJcnr.put("新值","New Value"); + mapJcnr.put("原因","Reason"); + mapJcnr.put("生长情况","Growth Status"); + mapJcnr.put("新归属人","New Owner"); + mapJcnr.put("原归属人","Old Owner"); + mapJcnr.put("填入值","todo"); mapJcnr.put("填写人","todo"); mapJcnr.put("意见回复","todo"); mapJcnr.put("复核意见","todo"); - mapJcnr.put("生长情况","todo"); - mapJcnr.put("新归属人","todo"); - mapJcnr.put("原归属人","todo"); - //endregion //region 稽查名称 + mapQmyy.put("更换归属人","Change Owner"); + mapQmyy.put("良好","Good"); + mapQmyy.put("中","Average"); + mapQmyy.put("差","Bad"); + mapQmyy.put("修改","Edit"); mapQmyy.put("修改记录","todo"); mapQmyy.put("填写","todo"); @@ -40,12 +45,7 @@ public class StudyFormUtil { 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");