WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文档库--更新log

Browse Source
This commit is contained in:
zhn
2022-03-30 19:05:48 +08:00
parent d9085de04c
commit 65335dc8db
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/FieldTypeEnum.java
+2 -1
View File
@@ -22,7 +22,8 @@ public enum FieldTypeEnum {
FILE("文件","7"),
TEXT("文本框","8"),
PERSON("人员选择","9"),
STANDARD("标准选择","10");
STANDARD("标准选择","10"),
TEXT_LINK("输入框(链接)","11");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+31 -11
View File
@@ -265,27 +265,36 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String correspondingStandardStr = "";
String replaceStandardStr = "";
if(StringUtils.isNotBlank(correspondingStandard)){
for (String s : correspondingStandard.split(",")) {
if(!ids.contains(s)){
correspondingStandardSb.append(s+",");
if(!correspondingStandard.contains(",")){
if(!ids.contains(correspondingStandard)){
correspondingStandardStr = correspondingStandard;
}
}else{
for (String s : correspondingStandard.split(",")) {
if(!ids.contains(s)){
correspondingStandardSb.append(s+",");
}
}
}
if(StringUtils.isNotBlank(correspondingStandardSb)){
correspondingStandardStr = correspondingStandardSb.substring(0, correspondingStandardSb.length() - 1);
}else{
correspondingStandardStr = correspondingStandard;
}
}
if(StringUtils.isNotBlank(replaceStandard)){
for (String s : replaceStandard.split(",")) {
if(!ids.contains(s)){
replaceStandardSb.append(s+",");
if(!replaceStandard.contains(",")){
if(!ids.contains(replaceStandard)){
replaceStandardStr = replaceStandard;
}
}else{
for (String s : replaceStandard.split(",")) {
if(!ids.contains(s)){
replaceStandardSb.append(s+",");
}
}
}
if(StringUtils.isNotBlank(replaceStandardSb)){
replaceStandardStr = replaceStandardSb.substring(0, replaceStandardSb.length() - 1);
}else{
replaceStandardStr = replaceStandard;
}
}
bussDocumentLibraryEOMapper.updateByDeleteId(correspondingStandardStr,replaceStandardStr,id);
@@ -836,6 +845,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<OnlCgformField> treeFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
.collect(Collectors.toList());
//过滤出输入框链接
List<OnlCgformField> OnlCgformFieldLinkList = fieldList.stream()
.filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType()))
.collect(Collectors.toList());
List<String> linkList = OnlCgformFieldLinkList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
//下拉选字段
List<String> fieldPullList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
@@ -954,7 +969,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
});
}
mapPut(cut, map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null);
mapPut(cut, map, "field_show_type",
onlCgformField.getFieldShowType(), "dict_field",
onlCgformField.getDictField(), "db_field_name",
onlCgformField.getDbFieldName(), "db_field_txt",
onlCgformField.getDbFieldTxt(), "db_field_en_name",
onlCgformField.getDbFieldEnName(), "area", areaName, null);
}
if (map.size() != 0) {
resultTemp.add(map);