Antiloveg 8 years ago
parent
commit
b602f5b02c

+ 30 - 0
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.common.enums.AchievementMaturity;
+import com.goafanti.common.enums.AchievementTransferMode;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
@@ -93,6 +95,34 @@ public class PortalController extends BaseController {
 			if (StringUtils.isNotBlank(technicalPictureUrl)) {
 				achievement.setPictureList(Arrays.asList(technicalPictureUrl.trim().split(",|,")));
 			}
+			Integer transfermode = achievement.getTransferMode();
+			if (null != transfermode){
+				if (AchievementTransferMode.FULLTRANSFER.getCode().equals(transfermode)){
+					achievement.setTransferModeS(AchievementTransferMode.FULLTRANSFER.getDesc());
+				} else if (AchievementTransferMode.PERMISSIONTRANSFER.getCode().equals(transfermode)){
+					achievement.setTransferModeS(AchievementTransferMode.PERMISSIONTRANSFER.getDesc());
+				} else if (AchievementTransferMode.TECHNOLOGYSHARES.getCode().equals(transfermode)){
+					achievement.setTransferModeS(AchievementTransferMode.TECHNOLOGYSHARES.getDesc());
+				} 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)){
+					achievement.setMaturityS(AchievementMaturity.RESEARCH.getDesc());
+				} else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)){
+					achievement.setMaturityS(AchievementMaturity.SAMPLE.getDesc());
+				} else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)){
+					achievement.setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
+				} else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)){
+					achievement.setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
+				} else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)){
+					achievement.setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
+				}
+				
+			}
 		}
 		mv.setViewName("/portal/detail/achievementDetail");
 		mv.addObject("achievement", achievement);

+ 60 - 0
src/main/java/com/goafanti/common/enums/AchievementMaturity.java

@@ -0,0 +1,60 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum AchievementMaturity {
+	
+	RESEARCH(0, "正在研发"),
+	SAMPLE(1,"已有样品"),
+	PRIMARYTEST(2,"通过小试"),
+	INTERMEDIATETEST(3, "通过中试"),
+	MASSPRODUCTION(4, "可以量产"),
+	OTHER(5, "其他");
+
+	private AchievementMaturity(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, AchievementMaturity> status = new HashMap<Integer, AchievementMaturity>();
+
+	static {
+		for (AchievementMaturity value : AchievementMaturity.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static AchievementMaturity getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static AchievementMaturity getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return OTHER;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+
+}

+ 58 - 0
src/main/java/com/goafanti/common/enums/AchievementTransferMode.java

@@ -0,0 +1,58 @@
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum AchievementTransferMode {
+	
+	FULLTRANSFER(0, "完全转让"),
+	PERMISSIONTRANSFER(1,"许可转让"),
+	TECHNOLOGYSHARES(2,"技术入股"),
+	EXCLUSIVETECHNOLOGYSHARES(3, "5年独占许可转让"),
+	OTHER(4, "其他");
+
+	private AchievementTransferMode(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, AchievementTransferMode> status = new HashMap<Integer, AchievementTransferMode>();
+
+	static {
+		for (AchievementTransferMode value : AchievementTransferMode.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static AchievementTransferMode getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return OTHER;
+	}
+
+	public static AchievementTransferMode getStatus(String code) {
+		if (StringUtils.isNumeric(code)) {
+			return getStatus(Integer.parseInt(code));
+		}
+		return OTHER;
+	}
+
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+
+	private Integer	code;
+	private String	desc;
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

+ 4 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1145,7 +1145,8 @@
 		a.release_date AS releaseDate,
 		dg.name as province,
 		dgg.name as city,
-		a.technical_picture_url AS technicalPictureUrl
+		a.technical_picture_url AS technicalPictureUrl,
+		a.transfer_mode as transferMode
 	FROM
 		achievement a
 	LEFT JOIN user_identity ui ON a.owner_id = ui.uid
@@ -1170,7 +1171,8 @@
 		a.release_date AS releaseDate,
 		dg.name as province,
 		dgg.name as city,
-		a.technical_picture_url AS technicalPictureUrl
+		a.technical_picture_url AS technicalPictureUrl,
+		a.transfer_mode as transferMode
 	FROM
 		achievement a
 	LEFT JOIN organization_identity oi ON a.owner_id = oi.uid

+ 4 - 2
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -585,7 +585,8 @@
 		u.lvl AS LEVEL,
 		ua.ability_label AS abilityLabel,
 		info.personal_profile AS personalProfile,
-		info.life_photo_url AS lifePhotoUrl
+		info.life_photo_url AS lifePhotoUrl,
+		interest.id as interestId
 	FROM
 		<![CDATA[ user ]]> u
 	LEFT JOIN user_identity ui ON ui.uid = u.id
@@ -608,7 +609,8 @@
 		ua.ability_label AS abilityLabel,
 		info.logo_url AS logoUrl,
 		info.company_introduction AS company_introduction,
-		info.publicity_picture_url AS publicityPictureUrl
+		info.publicity_picture_url AS publicityPictureUrl,
+		interest.id as interestId
 	FROM
 	<![CDATA[ user ]]> u
 	LEFT JOIN organization_identity oi ON oi.uid = u.id

+ 30 - 0
src/main/java/com/goafanti/portal/bo/AchievementPortalDetailBo.java

@@ -20,6 +20,8 @@ public class AchievementPortalDetailBo {
 
 	private Integer			maturity;
 
+	private String			maturityS;
+
 	private BigDecimal		transferPrice;
 
 	private String			patentCase;
@@ -38,6 +40,10 @@ public class AchievementPortalDetailBo {
 
 	private String			technicalPictureUrl;
 
+	private Integer			transferMode;
+
+	private String			transferModeS;
+
 	private List<String>	pictureList;
 
 	private List<String>	keywordList;
@@ -138,6 +144,14 @@ public class AchievementPortalDetailBo {
 		this.technicalPictureUrl = technicalPictureUrl;
 	}
 
+	public Integer getTransferMode() {
+		return transferMode;
+	}
+
+	public void setTransferMode(Integer transferMode) {
+		this.transferMode = transferMode;
+	}
+
 	public List<String> getPictureList() {
 		return pictureList;
 	}
@@ -170,6 +184,22 @@ public class AchievementPortalDetailBo {
 		this.city = city;
 	}
 
+	public String getTransferModeS() {
+		return transferModeS;
+	}
+
+	public void setTransferModeS(String transferModeS) {
+		this.transferModeS = transferModeS;
+	}
+
+	public String getMaturityS() {
+		return maturityS;
+	}
+
+	public void setMaturityS(String maturityS) {
+		this.maturityS = maturityS;
+	}
+
 	public String getReleaseDateFormattedDate() {
 		if (this.releaseDate == null) {
 			return null;

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html