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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-03-04 09:02:42 +08:00
parent ff7c8d4e35 5e00619fb7
commit 6c2ee03033
1 changed files with 22 additions and 9 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/service/impl/BussDocumentLibraryEOServiceImpl.java
+22 -9
View File
@@ -669,14 +669,23 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BussDocumentLibraryEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BussDocumentLibraryEO::getId, id); queryWrapper.eq(BussDocumentLibraryEO::getId, id);
List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); List<Map<String, Object>> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper);
Map<String,Object> mapTemp = new HashMap<>();
mapCopy(map, mapTemp);
List<Map<String,Object>> dataListTemp = new ArrayList<>();
for (Map<String, Object> stringObjectMap : dataList) {
Map<String,Object> mapT = new HashMap<>();
mapCopy(stringObjectMap, mapT);
dataListTemp.add(mapT);
}
//更新log //更新log
updateLog(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList,cut); updateLog(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList,cut);
//判断该条数据是否订阅 //判断该条数据是否订阅
//处理修改代替标准,发送通知 //处理修改代替标准,发送通知
sendMessageUpdate(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList,cut); sendMessageUpdate(mapTemp, dataListTemp, fieldList, fieldDateList, fieldFileList, fieldPullList,cut);
//字段 //字段
StringBuilder fieldsBuilder = new StringBuilder(); StringBuilder fieldsBuilder = new StringBuilder();
@@ -851,7 +860,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
} else { } else {
if (ObjectUtils.isNotEmpty(valueTemp)) { if (ObjectUtils.isNotEmpty(valueTemp)) {
sb.append(dbFieldTxt + "改为" + valueTemp + ","); sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
} }
} }
@@ -880,7 +889,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
} else { } else {
if (fileNameListTemp.size() != 0) { if (fileNameListTemp.size() != 0) {
sb.append(dbFieldTxt + "改为" + StringUtils.join(fileNameListTemp, ",") + ","); sb.append(dbFieldTxt + "由空改为" + StringUtils.join(fileNameListTemp, ",") + ",");
} }
} }
} else { } else {
@@ -901,7 +910,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
} else { } else {
if (ObjectUtils.isNotEmpty(valueTemp)) { if (ObjectUtils.isNotEmpty(valueTemp)) {
sb.append(dbFieldTxt + "改为" + valueTemp + ","); sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
} }
} }
} }
@@ -1125,10 +1134,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
+ " from oss_file of join buss_document_library bdl" + join.toString(); + " from oss_file of join buss_document_library bdl" + join.toString();
//查询条件 //查询条件
StringBuilder conditionSb = new StringBuilder("where 1 = 1"); StringBuilder conditionSb = new StringBuilder("where 1 = 1 and of.file_name like '%.pdf%'");
//编码 //编码
String serialNumber = (String) parameter.get("serialNumber"); String serialNumber = (String) parameter.get("serial_number");
//标题 //标题
String title = (String) parameter.get("title"); String title = (String) parameter.get("title");
@@ -1170,7 +1179,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
.collect(Collectors.toList()); .collect(Collectors.toList());
List<SysDictItem> state = stateList.stream().filter(e -> e.getItemValue().equals(entry.getValue())).collect(Collectors.toList()); List<SysDictItem> state = stateList.stream().filter(e -> e.getItemValue().equals(entry.getValue())).collect(Collectors.toList());
if (state.size() != 0) { if (state.size() != 0) {
entry.setValue(state.get(0).getItemText()); if(CutEnum.CN.getValue().equals((String) parameter.get("cut"))){
entry.setValue(state.get(0).getItemText());
}else{
entry.setValue(state.get(0).getEnName());
}
} }
} }
//添加文本信息 //添加文本信息