ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-12-23 15:48:57 +08:00
parent 753a303fec
commit 303c8dd4f0
14 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -1435,11 +1435,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
DictType dictType = dictTypeService.getByCode(EX_FACTORY_DEV_TYPE);
if (ObjectUtil.isNotNull(dictType)) {
List<DictData> dictDataList = dictDataService.getDictDataByTypeId(dictType.getId());
DictData targetDictData = dictDataList.stream().filter(dictData -> dictData.getCode().equals(pqDevVO.getDevType())).findFirst().orElse(null);
DictData targetDictData = dictDataList.stream().filter(dictData -> dictData.getCode().equals(devType.getName())).findFirst().orElse(null);
if (ObjectUtil.isNotNull(targetDictData)) {
String name = devType.getName();
name = name.substring(0, name.lastIndexOf(StrUtil.C_UNDERLINE));
baseModelMap.put(prefix + BaseReportKeyEnum.DEV_TYPE.getKey() + suffix, name + "(" + targetDictData.getCode() + ")");
name = name.substring(0, name.lastIndexOf(StrUtil.DASHED));
baseModelMap.put(prefix + BaseReportKeyEnum.DEV_TYPE.getKey() + suffix, name + "(" + targetDictData.getValue() + ")");
}
}