From 6bc391334474f97e0df89d9836db5805604f38d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 4 Sep 2024 14:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B7=BB=E5=8A=A0=E6=A0=87=E9=A2=98=E8=AF=91=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessStandardInterpretClause.java | 6 ++++++ .../entity/ProcessStandardInterpretClauseSublist.java | 5 +++++ .../mapper/xml/ProcessStandardInterpretClauseMapper.xml | 1 + .../xml/ProcessStandardInterpretClauseSublistMapper.xml | 1 + .../laws/documenttool/mapper/xml/DocumentSplitMapper.xml | 2 +- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java index c430b683..5c820997 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java @@ -39,6 +39,12 @@ public class ProcessStandardInterpretClause extends BaseEntity { @TableField(exist = false) @Excel(name = "标准名称/条款标题", width = 18) private String itemTitle; + + /**标题译文*/ + @ApiModelProperty(value = "标题译文") + @TableField(exist = false) + @Excel(name = "标题译文", width = 18) + private String titleTranslation; /**条款内容*/ @ApiModelProperty(value = "条款内容") @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java index 9d2bdd8f..34e6609a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java @@ -39,6 +39,11 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity { @TableField(exist = false) @Excel(name = "标准名称/条款标题", width = 18) private String itemTitle; + /**标题译文*/ + @ApiModelProperty(value = "标题译文") + @TableField(exist = false) + @Excel(name = "标题译文", width = 18) + private String titleTranslation; /**条款内容*/ @ApiModelProperty(value = "条款内容") @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml index 424717a3..5ab8afd3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml @@ -7,6 +7,7 @@ select * from (select psic.id, IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum, IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle, + lds2.title_translation titleTranslation, IF(lds.id is not null, null, lds2.item_content) itemContent, lds2.translation, standard_interpret_id, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml index a7bf7e86..20715101 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseSublistMapper.xml @@ -49,6 +49,7 @@ left join (select psic.id interpret_clause_id, IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum, IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle, + lds2.title_translation titleTranslation, IF(lds.id is not null, null, lds2.item_content) itemContent, lds2.translation, standard_interpret_id diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index b809e39a..3dbcb421 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -285,7 +285,7 @@