平台件-生成合规报告
This commit is contained in:
+20
-13
@@ -7618,27 +7618,34 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
|
||||
//对应 Subject
|
||||
dataMap.put("SUBJECT", StringUtils.isNotEmpty(projectLawsInventoryEO.getTitle()) ? projectLawsInventoryEO.getTitle() : "");
|
||||
//对应 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");
|
||||
String market = "";
|
||||
if (StringUtils.equals(cut, CutEnum.CN.getValue())) {
|
||||
market = regionDictList.stream()
|
||||
.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
|
||||
.map(SysDictItem::getItemText)
|
||||
.collect(Collectors.joining(","));
|
||||
if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
|
||||
market = regionDictList.stream()
|
||||
.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
|
||||
.map(SysDictItem::getItemText)
|
||||
.collect(Collectors.joining(","));
|
||||
}
|
||||
} else if (StringUtils.equals(cut, CutEnum.EN.getValue())) {
|
||||
market = regionDictList.stream()
|
||||
.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
|
||||
.map(SysDictItem::getEnName)
|
||||
.collect(Collectors.joining(","));
|
||||
if(StringUtils.isNotBlank(projectLibraryBase.getTargetMarket())){
|
||||
market = regionDictList.stream()
|
||||
.filter(e -> projectLibraryBase.getTargetMarket().contains(e.getItemValue()))
|
||||
.map(SysDictItem::getEnName)
|
||||
.collect(Collectors.joining(","));
|
||||
}
|
||||
}
|
||||
//对应 Market
|
||||
dataMap.put("MARKET", StringUtils.isNotEmpty(market) ? market : "");
|
||||
//对应 nt 数字平台
|
||||
dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : "");
|
||||
//对应 np 车型平台
|
||||
dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
|
||||
if(ObjectUtils.isNotEmpty(projectNameInfoEO)){
|
||||
//对应 nt 数字平台
|
||||
dataMap.put("NT", StringUtils.isNotEmpty(projectNameInfoEO.getDigitalPlatform()) ? projectNameInfoEO.getDigitalPlatform() : "");
|
||||
//对应 np 车型平台
|
||||
dataMap.put("NP", StringUtils.isNotEmpty(projectNameInfoEO.getVehiclePlatform()) ? projectNameInfoEO.getVehiclePlatform() : "");
|
||||
}
|
||||
String processEndTimeStr = "";
|
||||
// 流程最后结束的时间
|
||||
if (projectLawsInventoryEO.getProcessEndTime() != null) {
|
||||
|
||||
Reference in New Issue
Block a user