参数项收集清单-动态表头添加认证类型
This commit is contained in:
+21
@@ -1533,6 +1533,23 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
|||||||
//过滤列表字段(is_show_list-->列表是否显示0否 1是)
|
//过滤列表字段(is_show_list-->列表是否显示0否 1是)
|
||||||
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
|
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
//参数项认证清单-认证类型
|
||||||
|
List<String> categoryList = new ArrayList<>();
|
||||||
|
if(ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue().equals(flag)){
|
||||||
|
List<SysDictItem> sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category");
|
||||||
|
if(ObjectUtil.isNotEmpty(sysDictItemList)){
|
||||||
|
categoryList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
List<OnlCgformField> onlCgformFieldList = new LinkedList<>();
|
||||||
|
for (SysDictItem sysDictItem : sysDictItemList) {
|
||||||
|
OnlCgformField onlCgformField = new OnlCgformField();
|
||||||
|
onlCgformField.setDbFieldTxt(sysDictItem.getItemText());
|
||||||
|
onlCgformField.setDbFieldEnName(sysDictItem.getEnName());
|
||||||
|
onlCgformField.setDbFieldName(sysDictItem.getItemValue());
|
||||||
|
onlCgformFieldList.add(onlCgformField);
|
||||||
|
}
|
||||||
|
fieldList.addAll(onlCgformFieldList);
|
||||||
|
}
|
||||||
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
|
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
|
||||||
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
|
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
|
||||||
List<Map<String, Object>> listConfig = new LinkedList<>();
|
List<Map<String, Object>> listConfig = new LinkedList<>();
|
||||||
@@ -1590,6 +1607,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
|||||||
if (!"references_col".equals(dbFieldName)) {
|
if (!"references_col".equals(dbFieldName)) {
|
||||||
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
|
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
|
||||||
}
|
}
|
||||||
|
if(ObjectUtil.isNotEmpty(categoryList) && categoryList.contains(dbFieldName)){
|
||||||
|
map.put("show", "1");//认证类型动态表头默认不展示,列表设置展示,用show=1来区分
|
||||||
|
map.put("sort", "true");
|
||||||
|
}
|
||||||
if (CutEnum.CN.getValue().equals(cut)) {
|
if (CutEnum.CN.getValue().equals(cut)) {
|
||||||
if ("references_col".equals(dbFieldName)) {
|
if ("references_col".equals(dbFieldName)) {
|
||||||
if (ObjectUtils.isNotEmpty(paramsManifestEO) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
|
if (ObjectUtils.isNotEmpty(paramsManifestEO) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user