From 96678bfe72bdf7a9aa00b917f70f82b303e306a5 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 7 Aug 2024 20:04:48 +0800 Subject: [PATCH] =?UTF-8?q?fix(88091):=20=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E6=AF=94=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/api/vo/ResultCommon.java | 2 ++ .../src/main/resources/i18n/messages.properties | 3 ++- .../src/main/resources/i18n/messages_en.properties | 3 ++- .../src/main/resources/i18n/messages_zh.properties | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java index 2d07c3a4..d4771023 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/api/vo/ResultCommon.java @@ -176,6 +176,8 @@ public class ResultCommon { public static final String SCC_DELETE_STANDARD_ERROR2 = "scc.delete.standard.error2"; // 标准解读流程有正在进行中的流程，不允许删除 public static final String SCC_DELETE_STANDARD_ERROR3 = "scc.delete.standard.error3"; + // 标准有被比对的数据，不允许删除 + public static final String SCC_DELETE_STANDARD_ERROR4 = "scc.delete.standard.error4"; // 流程已分发,禁止驳回 public static final String PROCESS_ALREADY_DISTRIBUTED = "process.already.distributed"; diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index 6d0324de..5542875b 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -80,9 +80,10 @@ message.no.exists.standard=\u6807\u51C6\u4E0D\u5B58\u5728\uFF0C\u8BF7\u8054\u7CF scc.delete.standard.error=\u6807\u51C6\u6B63\u5728\u6CD5\u89C4\u7B26\u5408\u6027\u6392\u67E5\u6D41\u7A0B\u4E2D\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 scc.delete.standard.error2=\u6807\u51C6\u6709\u88AB\u62C6\u5206\u7684\u6570\u636E\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 scc.delete.standard.error3=\u6807\u51C6\u6B63\u5728\u6807\u51C6\u89E3\u8BFB\u6D41\u7A0B\u4E2D\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 +scc.delete.standard.error4=\u6807\u51C6\u6709\u88AB\u6BD4\u5BF9\u7684\u6570\u636E\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 split.import.template.error=\u5206\u89E3\u5355\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 model.import.template.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 model.import.data.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6570\u636E\u9519\u8BEF\u3002{0} file.empty.import.error=\u6587\u4EF6\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 can_not_find_template_file=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u6A21\u677F\u6587\u4EF6 -can_not_find_field=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u5B57\u6BB5 \ No newline at end of file +can_not_find_field=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u5B57\u6BB5 diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 9e348ece..93031eed 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -96,10 +96,11 @@ row.n.import=Row {0} scc.delete.standard.error=The standard is in the process of regulatory compliance checking, can not delete scc.delete.standard.error2=Standards have split data, can not delete scc.delete.standard.error3=The standard is being interpreted, can not delete +scc.delete.standard.error4=The standard has the data being compared, can not delete split.import.template.error=Split import template error model.import.template.error=Model import template error model.import.data.error=Model import data error.{0} file.empty.import.error=The file is empty, please upload again row.size.too.large=Row size too large can_not_find_template_file=Can not find template file name {0} -can_not_find_field=Can not find field {0} \ No newline at end of file +can_not_find_field=Can not find field {0} diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index a4f8bcee..154c1af3 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -95,10 +95,11 @@ row.n.import=\u7B2C{0}\u884C scc.delete.standard.error=\u6807\u51C6\u6B63\u5728\u6CD5\u89C4\u7B26\u5408\u6027\u6392\u67E5\u6D41\u7A0B\u4E2D\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 scc.delete.standard.error2=\u6807\u51C6\u6709\u88AB\u62C6\u5206\u7684\u6570\u636E\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 scc.delete.standard.error3=\u6807\u51C6\u6B63\u5728\u6807\u51C6\u89E3\u8BFB\u6D41\u7A0B\u4E2D\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 +scc.delete.standard.error4=\u6807\u51C6\u6709\u88AB\u6BD4\u5BF9\u7684\u6570\u636E\uFF0C\u4E0D\u5141\u8BB8\u5220\u9664 split.import.template.error=\u5206\u89E3\u5355\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 model.import.template.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6A21\u677F\u9519\u8BEF\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 model.import.data.error=\u8F66\u578B\u9879\u76EE\u6587\u4EF6\u4E0A\u4F20\u6570\u636E\u9519\u8BEF\u3002{0} file.empty.import.error=\u6587\u4EF6\u4E3A\u7A7A\uFF0C\u8BF7\u68C0\u67E5\u540E\u91CD\u8BD5 row.size.too.large=\u884C\u5927\u5C0F\u592A\u5927 can_not_find_template_file=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u6A21\u677F\u6587\u4EF6 -can_not_find_field=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u5B57\u6BB5 \ No newline at end of file +can_not_find_field=\u627E\u4E0D\u5230\u540D\u4E3A{0}\u7684\u5B57\u6BB5