From 387bc798f1a90912f203c11d26bdb1d4618ea6f5 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 30 Jul 2024 17:06:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(87485):=20=E5=A4=96=E6=9D=A5=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=96=87=E6=9C=AC=E5=BA=93--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91--=E6=B6=89=E5=8F=8A?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F/=E9=83=A8=E4=BB=B6=E9=80=89=E6=8B=A93?= =?UTF-8?q?=E9=A1=B9=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=A4=AA=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/documenttool/entity/LawsDocumentSplit.java | 6 +++--- .../service/impl/DocumentSplitServiceImpl.java | 8 ++++---- .../jero/modules/split/entity/SarFileSplitItemsEO.java | 3 +++ .../modules/split/mapper/xml/FileSplitItemsEOMapper.xml | 5 +++-- .../split/service/impl/FileSplitItemsEOServiceImpl.java | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java index 14f2f42a..72755c01 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java @@ -45,9 +45,9 @@ public class LawsDocumentSplit extends BaseEntity { // 法规注释 @ApiModelProperty("法规注释") private String regulatoryNotes; - // 关键词（涉及系统/部件） - @ApiModelProperty("关键词（涉及系统/部件）") - private String keywords; + // 涉及系统/部件 + @ApiModelProperty("涉及系统/部件") + private String partName; // 适用零部件 @ApiModelProperty("适用零部件") private String applicableComponents; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index d503e338..eef19607 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -381,11 +381,11 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { List partNames = IPartNameService.queryEcho(applicableComponents); map.put("applicable_components_dictText", partNames.stream().map(PartName::getName).collect(Collectors.joining(","))); } - // 涉及系统/部件（关键词） - if (map.containsKey("keywords")){ - String applicableComponents = (String) map.get("keywords"); + // 涉及系统/部件 + if (map.containsKey("part_name")){ + String applicableComponents = (String) map.get("part_name"); List partNames = IPartNameService.queryEcho(applicableComponents); - map.put("keywords_dictText", partNames.stream().map(PartName::getName).collect(Collectors.joining(","))); + map.put("part_name_dictText", partNames.stream().map(PartName::getName).collect(Collectors.joining(","))); } // 属性标识翻译 if (map.containsKey("property_tag")){ diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java index 350afc38..dbc7daaa 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java +++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java @@ -48,6 +48,9 @@ public class SarFileSplitItemsEO implements Serializable { @ApiModelProperty(value = "") private Integer validFlag; + @ApiModelProperty("是否与上一版相同（字典：1：是，0：否）") + private String isSameAsPrevVersion; + private String creationUser; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml index ead7e9fd..d757b98a 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml @@ -112,7 +112,7 @@ insert into laws_document_split (id, info_id, item_num, item_title, menu_id, create_by, create_time, update_time, - update_by, item_content,sort_number,applicable_components) + update_by, item_content,sort_number,applicable_components,is_same_as_prev_version) values ( #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemNum, jdbcType=VARCHAR}, @@ -121,7 +121,8 @@ #{item.creationUser, jdbcType=VARCHAR}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.modifyUser, jdbcType=VARCHAR}, #{item.itemContent, jdbcType=CLOB},#{item.zhan3Shi4Shun4Xu4, jdbcType=VARCHAR}, - #{item.applicableComponents, jdbcType=VARCHAR} + #{item.applicableComponents, jdbcType=VARCHAR}, + #{item.isSameAsPrevVersion, jdbcType=VARCHAR} ) diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 6876f363..1ea2ce91 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -172,7 +172,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl SPECIAL_FIELD = Arrays.asList("keywords", "applicable_components"); + private static final List SPECIAL_FIELD = Arrays.asList("part_name", "applicable_components"); @Value("${download.enable}") public void setEnable(boolean enable) {