Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

ender 8 years ago
parent
commit
c244da071b

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

@@ -362,5 +362,17 @@
 		from marketing_management mm left join demand x on mm.product_id = x.id
 		where mm.effective =1  and x.audit_status =3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
   	</if>
+  	<if test="category == 7"> <!-- 智者 -->
+  		select 
+  		u.id,i.username,ua.ability_label as abilityLabel,
+  		c.achievement,u.head_portrait_url as headPortraitUrl
+  		from `user` u
+  		left join user_ability ua on u.id=ua.uid
+  		left join user_career c on u.id=c.uid
+  		left join user_identity i on u.id=i.uid
+  		WHERE
+		u.type = 0 and 
+		i.expert = 1	
+  	</if>
   </select>
 </mapper>

+ 30 - 0
src/main/java/com/goafanti/marketing/bo/MarketingManagementBo.java

@@ -8,9 +8,39 @@ public class MarketingManagementBo extends MarketingManagement{
 	private String ownerType; /** 用户类型 **/
 	private String problem_des;/** 问题说明 **/
 	
+	private String abilityLabel;/** 领域 **/
+	private String username;/** 智者名字 **/
+	private String achievement;/** 主要成就 **/
+	private String headPortraitUrl;/** 头像地址 **/
+
+	
 	public String getName() {
 		return name;
 	}
+	public String getAbilityLabel() {
+		return abilityLabel;
+	}
+	public void setAbilityLabel(String abilityLabel) {
+		this.abilityLabel = abilityLabel;
+	}
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	public String getAchievement() {
+		return achievement;
+	}
+	public void setAchievement(String achievement) {
+		this.achievement = achievement;
+	}
+	public String getHeadPortraitUrl() {
+		return headPortraitUrl;
+	}
+	public void setHeadPortraitUrl(String headPortraitUrl) {
+		this.headPortraitUrl = headPortraitUrl;
+	}
 	public String getProblem_des() {
 		return problem_des;
 	}

+ 10 - 10
src/main/webapp/WEB-INF/views/portal/financial/index.html

@@ -109,15 +109,15 @@
 		</div>
 		<div id="member">
 			<div class="member">
-				<a href="#" class="member_img1"> <img
+				<a  class="member_img1"> <img
 					th:src="${portalHost + '/img/member1.png'}" alt="" />
-				</a> <a href="#" class="member_img2"> <img
+				</a> <a  class="member_img2"> <img
 					th:src="${portalHost + '/img/member2.png'}" alt="" />
-				</a> <a href="#" class="member_img3"> <img
+				</a> <a  class="member_img3"> <img
 					th:src="${portalHost + '/img/member.png'}" alt="" />
-				</a> <a href="#" class="member_img4"> <img
+				</a> <a  class="member_img4"> <img
 					th:src="${portalHost + '/img/member-04.png'}" alt="" />
-				</a> <a href="#" class="member_img_center"> <img
+				</a> <a  class="member_img_center"> <img
 					th:src="${portalHost + '/img/member6.png'}" alt="" />
 				</a>
 			</div>
@@ -201,15 +201,15 @@
 		</div>
 		<div id="member_two">
 			<div class="member">
-				<a href="#" class="member_img1"> <img
+				<a  class="member_img1"> <img
 					th:src="${portalHost + '/img/member7.png'}" alt="" />
-				</a> <a href="#" class="member_img2"> <img
+				</a> <a  class="member_img2"> <img
 					th:src="${portalHost + '/img/member8.png'}" alt="" />
-				</a> <a href="#" class="member_img3"> <img
+				</a> <a  class="member_img3"> <img
 					th:src="${portalHost + '/img/member.png'}" alt="" />
-				</a> <a href="#" class="member_img4"> <img
+				</a> <a  class="member_img4"> <img
 					th:src="${portalHost + '/img/member9.png'}" alt="" />
-				</a> <a href="#" class="member_img_center"> <img
+				</a> <a  class="member_img_center"> <img
 					th:src="${portalHost + '/img/member6.png'}" alt="" />
 				</a>
 			</div>

+ 57 - 41
src/main/webapp/WEB-INF/views/portal/index.html

@@ -116,8 +116,24 @@
 				<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a>
 			</div>
 			<div class="demand_cont">				
-				<div th:each="item:${demandList}">
-					<a th:href="@{/portal/technologyTrading/demandDetail(id=${item.productId},type=${item.ownerType})}">
+				<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'" 
+					th:href="@{/portal/technologyTrading/demandDetail(id=${item.productId},type=${item.ownerType})}">
 					<div>
 						<div class="demand_img">
 							<img th:src="${avatarUploadHost + item.coverImg}" alt=""  />
@@ -199,80 +215,80 @@
 		</div>
 		<div id="index_man">
 			<div class="index_man">
-				<img src="../img/index_er6.png" alt="" />
+				<img th:src="${portalHost+'/img/index_er6.png'}" alt="" />				
 				<div>
 					<span class="man_left">
-						<img src="../img/index_er7.png" alt="" />
+						<img th:src="${portalHost+'/img/index_er7.png'}" alt=""/>
 					</span>
 					<div class="index_cont">
 						<div>
-							<a href="#">
-								<div class="index_oneman">
-									<img src="../img/index_er1.jpg" alt="" />
-									<h4 class="appellation">湖南大学生物科学教授</h4>
-									<h3 class="definition">梁晓欣</h3>
-									<p>食子酸在高温和中压条件下可以脱去羧基,从而获得焦性没食子酸,再通过升华的方式获得较纯的焦性没食子产品,
+							<a>
+								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 1}">
+									<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>
+									<p th:text="${speciaList[0].achievement}">食子酸在高温和中压条件下可以脱去羧基,从而获得焦性没食子酸,再通过升华的方式获得较纯的焦性没食子产品,
 								单升华方式产能较低且能耗高,希望通过其他方式(重结晶)等获得此产品,提高产品的产能降低能耗。</p>
 								</div>
 							</a>	
 						</div>
 						<div>
-							<a href="#">
-								<div class="index_oneman">
-									<img src="../img/index_er1.jpg" alt="" />
-									<h4 class="appellation">中医皮肤病医院专家</h4>
-									<h3 class="definition">钱艳雯</h3>
-									<p>师从中医医院皮肤科师承中医泰斗、全国著名皮外科专家赵炳南先生20余年,深受其真传。
+							<a>
+								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 2}">
+									<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>
+									<p th:text="${speciaList[1].achievement}">师从中医医院皮肤科师承中医泰斗、全国著名皮外科专家赵炳南先生20余年,深受其真传。
 									尤其擅长治各种急性热性红斑性皮肤病,是著名的中西医结合皮肤病专家。</p>
 								</div>
 							</a>	
 						</div>
 						<div>
-							<a href="#">
-								<div class="index_oneman">
-									<img src="../img/index_er1.jpg" alt="" />
-									<h4 class="appellation">电子薄膜材料专家</h4>
-									<h3 class="definition">刘钊鑫</h3>
-									<p>主要研究方向包括:BST铁电薄膜、半导体SiC 外延薄膜、半导体低维结构等</p>
+							<a>
+								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 3}">
+									<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>
+									<p th:text="${speciaList[2].achievement}">主要研究方向包括:BST铁电薄膜、半导体SiC 外延薄膜、半导体低维结构等</p>
 								</div>
 							</a>	
 						</div>
 						<div>
-							<a href="#">
-								<div class="index_oneman">
-									<img src="../img/index_er1.jpg" alt="" />
-									<h4 class="appellation">热轧平整工艺专家</h4>
-									<h3 class="definition">郑纹光</h3>
-									<p>主要研究内容有热轧平整工艺的专家指导系统开发,板料冲压成型CAE和模具CAD设计。
+							<a>
+								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 4}">
+									<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>
+									<p th:text="${speciaList[3].achievement}">主要研究内容有热轧平整工艺的专家指导系统开发,板料冲压成型CAE和模具CAD设计。
 									在各类核心期刊发表研究论文18篇。研究方向:1、 模具优化设计理论及应用2、
 									人工智能技术在材料成型中的应用</p>
 								</div>
 							</a>	
 						</div>
 						<div>
-							<a href="#">
-								<div class="index_oneman">
-									<img src="../img/index_er1.jpg" alt="" />
-									<h4 class="appellation">联网信息产品营销专家</h4>
-									<h3 class="definition">安良煜</h3>
-									<p>从2003正式接触互联网至今拥有10多年的互联网信息产品营销实战经验。</p>
+							<a>
+								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 5}">
+									<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>
+									<p th:text="${speciaList[4].achievement}">从2003正式接触互联网至今拥有10多年的互联网信息产品营销实战经验。</p>
 								</div>
 							</a>	
 						</div>
 						<div>
-							<a href="#">
-								<div class="index_oneman">
-									<img src="../img/index_er1.jpg" alt="" />
-									<h4 class="appellation">考古文博学院教授</h4>
-									<h3 class="definition">齐方栋</h3>
-									<p>论著百余篇,主要包括吐谷浑余部历史的研究、三国至隋唐时期墓葬制度的研究、
+							<a>
+								<div class="index_oneman" th:if="${#lists.size(speciaList) ge 6}">
+									<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>
+									<p th:text="${speciaList[5].achievement}">论著百余篇,主要包括吐谷浑余部历史的研究、三国至隋唐时期墓葬制度的研究、
 									中国古代金银器研究、古代马具的研究、古代玻璃器研究、丝绸之路考古研究。</p>
 								</div>
 							</a>	
 						</div>
 					</div>
 					<span class="man_right">
-						<img src="../img/index_er8.png" alt="" />
+						<img th:src="${portalHost+'/img/index_er8.png'}" alt="" />
 					</span>
 				</div>
 			</div>