From 2cc2a70a82558ef9f6d225a74c800b3fc2110f70 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 19 Jan 2026 15:44:48 +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]=E5=A1=AB=E6=8A=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StudyFormApplyJcgjServiceImpl.java | 6 +- .../impl/StudyFormApplyQmxxServiceImpl.java | 2 +- .../service/impl/StudyFormApplyServiceImpl.java | 14 +-- .../service/impl/StudyFormFillJcgjServiceImpl.java | 6 +- .../service/impl/StudyFormFillQmxxServiceImpl.java | 2 +- .../service/impl/StudyFormFillServiceImpl.java | 16 +-- .../service/impl/StudyFormPlanJcgjServiceImpl.java | 6 +- .../service/impl/StudyFormPlanQmxxServiceImpl.java | 2 +- .../service/impl/StudyFormPlanServiceImpl.java | 14 +-- .../service/impl/StudyFormPreJcgjServiceImpl.java | 6 +- .../service/impl/StudyFormPreQmxxServiceImpl.java | 2 +- .../service/impl/StudyFormPreServiceImpl.java | 16 ++- .../com/hxhq/business/utils/lang/GyzjJcnrUtil.java | 1 - .../com/hxhq/business/utils/lang/MjyJcnrUtil.java | 2 - .../hxhq/business/utils/lang/StudyFormUtil.java | 117 +++++++++++---------- 15 files changed, 105 insertions(+), 107 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java index b9f3189..14746e6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java @@ -67,7 +67,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("申请备注", "1111"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java index ccf0b48..9481a82 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java @@ -105,8 +105,6 @@ public class MjyJcnrUtil { mapLang.put("减少量","减少量"); } - - public static void main(String[] args) { Map formData = new LinkedHashMap<>(); formData.put("申请备注", "1111"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java index 9540743..da37b09 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java @@ -13,62 +13,51 @@ import java.util.Map; */ public class StudyFormUtil { private static final Logger logger = LoggerFactory.getLogger(StudyFormUtil.class.getName()); - private static HashMap mapJcnr=new HashMap<>(); - private static HashMap mapQmyy=new HashMap<>(); + private static HashMap mapLang=new HashMap<>(); static { - //region 稽查内容 + mapLang.put("字段名","Field"); + mapLang.put("原值","Old Value"); + mapLang.put("新值","New Value"); + mapLang.put("原因","Reason"); + mapLang.put("生长情况","Growth Status"); + mapLang.put("新归属人","New Owner"); + mapLang.put("原归属人","Old Owner"); + mapLang.put("填入值","Input Data"); + mapLang.put("填写人","Data Entry Person"); + mapLang.put("更换归属人","Change Owner"); + mapLang.put("良好","Good"); + mapLang.put("中","Average"); + mapLang.put("差","Bad"); + mapLang.put("修改","Edit"); + mapLang.put("修改记录","Change Data"); + mapLang.put("填写","Fill in"); + mapLang.put("意见回复","Reply to Remark"); + mapLang.put("复核意见","Verification Remark"); + mapLang.put("免复核通过","Pass (no Verification Requirement)"); + mapLang.put("复核拒绝","Verification Reject"); + mapLang.put("复核通过","Verification Pass"); + mapLang.put("填写并提交记录","Create and Submit Record"); + mapLang.put("废止拒绝","Reject Record Abolition"); + mapLang.put("废止通过","Approve Record Abolition"); + mapLang.put("申请废止","Apply Abolition"); + mapLang.put("开始现场复核","Start on-Site Verification"); + mapLang.put("结束现场复核","End on-Site Verification"); + mapLang.put("申明协作","Declaration of Collaboration"); + mapLang.put("已审阅","Reviewed"); + mapLang.put("审核通过","Approved"); + mapLang.put("补充说明","Additional Remark"); + mapLang.put("审核拒绝","Reject after Review"); + mapLang.put("制作保存预制表单","Save Record Preset"); + mapLang.put("制作提交预制表单","Submit Record Preset"); + mapLang.put("创建记录","Create Record"); + mapLang.put("填写并保存记录","Create and Save Record"); + mapLang.put("申请关闭","Apply Close"); + mapLang.put("关闭拒绝","Close Reject"); + mapLang.put("关闭同意","Close Approve"); - 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("填入值","Input Data"); - mapJcnr.put("填写人","Data Entry Person"); - mapJcnr.put("意见回复","意见回复"); - mapJcnr.put("复核意见","复核意见"); - //endregion - - //region 稽查名称 - mapQmyy.put("更换归属人","Change Owner"); - mapQmyy.put("良好","Good"); - mapQmyy.put("中","Average"); - mapQmyy.put("差","Bad"); - mapQmyy.put("修改","Edit"); - mapQmyy.put("修改记录","Change Data"); - mapQmyy.put("填写","Create Record"); - mapQmyy.put("意见回复","意见回复"); - mapQmyy.put("复核意见","复核意见"); - mapQmyy.put("免复核通过","免复核通过"); - mapQmyy.put("复核拒绝","Verification Reject"); - mapQmyy.put("复核通过","Verification Pass"); - mapQmyy.put("填写并提交记录","Create and Submit Record"); - mapQmyy.put("废止拒绝","废止拒绝"); - mapQmyy.put("废止通过","废止通过"); - mapQmyy.put("申请废止","申请废止"); - mapQmyy.put("开始现场复核","Start on-Site Verification"); - mapQmyy.put("结束现场复核","End on-Site Verification"); - mapQmyy.put("申明协作","Declaration of Collaboration"); - mapQmyy.put("已审阅","Reviewed"); - mapQmyy.put("审核通过","Approved"); - mapQmyy.put("补充说明","Additional Remark"); - mapQmyy.put("审核拒绝","Reject after Review"); - mapQmyy.put("制作保存预制表单","Save Record Preset"); - mapQmyy.put("制作提交预制表单","Submit Record Preset"); - mapQmyy.put("创建记录","Create Record"); - mapQmyy.put("填写并保存记录","Create and Save Record"); - mapQmyy.put("申请关闭","Apply Close"); - mapQmyy.put("关闭拒绝","Close Reject"); - mapQmyy.put("关闭同意","Close Approve"); - - //endregion } - - public static void main(String[] args) { Map formData = new LinkedHashMap<>(); formData.put("申请备注", "1111"); @@ -76,25 +65,39 @@ public class StudyFormUtil { logger.info(getJcnrEn(formData)); } /** - * 获取签名意义英文 + * 获取英文 * @param qmyy * @return */ - public static String getQmyyEn(String qmyy) { - return mapQmyy.get(qmyy); + public static String getEn(String qmyy) { + return mapLang.get(qmyy); } /** - * 稽查名称英文 + * 获取稽查内容英文 * @param map * @return */ public static String getJcnrEn(Map map) { - Map result =new HashMap<>(); + Map result =new LinkedHashMap<>(); for (Map.Entry entry : map.entrySet()) { - result.put(mapJcnr.get(entry.getKey()),entry.getValue()); + result.put(mapLang.get(entry.getKey()),entry.getValue()); } return JctUtil.formatStr(result); } + + /** + * 获取稽查内容英文 + * @param map + * @return + */ + public static Map getMapEn(Map map) { + Map result =new LinkedHashMap<>(); + for (Map.Entry entry : map.entrySet()) { + result.put(mapLang.get(entry.getKey()),entry.getValue()); + } + return result; + } + }