fix(87485): 外来标准法规文本库--新增/编辑--涉及系统/部件选择3项后,提示字段太长
This commit is contained in:
+3
-3
@@ -45,9 +45,9 @@ public class LawsDocumentSplit extends BaseEntity {
|
|||||||
// 法规注释
|
// 法规注释
|
||||||
@ApiModelProperty("法规注释")
|
@ApiModelProperty("法规注释")
|
||||||
private String regulatoryNotes;
|
private String regulatoryNotes;
|
||||||
// 关键词(涉及系统/部件)
|
// 涉及系统/部件
|
||||||
@ApiModelProperty("关键词(涉及系统/部件)")
|
@ApiModelProperty("涉及系统/部件")
|
||||||
private String keywords;
|
private String partName;
|
||||||
// 适用零部件
|
// 适用零部件
|
||||||
@ApiModelProperty("适用零部件")
|
@ApiModelProperty("适用零部件")
|
||||||
private String applicableComponents;
|
private String applicableComponents;
|
||||||
|
|||||||
+4
-4
@@ -381,11 +381,11 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
|
|||||||
List<PartName> partNames = IPartNameService.queryEcho(applicableComponents);
|
List<PartName> partNames = IPartNameService.queryEcho(applicableComponents);
|
||||||
map.put("applicable_components_dictText", partNames.stream().map(PartName::getName).collect(Collectors.joining(",")));
|
map.put("applicable_components_dictText", partNames.stream().map(PartName::getName).collect(Collectors.joining(",")));
|
||||||
}
|
}
|
||||||
// 涉及系统/部件(关键词)
|
// 涉及系统/部件
|
||||||
if (map.containsKey("keywords")){
|
if (map.containsKey("part_name")){
|
||||||
String applicableComponents = (String) map.get("keywords");
|
String applicableComponents = (String) map.get("part_name");
|
||||||
List<PartName> partNames = IPartNameService.queryEcho(applicableComponents);
|
List<PartName> 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")){
|
if (map.containsKey("property_tag")){
|
||||||
|
|||||||
@@ -48,6 +48,9 @@ public class SarFileSplitItemsEO implements Serializable {
|
|||||||
@ApiModelProperty(value = "")
|
@ApiModelProperty(value = "")
|
||||||
private Integer validFlag;
|
private Integer validFlag;
|
||||||
|
|
||||||
|
@ApiModelProperty("是否与上一版相同(字典:1:是,0:否)")
|
||||||
|
private String isSameAsPrevVersion;
|
||||||
|
|
||||||
private String creationUser;
|
private String creationUser;
|
||||||
|
|
||||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
|||||||
+3
-2
@@ -112,7 +112,7 @@
|
|||||||
insert into laws_document_split
|
insert into laws_document_split
|
||||||
(id, info_id, item_num, item_title, menu_id,
|
(id, info_id, item_num, item_title, menu_id,
|
||||||
create_by, create_time, update_time,
|
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
|
values
|
||||||
<foreach collection="list" item="item" index="index" separator=",">(
|
<foreach collection="list" item="item" index="index" separator=",">(
|
||||||
#{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemNum, jdbcType=VARCHAR},
|
#{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemNum, jdbcType=VARCHAR},
|
||||||
@@ -121,7 +121,8 @@
|
|||||||
#{item.creationUser, jdbcType=VARCHAR},
|
#{item.creationUser, jdbcType=VARCHAR},
|
||||||
#{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP},
|
#{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP},
|
||||||
#{item.modifyUser, jdbcType=VARCHAR}, #{item.itemContent, jdbcType=CLOB},#{item.zhan3Shi4Shun4Xu4, jdbcType=VARCHAR},
|
#{item.modifyUser, jdbcType=VARCHAR}, #{item.itemContent, jdbcType=CLOB},#{item.zhan3Shi4Shun4Xu4, jdbcType=VARCHAR},
|
||||||
#{item.applicableComponents, jdbcType=VARCHAR}
|
#{item.applicableComponents, jdbcType=VARCHAR},
|
||||||
|
#{item.isSameAsPrevVersion, jdbcType=VARCHAR}
|
||||||
)
|
)
|
||||||
</foreach>
|
</foreach>
|
||||||
</insert>
|
</insert>
|
||||||
|
|||||||
+1
-1
@@ -172,7 +172,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
public static String DECRYPT_APP_CODE;
|
public static String DECRYPT_APP_CODE;
|
||||||
public static String DECRYPT_SECRET_KEY;
|
public static String DECRYPT_SECRET_KEY;
|
||||||
|
|
||||||
private static final List<String> SPECIAL_FIELD = Arrays.asList("keywords", "applicable_components");
|
private static final List<String> SPECIAL_FIELD = Arrays.asList("part_name", "applicable_components");
|
||||||
|
|
||||||
@Value("${download.enable}")
|
@Value("${download.enable}")
|
||||||
public void setEnable(boolean enable) {
|
public void setEnable(boolean enable) {
|
||||||
|
|||||||
Reference in New Issue
Block a user