Browse Source

科技成果详情

Antiloveg 8 years ago
parent
commit
487e569e33

+ 8 - 0
schema/2017-06-17.sql

@@ -0,0 +1,8 @@
+CREATE TABLE `field_glossory` (
+  `id` INT(4) NOT NULL,
+  `name` VARCHAR(32) NULL COMMENT '名称',
+  `pid` INT(4) NULL COMMENT '上级ID',
+  `level` INT(1) NULL COMMENT '层级',
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB
+COMMENT = '领域类别';

+ 4 - 0
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -48,6 +48,9 @@ public class BaseController {
 	@Value(value = "${accessSecret}")
 	private String					accessSecret		= null;
 
+	@Value(value = "${portal.host}")
+	private String					portalHost			= null;
+
 	protected Error buildError(String key) {
 		return buildError(key, null);
 	}
@@ -106,6 +109,7 @@ public class BaseController {
 		model.addAttribute("staticDomain", avatarHost);
 		model.addAttribute("staticHost", staticHost);
 		model.addAttribute("avatarHost", avatarHost);
+		model.addAttribute("portalHost", portalHost);
 		model.addAttribute("basePath", request.getContextPath());
 		model.addAttribute("shiro", SecurityUtils.getSubject());
 		model.addAttribute("isLogin", TokenManager.isLogin());

+ 24 - 13
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -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;
 	}
+
 }

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

@@ -1188,7 +1188,8 @@
 		a.name,
 		a.maturity,
 		ui.province,
-		ui.city
+		ui.city,
+		a.transfer_price as transferPrice
 	FROM
 		achievement a
 	LEFT JOIN user_identity ui ON ui.uid = a.owner_id
@@ -1196,7 +1197,28 @@
 		a.audit_status = 3
 	AND a.deleted_sign = 0
 	AND a.release_status = 1
-	AND a.field_a = #{field,jdbcType=INTEGER}
+	AND a.field_a = #{fieldA,jdbcType=INTEGER}
+	AND a.id <![CDATA[ <> ]]> #{id,jdbcType=VARCHAR}
+	order by a.serial_number desc
+	limit 5 
+  </select>
+  
+  <select id="findOrgPortalSimilarByFieldA" resultType="com.goafanti.portal.bo.AchievementPortalSimilarListBo">
+  	SELECT
+		a.id,
+		a.name,
+		a.maturity,
+		oi.licence_province as province,
+		oi.licence_city as city,
+		a.transfer_price as transferPrice
+	FROM
+		achievement a
+	LEFT JOIN organization_identity oi ON oi.uid = a.owner_id
+	WHERE
+		a.audit_status = 3
+	AND a.deleted_sign = 0
+	AND a.release_status = 1
+	AND a.field_a = #{fieldA,jdbcType=INTEGER}
 	AND a.id <![CDATA[ <> ]]> #{id,jdbcType=VARCHAR}
 	order by a.serial_number desc
 	limit 5 

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

@@ -44,10 +44,20 @@ public class AchievementPortalDetailBo {
 
 	private String			transferModeS;
 
+	private String			location;
+
 	private List<String>	pictureList;
 
 	private List<String>	keywordList;
 
+	public String getLocation() {
+		return location;
+	}
+
+	public void setLocation(String location) {
+		this.location = location;
+	}
+
 	public String getId() {
 		return id;
 	}

+ 17 - 5
src/main/java/com/goafanti/portal/bo/AchievementPortalSimilarListBo.java

@@ -1,15 +1,27 @@
 package com.goafanti.portal.bo;
 
+import java.math.BigDecimal;
+
 public class AchievementPortalSimilarListBo {
-	private String	id;
+	private String		id;
+
+	private String		name;
+
+	private String		province;
 
-	private String	name;
+	private String		city;
 
-	private String	province;
+	private Integer		maturity;
 
-	private String	city;
+	private BigDecimal	transferPrice;
 
-	private Integer	maturity;
+	public BigDecimal getTransferPrice() {
+		return transferPrice;
+	}
+
+	public void setTransferPrice(BigDecimal transferPrice) {
+		this.transferPrice = transferPrice;
+	}
 
 	public String getId() {
 		return id;

+ 3 - 1
src/main/resources/props/config_dev.properties

@@ -65,4 +65,6 @@ aesSecretKey=aft1234567890123
 
 template.cacheable=false
 
-mobileCodeTemplate=SMS_37845022
+mobileCodeTemplate=SMS_37845022
+
+portal.host=//afts.hnzhiming.com/portal/1.0.0

+ 2 - 0
src/main/resources/props/config_local.properties

@@ -68,3 +68,5 @@ aesSecretKey=aft1234567890123
 template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
+
+portal.host=//afts.hnzhiming.com/portal/1.0.0

+ 3 - 1
src/main/resources/props/config_prod.properties

@@ -55,4 +55,6 @@ static.host=//afts.hnzhiming.com/1.0.28
 
 template.cacheable=true
 
-mobileCodeTemplate=SMS_37845022
+mobileCodeTemplate=SMS_37845022
+
+portal.host=//afts.hnzhiming.com/portal/1.0.0

+ 3 - 1
src/main/resources/props/config_test.properties

@@ -67,4 +67,6 @@ aesSecretKey =aft1234567890123
 
 template.cacheable=true
 
-mobileCodeTemplate=SMS_37845022
+mobileCodeTemplate=SMS_37845022
+
+portal.host=//aftts.hnzhiming.com/portal/1.0.0

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