未符合项列表--相关项目名称修改
This commit is contained in:
+3
-3
@@ -142,7 +142,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
|
|||||||
for (NcrTrackVO trackVO : infoList) {
|
for (NcrTrackVO trackVO : infoList) {
|
||||||
String projectName = trackVO.getProjectName();
|
String projectName = trackVO.getProjectName();
|
||||||
String yearName = trackVO.getYearName();
|
String yearName = trackVO.getYearName();
|
||||||
String market = getMarket(targetMarketList, trackVO);
|
String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut());
|
||||||
String projectVersion = trackVO.getProjectVersion();
|
String projectVersion = trackVO.getProjectVersion();
|
||||||
if(StringUtils.isNotBlank(projectVersion)){
|
if(StringUtils.isNotBlank(projectVersion)){
|
||||||
trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
|
trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
|
||||||
@@ -296,7 +296,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO) {
|
private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO,String cut) {
|
||||||
//目标市场
|
//目标市场
|
||||||
List<DictModel> dictModelList = new ArrayList<>();
|
List<DictModel> dictModelList = new ArrayList<>();
|
||||||
for (String s : trackVO.getTargetMarket().split(",")) {
|
for (String s : trackVO.getTargetMarket().split(",")) {
|
||||||
@@ -308,7 +308,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
|
|||||||
if(dictModelList.size() != 0){
|
if(dictModelList.size() != 0){
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
for (DictModel dictModel : dictModelList) {
|
for (DictModel dictModel : dictModelList) {
|
||||||
if(CutEnum.CN.getValue().equals(trackVO.getCut())){
|
if(CutEnum.CN.getValue().equals(cut)){
|
||||||
sb.append(dictModel.getText()+",");
|
sb.append(dictModel.getText()+",");
|
||||||
}else{
|
}else{
|
||||||
sb.append(dictModel.getTextEn()+",");
|
sb.append(dictModel.getTextEn()+",");
|
||||||
|
|||||||
Reference in New Issue
Block a user