|
|
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
import org.springframework.web.servlet.view.RedirectView;
|
|
|
|
|
|
+import com.goafanti.achievement.bo.AchievementListBo;
|
|
|
import com.goafanti.achievement.service.AchievementService;
|
|
|
import com.goafanti.common.enums.AchievementBargainingMode;
|
|
|
import com.goafanti.common.enums.AchievementMaturity;
|
|
|
@@ -21,9 +22,11 @@ import com.goafanti.common.enums.AchievementTransferMode;
|
|
|
import com.goafanti.common.enums.UserLevel;
|
|
|
import com.goafanti.common.enums.UserType;
|
|
|
import com.goafanti.common.service.FieldGlossoryService;
|
|
|
+import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import com.goafanti.demand.service.DemandService;
|
|
|
import com.goafanti.portal.bo.AchievementPortalDetailBo;
|
|
|
import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
|
|
|
+import com.goafanti.portal.bo.BoutiqueListBo;
|
|
|
import com.goafanti.portal.bo.DemandPortalDetailBo;
|
|
|
import com.goafanti.portal.bo.DemandPortalSimilarListBo;
|
|
|
|
|
|
@@ -126,30 +129,32 @@ public class PortalController extends BaseController {
|
|
|
/**
|
|
|
* 科技成果详情
|
|
|
*/
|
|
|
+ @SuppressWarnings("null")
|
|
|
@RequestMapping(value = "/portal/detail/achievementDetail", method = RequestMethod.GET)
|
|
|
public ModelAndView portalAchievementDetail(String id, Integer type) {
|
|
|
ModelAndView mv = new ModelAndView();
|
|
|
- AchievementPortalDetailBo achievement = null;
|
|
|
+ AchievementPortalDetailBo achievementdetail = null;
|
|
|
+ AchievementListBo achievement = null;
|
|
|
if (UserType.PERSONAL.getCode().equals(type)) {
|
|
|
- achievement = achievementService.findUserPortalAchievementDetail(id);
|
|
|
+ achievementdetail = achievementService.findUserPortalAchievementDetail(id);
|
|
|
} else if (UserType.ORGANIZATION.getCode().equals(type)) {
|
|
|
- achievement = achievementService.findOrgPortalAchievementDetail(id);
|
|
|
+ achievementdetail = achievementService.findOrgPortalAchievementDetail(id);
|
|
|
}
|
|
|
- if (null != achievement) {
|
|
|
- if (StringUtils.isBlank(achievement.getOwnerName())) {
|
|
|
- if (UserLevel.GENERAL.getCode().equals(achievement.getLevel())) {
|
|
|
- achievement.setOwnerName(UNCERTIFY);
|
|
|
+ if (null != achievementdetail) {
|
|
|
+ if (StringUtils.isBlank(achievementdetail.getOwnerName())) {
|
|
|
+ if (UserLevel.GENERAL.getCode().equals(achievementdetail.getLevel())) {
|
|
|
+ achievementdetail.setOwnerName(UNCERTIFY);
|
|
|
} else {
|
|
|
- achievement.setOwnerName(" ");
|
|
|
+ achievementdetail.setOwnerName(" ");
|
|
|
}
|
|
|
}
|
|
|
- Integer fieldA = achievement.getFieldA();
|
|
|
+ Integer fieldA = achievementdetail.getFieldA();
|
|
|
String field = "";
|
|
|
boolean a = Boolean.FALSE;
|
|
|
boolean b = Boolean.FALSE;
|
|
|
if (null != fieldA) {
|
|
|
List<AchievementPortalSimilarListBo> similarList = achievementService.findByFieldA(fieldA,
|
|
|
- achievement.getId(), type);
|
|
|
+ achievementdetail.getId(), type);
|
|
|
if (!similarList.isEmpty()) {
|
|
|
for (AchievementPortalSimilarListBo bo : similarList) {
|
|
|
if (null != bo.getMaturity()) {
|
|
|
@@ -181,70 +186,95 @@ public class PortalController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
mv.addObject("similarList", similarList);
|
|
|
- if (StringUtils.isNotBlank(achievement.getFieldAS())) {
|
|
|
+ if (StringUtils.isNotBlank(achievementdetail.getFieldAS())) {
|
|
|
a = Boolean.TRUE;
|
|
|
}
|
|
|
}
|
|
|
- if (StringUtils.isNotBlank(achievement.getFieldBS())) {
|
|
|
+ if (StringUtils.isNotBlank(achievementdetail.getFieldBS())) {
|
|
|
b = Boolean.TRUE;
|
|
|
}
|
|
|
|
|
|
- field += (a ? achievement.getFieldAS() : "") + (a && b ? DELIMITER : "")
|
|
|
- + (b ? achievement.getFieldBS() : "");
|
|
|
- achievement.setField(field);
|
|
|
- String technicalPictureUrl = achievement.getTechnicalPictureUrl();
|
|
|
+ field += (a ? achievementdetail.getFieldAS() : "") + (a && b ? DELIMITER : "")
|
|
|
+ + (b ? achievementdetail.getFieldBS() : "");
|
|
|
+ achievementdetail.setField(field);
|
|
|
+ String technicalPictureUrl = achievementdetail.getTechnicalPictureUrl();
|
|
|
if (StringUtils.isNotBlank(technicalPictureUrl)) {
|
|
|
- achievement.setPictureList(Arrays.asList(technicalPictureUrl.trim().split(",|,")));
|
|
|
+ achievementdetail.setPictureList(Arrays.asList(technicalPictureUrl.trim().split(",|,")));
|
|
|
}
|
|
|
|
|
|
- Integer transfermode = achievement.getTransferMode();
|
|
|
+ Integer transfermode = achievementdetail.getTransferMode();
|
|
|
if (null != transfermode) {
|
|
|
if (AchievementTransferMode.FULLTRANSFER.getCode().equals(transfermode)) {
|
|
|
- achievement.setTransferModeS(AchievementTransferMode.FULLTRANSFER.getDesc());
|
|
|
+ achievementdetail.setTransferModeS(AchievementTransferMode.FULLTRANSFER.getDesc());
|
|
|
} else if (AchievementTransferMode.PERMISSIONTRANSFER.getCode().equals(transfermode)) {
|
|
|
- achievement.setTransferModeS(AchievementTransferMode.PERMISSIONTRANSFER.getDesc());
|
|
|
+ achievementdetail.setTransferModeS(AchievementTransferMode.PERMISSIONTRANSFER.getDesc());
|
|
|
} else if (AchievementTransferMode.TECHNOLOGYSHARES.getCode().equals(transfermode)) {
|
|
|
- achievement.setTransferModeS(AchievementTransferMode.TECHNOLOGYSHARES.getDesc());
|
|
|
+ achievementdetail.setTransferModeS(AchievementTransferMode.TECHNOLOGYSHARES.getDesc());
|
|
|
} else if (AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getCode().equals(transfermode)) {
|
|
|
- achievement.setTransferModeS(AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getDesc());
|
|
|
+ achievementdetail.setTransferModeS(AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getDesc());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- Integer maturity = achievement.getMaturity();
|
|
|
+ Integer maturity = achievementdetail.getMaturity();
|
|
|
if (null != maturity) {
|
|
|
if (AchievementMaturity.RESEARCH.getCode().equals(maturity)) {
|
|
|
- achievement.setMaturityS(AchievementMaturity.RESEARCH.getDesc());
|
|
|
+ achievementdetail.setMaturityS(AchievementMaturity.RESEARCH.getDesc());
|
|
|
} else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)) {
|
|
|
- achievement.setMaturityS(AchievementMaturity.SAMPLE.getDesc());
|
|
|
+ achievementdetail.setMaturityS(AchievementMaturity.SAMPLE.getDesc());
|
|
|
} else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)) {
|
|
|
- achievement.setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
|
|
|
+ achievementdetail.setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
|
|
|
} else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)) {
|
|
|
- achievement.setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
|
|
|
+ achievementdetail.setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
|
|
|
} else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)) {
|
|
|
- achievement.setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
|
|
|
+ achievementdetail.setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
|
|
|
}
|
|
|
}
|
|
|
String location = "";
|
|
|
- String province = achievement.getProvince();
|
|
|
- String city = achievement.getCity();
|
|
|
+ String province = achievementdetail.getProvince();
|
|
|
+ String city = achievementdetail.getCity();
|
|
|
location += (StringUtils.isBlank(province) ? "" : province) + (StringUtils.isBlank(city) ? "" : city);
|
|
|
|
|
|
- if (null == achievement.getBargainingMode()
|
|
|
- || AchievementBargainingMode.NEGOTIABLE.equals(achievement.getBargainingMode())) {
|
|
|
- achievement.setTransferPriceS(PRICE_NEGOTIABLE);
|
|
|
+ if (null == achievementdetail.getBargainingMode()
|
|
|
+ || AchievementBargainingMode.NEGOTIABLE.equals(achievementdetail.getBargainingMode())) {
|
|
|
+ achievementdetail.setTransferPriceS(PRICE_NEGOTIABLE);
|
|
|
} else {
|
|
|
- if (null != achievement.getTransferPrice()) {
|
|
|
- achievement.setTransferPriceS(achievement.getTransferPrice() + UNIT);
|
|
|
+ if (null != achievementdetail.getTransferPrice()) {
|
|
|
+ achievementdetail.setTransferPriceS(achievementdetail.getTransferPrice() + UNIT);
|
|
|
} else {
|
|
|
- achievement.setTransferPriceS(PRICE_NEGOTIABLE);
|
|
|
+ achievementdetail.setTransferPriceS(PRICE_NEGOTIABLE);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- achievement.setLocation(location);
|
|
|
+ achievementdetail.setLocation(location);
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ //查询精品成果
|
|
|
+ List<AchievementListBo> boutiqueAchievement = achievementService.getAchievement(1);
|
|
|
+ List<AchievementListBo> ReboutiqueAchievement = null;
|
|
|
+ int index1=(int)(1+Math.random()*(12-1+1));
|
|
|
+ int index2=(int)(1+Math.random()*(12-1+1));
|
|
|
+ int index3=(int)(1+Math.random()*(12-1+1));
|
|
|
+
|
|
|
+ for (int i = 0; i < boutiqueAchievement.size(); i++) {
|
|
|
+ ReboutiqueAchievement.add(boutiqueAchievement.get(index1));
|
|
|
+ ReboutiqueAchievement.add(boutiqueAchievement.get(index2));
|
|
|
+ ReboutiqueAchievement.add(boutiqueAchievement.get(index3));
|
|
|
+ };
|
|
|
+
|
|
|
+ //判断登录没登录. 登录了.查找用户喜欢的. 没登录就随机查四个.
|
|
|
+ boolean isLogin = TokenManager.isLogin();
|
|
|
+
|
|
|
+ if(isLogin) {
|
|
|
+ List<AchievementListBo> CustomerLike = achievementService.getPerhapLike();
|
|
|
+ }else {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
mv.setViewName("/portal/detail/achievementDetail");
|
|
|
- mv.addObject("achievement", achievement);
|
|
|
+ mv.addObject("achievement", achievementdetail);
|
|
|
+ mv.addObject("ReboutiqueAchievement", ReboutiqueAchievement);
|
|
|
return mv;
|
|
|
}
|
|
|
|