法规技术评估-查询文档库数据接口完善。
This commit is contained in:
+41
-25
@@ -196,6 +196,14 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
|
||||
List<String> fieldListNew = new ArrayList<>();
|
||||
fieldListNew.add("id");
|
||||
|
||||
//过滤出文件字段
|
||||
List<OnlCgformField> fileFieldList = fieldList.stream()
|
||||
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
|
||||
.collect(Collectors.toList());
|
||||
for (OnlCgformField onlCgformField : fileFieldList) {
|
||||
fieldListQuery.add(onlCgformField.getDbFieldName());
|
||||
}
|
||||
|
||||
//转时间格式
|
||||
for (String field : fieldListQuery) {
|
||||
String fieldTemp = null;
|
||||
@@ -208,13 +216,10 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
|
||||
fieldListNew.add(fieldTemp);
|
||||
}
|
||||
}
|
||||
//过滤出文件字段
|
||||
List<OnlCgformField> fileFieldList = fieldList.stream()
|
||||
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType()))
|
||||
|
||||
List<String> fileFieldStrList = fieldList.stream()
|
||||
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).map(OnlCgformField::getDbFieldName)
|
||||
.collect(Collectors.toList());
|
||||
for (OnlCgformField onlCgformField : fileFieldList) {
|
||||
fieldListNew.add(onlCgformField.getDbFieldName());
|
||||
}
|
||||
|
||||
//封装查询条件
|
||||
String condition = this.bussDocumentLibraryEOService.getConditionStr(parameter);
|
||||
@@ -239,32 +244,43 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
|
||||
for (Map record : records) {
|
||||
Map<String, Object> record1 = (Map) record;
|
||||
String technology_territory = (String)record1.get("technology_territory");
|
||||
|
||||
List<String> connectIdList = new ArrayList<>();
|
||||
|
||||
for (Map.Entry<String, Object> entry : record1.entrySet()) {
|
||||
//下拉选处理数据字典
|
||||
this.bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null);
|
||||
this.bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null);
|
||||
if(fileFieldStrList.contains(entry.getKey())){
|
||||
if(entry.getValue()!=null){
|
||||
connectIdList.add(entry.getValue().toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
record1.put("technology_territory_id",technology_territory);
|
||||
String id = (String) record.get("id");
|
||||
//根据id查询当前文档库数据是否有拆分数据。
|
||||
QueryWrapper<SarFileSplitInfoEO> splitInfoEOQueryWrapper = new QueryWrapper<>();
|
||||
splitInfoEOQueryWrapper.lambda().eq(SarFileSplitInfoEO::getDocumentId,id);
|
||||
List<SarFileSplitInfoEO> sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper);
|
||||
List<SarFileSplitInfoEO> sarFileSplitInfoList = new ArrayList<>();
|
||||
if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){
|
||||
sarFileSplitInfoListTemp.forEach(splitInfo -> {
|
||||
//查询出已回传的数据
|
||||
String flag = ""; // 1 已回传 0未回传。
|
||||
if(StringUtils.isNotEmpty(splitInfo.getFileId())){
|
||||
flag = "1";
|
||||
sarFileSplitInfoList.add(splitInfo);
|
||||
}else {
|
||||
flag = "0";
|
||||
}
|
||||
splitInfo.setFlag(flag);
|
||||
});
|
||||
|
||||
if(CollectionUtils.isNotEmpty(connectIdList)){
|
||||
//根据id查询当前文档库数据是否有拆分数据。
|
||||
QueryWrapper<SarFileSplitInfoEO> splitInfoEOQueryWrapper = new QueryWrapper<>();
|
||||
splitInfoEOQueryWrapper.lambda().in(SarFileSplitInfoEO::getConnectId,connectIdList);
|
||||
List<SarFileSplitInfoEO> sarFileSplitInfoList = new ArrayList<>();
|
||||
|
||||
List<SarFileSplitInfoEO> sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper);
|
||||
if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){
|
||||
sarFileSplitInfoListTemp.forEach(splitInfo -> {
|
||||
//查询出已回传的数据
|
||||
String flag = ""; // 1 已回传 0未回传。
|
||||
if(StringUtils.isNotEmpty(splitInfo.getFileId())){
|
||||
flag = "1";
|
||||
sarFileSplitInfoList.add(splitInfo);
|
||||
}else {
|
||||
flag = "0";
|
||||
}
|
||||
splitInfo.setFlag(flag);
|
||||
});
|
||||
record1.put("sarFileSplitInfoList",sarFileSplitInfoList);
|
||||
}
|
||||
}
|
||||
record1.put("sarFileSplitInfoList",sarFileSplitInfoList);
|
||||
}
|
||||
return infoPage;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user