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

平台件-生成合规报告

Browse Source
This commit is contained in:
zhn
2023-09-15 11:11:29 +08:00
parent 1e4a8c7720
commit 3b574926b6
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+20 -13
View File
@@ -7618,27 +7618,34 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
//对应 Subject //对应 Subject
dataMap.put("SUBJECT", StringUtils.isNotEmpty(projectLawsInventoryEO.getTitle()) ? projectLawsInventoryEO.getTitle() : ""); dataMap.put("SUBJECT", StringUtils.isNotEmpty(projectLawsInventoryEO.getTitle()) ? projectLawsInventoryEO.getTitle() : "");
//对应 Project //对应 Project
dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectNameInfoEO.getProjectName()) ? projectNameInfoEO.getProjectName() : ""); dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectLibraryBase.getProjectNameId()) ? projectLibraryBase.getProjectNameId() : "");
// dataMap.put("PROJECT_NAME", StringUtils.isNotEmpty(projectNameInfoEO.getProjectName()) ? projectNameInfoEO.getProjectName() : "");
List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("region"); List<SysDictItem> regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("region");
String market = ""; String market = "";
if (StringUtils.equals(cut, CutEnum.CN.getValue())) { if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
market = regionDictList.stream() if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue())) market = regionDictList.stream()
.map(SysDictItem::getItemText) .filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
.collect(Collectors.joining(",")); .map(SysDictItem::getItemText)
.collect(Collectors.joining(","));
}
} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
market = regionDictList.stream() if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue())) market = regionDictList.stream()
.map(SysDictItem::getEnName) .filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
.collect(Collectors.joining(",")); .map(SysDictItem::getEnName)
.collect(Collectors.joining(","));
}
} }
//对应 Market //对应 Market
dataMap.put("MARKET", StringUtils.isNotEmpty(market) ? market : ""); dataMap.put("MARKET", StringUtils.isNotEmpty(market) ? market : "");
//对应 nt 数字平台 if(ObjectUtils.isNotEmpty(projectNameInfoEO)){
dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : ""); //对应 nt 数字平台
//对应 np 车型平台 dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : "");
dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : ""); //对应 np 车型平台
dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
}
String processEndTimeStr = ""; String processEndTimeStr = "";
// 流程最后结束的时间 // 流程最后结束的时间
if (projectLawsInventoryEO.getProcessEndTime() != null) { if (projectLawsInventoryEO.getProcessEndTime() != null) {