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-28 17:05:42 +08:00
parent 53e4a7a44e
commit 20ea7b8230
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml
+3 -1
View File
@@ -31,6 +31,8 @@
pni.project_name,
plb.target_market,
plb.project_version,
plb.project_name_id,
plb.platform,
pyni.year_name,
pli.serial_number,
pli.title,
@@ -62,7 +64,7 @@
LEFT JOIN project_name_info pni ON pni.id = plb.project_name_id
LEFT JOIN project_year_name_info pyni ON pyni.id = plb.year_name_id
where
plb.platform is null
1=1
<!--<if test="ncrTrackVO.projectLibraryId != null and ncrTrackVO.projectLibraryId != ''">
plb.id =#{ncrTrackVO.projectLibraryId}
and
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+14 -7
View File
@@ -192,11 +192,16 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
String yearName = trackVO.getYearName();
String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut());
String projectVersion = trackVO.getProjectVersion();
if(StringUtils.isNotBlank(projectVersion)){
trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
if(StringUtils.isNotBlank(trackVO.getPlatform())){
trackVO.setProjectName(trackVO.getProjectNameId());
}else{
trackVO.setProjectName(projectName+"-"+yearName+"-"+market);
if(StringUtils.isNotBlank(projectVersion)){
trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
}else{
trackVO.setProjectName(projectName+"-"+yearName+"-"+market);
}
}
//责任领域中英文切换
if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){
String dutyTerritory = pull(dictItemList, trackVO.getDutyTerritory(), "duty_territory", ncrTrackVO.getCut());
@@ -783,10 +788,12 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO,String cut) {
//目标市场
List<DictModel> dictModelList = new ArrayList<>();
for (String s : trackVO.getTargetMarket().split(",")) {
List<DictModel> dictModelListTemp = targetMarketList.stream()
.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
dictModelList.addAll(dictModelListTemp);
if(StringUtils.isNotBlank(trackVO.getTargetMarket())){
for (String s : trackVO.getTargetMarket().split(",")) {
List<DictModel> dictModelListTemp = targetMarketList.stream()
.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
dictModelList.addAll(dictModelListTemp);
}
}
String targetMarket = "";
if(dictModelList.size() != 0){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java
+4
View File
@@ -247,6 +247,10 @@ public class NcrTrackVO implements Serializable {
@ApiModelProperty(value = "旧数据->old,新数据->new")
private String flag;
private String projectNameId;
private String platform;