|
|
@@ -1,5 +1,6 @@
|
|
|
package com.goafanti.common.controller;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
|
|
|
@@ -95,37 +96,47 @@ public class PortalController extends BaseController {
|
|
|
if (StringUtils.isNotBlank(technicalPictureUrl)) {
|
|
|
achievement.setPictureList(Arrays.asList(technicalPictureUrl.trim().split(",|,")));
|
|
|
}
|
|
|
+ List<String> list = new ArrayList<String>();
|
|
|
+ list.add("/achievement/achievement/28140801611164_achievement_technical_picture.jpg");
|
|
|
+ list.add("/achievement/achievement/28140801611164_ach ievement_technical_picture.jpg");
|
|
|
+
|
|
|
+ achievement.setPictureList(list);
|
|
|
Integer transfermode = achievement.getTransferMode();
|
|
|
- if (null != transfermode){
|
|
|
- if (AchievementTransferMode.FULLTRANSFER.getCode().equals(transfermode)){
|
|
|
+ if (null != transfermode) {
|
|
|
+ if (AchievementTransferMode.FULLTRANSFER.getCode().equals(transfermode)) {
|
|
|
achievement.setTransferModeS(AchievementTransferMode.FULLTRANSFER.getDesc());
|
|
|
- } else if (AchievementTransferMode.PERMISSIONTRANSFER.getCode().equals(transfermode)){
|
|
|
+ } else if (AchievementTransferMode.PERMISSIONTRANSFER.getCode().equals(transfermode)) {
|
|
|
achievement.setTransferModeS(AchievementTransferMode.PERMISSIONTRANSFER.getDesc());
|
|
|
- } else if (AchievementTransferMode.TECHNOLOGYSHARES.getCode().equals(transfermode)){
|
|
|
+ } else if (AchievementTransferMode.TECHNOLOGYSHARES.getCode().equals(transfermode)) {
|
|
|
achievement.setTransferModeS(AchievementTransferMode.TECHNOLOGYSHARES.getDesc());
|
|
|
- } else if (AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getCode().equals(transfermode)){
|
|
|
+ } else if (AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getCode().equals(transfermode)) {
|
|
|
achievement.setTransferModeS(AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getDesc());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
Integer maturity = achievement.getMaturity();
|
|
|
- if (null != maturity){
|
|
|
- if (AchievementMaturity.RESEARCH.getCode().equals(maturity)){
|
|
|
+ if (null != maturity) {
|
|
|
+ if (AchievementMaturity.RESEARCH.getCode().equals(maturity)) {
|
|
|
achievement.setMaturityS(AchievementMaturity.RESEARCH.getDesc());
|
|
|
- } else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)){
|
|
|
+ } else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)) {
|
|
|
achievement.setMaturityS(AchievementMaturity.SAMPLE.getDesc());
|
|
|
- } else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)){
|
|
|
+ } else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)) {
|
|
|
achievement.setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
|
|
|
- } else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)){
|
|
|
+ } else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)) {
|
|
|
achievement.setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
|
|
|
- } else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)){
|
|
|
+ } else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)) {
|
|
|
achievement.setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
+ String location = "";
|
|
|
+ String province = achievement.getProvince();
|
|
|
+ String city = achievement.getCity();
|
|
|
+ location += (StringUtils.isBlank(province) ? "" : province) + (StringUtils.isBlank(city) ? "" : city);
|
|
|
+ achievement.setLocation(location);
|
|
|
}
|
|
|
mv.setViewName("/portal/detail/achievementDetail");
|
|
|
mv.addObject("achievement", achievement);
|
|
|
return mv;
|
|
|
}
|
|
|
+
|
|
|
}
|