标准解读流程添加标题译文
This commit is contained in:
+6
@@ -39,6 +39,12 @@ public class ProcessStandardInterpretClause extends BaseEntity {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@Excel(name = "标准名称/条款标题", width = 18)
|
@Excel(name = "标准名称/条款标题", width = 18)
|
||||||
private String itemTitle;
|
private String itemTitle;
|
||||||
|
|
||||||
|
/**标题译文*/
|
||||||
|
@ApiModelProperty(value = "标题译文")
|
||||||
|
@TableField(exist = false)
|
||||||
|
@Excel(name = "标题译文", width = 18)
|
||||||
|
private String titleTranslation;
|
||||||
/**条款内容*/
|
/**条款内容*/
|
||||||
@ApiModelProperty(value = "条款内容")
|
@ApiModelProperty(value = "条款内容")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
|
|||||||
+5
@@ -39,6 +39,11 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@Excel(name = "标准名称/条款标题", width = 18)
|
@Excel(name = "标准名称/条款标题", width = 18)
|
||||||
private String itemTitle;
|
private String itemTitle;
|
||||||
|
/**标题译文*/
|
||||||
|
@ApiModelProperty(value = "标题译文")
|
||||||
|
@TableField(exist = false)
|
||||||
|
@Excel(name = "标题译文", width = 18)
|
||||||
|
private String titleTranslation;
|
||||||
/**条款内容*/
|
/**条款内容*/
|
||||||
@ApiModelProperty(value = "条款内容")
|
@ApiModelProperty(value = "条款内容")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
|
|||||||
+1
@@ -7,6 +7,7 @@
|
|||||||
select * from (select psic.id,
|
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_number, lds2.item_num) itemNum,
|
||||||
IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle,
|
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,
|
IF(lds.id is not null, null, lds2.item_content) itemContent,
|
||||||
lds2.translation,
|
lds2.translation,
|
||||||
standard_interpret_id,
|
standard_interpret_id,
|
||||||
|
|||||||
+1
@@ -49,6 +49,7 @@
|
|||||||
left join (select psic.id interpret_clause_id,
|
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_number, lds2.item_num) itemNum,
|
||||||
IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle,
|
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,
|
IF(lds.id is not null, null, lds2.item_content) itemContent,
|
||||||
lds2.translation,
|
lds2.translation,
|
||||||
standard_interpret_id
|
standard_interpret_id
|
||||||
|
|||||||
+1
-1
@@ -285,7 +285,7 @@
|
|||||||
|
|
||||||
<select id="selectClauseList"
|
<select id="selectClauseList"
|
||||||
resultType="com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause">
|
resultType="com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClause">
|
||||||
SELECT s.id clauseId,item_num,item_title,item_content,standard_id
|
SELECT s.id clauseId,item_num,item_title,title_translation,item_content,translation,standard_id
|
||||||
FROM laws_document_split s
|
FROM laws_document_split s
|
||||||
LEFT JOIN SAR_FILE_SPLIT_MENU m ON s.MENU_ID = m.id
|
LEFT JOIN SAR_FILE_SPLIT_MENU m ON s.MENU_ID = m.id
|
||||||
WHERE del_flag = 0
|
WHERE del_flag = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user