From 9a375fe6cbdef852bb0fc0ce1a6cc37cb8317ead Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 1 Nov 2023 09:34:03 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6-?= =?UTF-8?q?=E6=9D=A5=E6=BA=90-=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/localTool/entity/StandardEarlyWarning.java | 1 + .../localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java index d673df9c..63d41f45 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/entity/StandardEarlyWarning.java @@ -31,6 +31,7 @@ public class StandardEarlyWarning { /**来源（国内/海外）*/ @Excel(name = "来源（国内/海外）", width = 15) @ApiModelProperty(value = "来源（国内/海外）") + @Dict(dicCode = "standard_source") private java.lang.String source; /**标准号/标准名称*/ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml index 2b8bdb62..3951e620 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/localTool/mapper/xml/LawsStandardEarlyWarningMapper.xml @@ -14,7 +14,7 @@ FROM ( SELECT - '国内' AS source, + '1' AS source, lds.id, lds.standard_number, lds.standard_name, @@ -27,7 +27,7 @@ WHERE lds.del_flag = 0 UNION SELECT - '海外' AS source, + '2' AS source, los.id, los.standard_number, los.standard_name,