Michael_9527 8 years ago
parent
commit
839529068f

+ 1 - 1
src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

@@ -365,7 +365,7 @@
   	<if test="category == 7"> <!-- 智者 -->
   		select 
   		u.id,i.username,ua.ability_label as abilityLabel,
-  		c.achievement,u.head_portrait_url as headPortraitUrl
+  		c.achievement,u.head_portrait_url as headPortraitUrl,u.type
   		from `user` u
   		left join user_ability ua on u.id=ua.uid
   		left join user_career c on u.id=c.uid

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

@@ -1220,9 +1220,9 @@
  	<select id="findUserPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
 		select
 		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
-		info.person_portrait_url as personPortraitUrl,
+		u.head_portrait_url as personPortraitUrl,
 		i.province,
-		info.personal_profile as personalProfile,
+		u.introduction as personalProfile,
 		ua.ability_label as abilityLabel,c.qualification,
 		e.graduate_school,e.major_category,c.work_unit as workUnit,
 		c.engaged_field as engagedField
@@ -1230,7 +1230,7 @@
 		left join user_identity i on u.id=i.uid
 		left join
 		user_career c on u.id=c.uid
-		left join user_info info on u.id=info.uid
+		<!-- left join user_info info on u.id=info.uid -->
 		left join user_ability ua on u.id=ua.uid
 		left join user_edu e on u.id=e.uid
 		WHERE
@@ -1243,14 +1243,14 @@
   <select id="findOrgPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.OrgPartnerDetailBo">
 		select
 		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
-		info.person_portrait_url as personPortraitUrl,
-		i.province,info.personal_profile as personalProfile,
+		u.head_portrait_url as personPortraitUrl,
+		i.province,u.introduction as personalProfile,
 		ua.ability_label as abilityLabel
 		from `user` u
 		left join user_identity i on u.id=i.uid
 		left join
 		user_career c on u.id=c.uid
-		left join user_info info on u.id=info.uid
+		<!-- left join user_info info on u.id=info.uid -->
 		left join user_ability ua on u.id=ua.uid
 		WHERE
 		u.type = 1
@@ -1392,15 +1392,15 @@
   <select id="findUserPartner" parameterType="String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
 		select
 		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
-		info.person_portrait_url as personPortraitUrl,
+		u.head_portrait_url as personPortraitUrl,
 		i.province,
-		info.personal_profile as personalProfile,
-		ua.ability_label as abilityLabel
+		u.introduction as personalProfile,
+		ua.ability_label as abilityLabel,i.uid,u.type
 		from `user` u
 		left join user_identity i on u.id=i.uid
 		left join
 		user_career c on u.id=c.uid
-		left join user_info info on u.id=info.uid
+		<!-- left join user_info info on u.id=info.uid -->
 		left join user_ability ua on u.id=ua.uid
 		WHERE
 		u.type = 0

+ 14 - 1
src/main/java/com/goafanti/marketing/bo/MarketingManagementBo.java

@@ -12,11 +12,24 @@ public class MarketingManagementBo extends MarketingManagement{
 	private String username;/** 智者名字 **/
 	private String achievement;/** 主要成就 **/
 	private String headPortraitUrl;/** 头像地址 **/
-
+	private String id;/** 智者ID **/
+	private String type;/** 个人,单位 **/
 	
 	public String getName() {
 		return name;
 	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
 	public String getAbilityLabel() {
 		return abilityLabel;
 	}

+ 10 - 0
src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java

@@ -43,7 +43,17 @@ public class UserPartnerDetailBo {
 	private String graduate_school;
 	/**专业类别**/
 	private String major_category;
+	/**个人、单位**/
+	private String type;
 	
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
 	public String getGraduate_school() {
 		return graduate_school;
 	}

+ 20 - 35
src/main/webapp/WEB-INF/views/portal/index.html

@@ -116,23 +116,8 @@
 				<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a>
 			</div>
 			<div class="demand_cont">				
-				<div>
-					<a th:each="item:${demandList}" th:class="${demandList.odd}?'odd':'even'" 
-					th:href="@{/portal/technologyTrading/demandDetail(id=${item.productId},type=${item.ownerType})}">
-					<div>
-						<div class="demand_img">
-							<img th:src="${avatarUploadHost + item.coverImg}" alt=""  />
-							<div>
-								<h5 th:text="${item.name}"></h5>
-								<p><span><img th:src="${portalHost + '/img/index_er4.png'}"/></span>长沙</p>
-							</div>
-						</div>
-						<p class="demand_p" th:text="${item.problem_des}"></p>
-					</div>	
-					</a>
-				</div>
-				<div>
-					<a th:each="item:${demandList}" th:class="${demandList.even}?'even':'odd'" 
+				<div >
+					<a th:each="item:${demandList}"
 					th:href="@{/portal/technologyTrading/demandDetail(id=${item.productId},type=${item.ownerType})}">
 					<div>
 						<div class="demand_img">
@@ -221,9 +206,9 @@
 						<img th:src="${portalHost+'/img/index_er7.png'}" alt=""/>
 					</span>
 					<div class="index_cont">
-						<div>
-							<a>
-								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 1}">
+						<div th:if="${#lists.size(speciaList) ge 1}">
+							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[0].id},type=${speciaList[0].type})}">
+								<div class="index_oneman">
 									<img th:src="${avatarUploadHost+speciaList[0].headPortraitUrl}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[0].abilityLabel}">湖南大学生物科学教授</h4>
 									<h3 class="definition" th:text="${speciaList[0].username}">梁晓欣</h3>
@@ -232,9 +217,9 @@
 								</div>
 							</a>	
 						</div>
-						<div>
-							<a>
-								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 2}">
+						<div th:if="${#lists.size(speciaList) ge 2}">
+							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[1].id},type=${speciaList[1].type})}">
+								<div class="index_oneman">
 									<img th:src="${avatarUploadHost+speciaList[1].headPortraitUrl}" alt=""/>
 									<h4 class="appellation" th:text="${speciaList[1].abilityLabel}">中医皮肤病医院专家</h4>
 									<h3 class="definition" th:text="${speciaList[1].username}">钱艳雯</h3>
@@ -243,9 +228,9 @@
 								</div>
 							</a>	
 						</div>
-						<div>
-							<a>
-								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 3}">
+						<div th:if="${#lists.size(speciaList) ge 3}">
+							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[2].id},type=${speciaList[2].type})}">
+								<div class="index_oneman">
 									<img th:src="${avatarUploadHost+speciaList[2].headPortraitUrl}" alt=""/>
 									<h4 class="appellation" th:text="${speciaList[2].abilityLabel}">电子薄膜材料专家</h4>
 									<h3 class="definition" th:text="${speciaList[2].username}">刘钊鑫</h3>
@@ -253,9 +238,9 @@
 								</div>
 							</a>	
 						</div>
-						<div>
-							<a>
-								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 4}">
+						<div th:if="${#lists.size(speciaList) ge 4}">
+							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[3].id},type=${speciaList[3].type})}">
+								<div class="index_oneman">
 									<img th:src="${avatarUploadHost+speciaList[3].headPortraitUrl}" alt=""/>
 									<h4 class="appellation" th:text="${speciaList[3].abilityLabel}">热轧平整工艺专家</h4>
 									<h3 class="definition" th:text="${speciaList[3].username}">郑纹光</h3>
@@ -265,9 +250,9 @@
 								</div>
 							</a>	
 						</div>
-						<div>
-							<a>
-								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 5}">
+						<div th:if="${#lists.size(speciaList) ge 5}">
+							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[4].id},type=${speciaList[4].type})}">
+								<div class="index_oneman">
 									<img th:src="${avatarUploadHost+speciaList[4].headPortraitUrl}" alt="" />
 									<h4 class="appellation" th:text="${speciaList[4].abilityLabel}">联网信息产品营销专家</h4>
 									<h3 class="definition" th:text="${speciaList[4].username}">安良煜</h3>
@@ -275,9 +260,9 @@
 								</div>
 							</a>	
 						</div>
-						<div>
-							<a>
-								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 6}">
+						<div th:if="${#lists.size(speciaList) ge 6}">
+							<a th:href="@{/user/subscriberDetail.html(uid=${speciaList[5].id},type=${speciaList[5].type})}">
+								<div class="index_oneman">
 									<img th:src="${avatarUploadHost+speciaList[5].headPortraitUrl}" alt="" />
 									<h4 class="appellation" th:text="${speciaList[5].abilityLabel}">考古文博学院教授</h4>
 									<h3 class="definition" th:text="${speciaList[5].username}">齐方栋</h3>

+ 1 - 1
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -82,7 +82,7 @@
 		<h3>相关智者</h3>
 		<div>
 			<div th:each="reuserPartner:${reuserPartner}">
-					<a>
+					<a th:href="@{/user/subscriberDetail.html(uid=${reuserPartner.uid},type=${reuserPartner.type})}">
 						<img th:src="${avatarUploadHost+reuserPartner.personPortraitUrl}"
 								alt="" />
 						<div class="about_name">