Explorar o código

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

Conflicts:
	src/main/java/com/goafanti/common/dao/StarMapper.java
	src/main/java/com/goafanti/portal/controller/PortalBigShotController.java
	src/main/webapp/WEB-INF/views/portal/news/newsDetail.html
Antiloveg %!s(int64=8) %!d(string=hai) anos
pai
achega
b04baf37d2

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

@@ -154,13 +154,15 @@
   		uc.professional_title as professionalTitle,
   		uc.work_unit as workUnit,
   		adc.achievement_count as achievementNum,
-  		info.person_portrait_url as personPortraitUrl
+  		info.person_portrait_url as personPortraitUrl,
+  		interest.id as interestId
   	from star s
   	left join user u on u.id = s.uid
   	left join user_info info on info.uid = s.uid
   	left join user_identity ui on ui.uid = s.uid
   	left join user_career uc on uc.uid = s.uid
   	left join achievement_demand_count adc on adc.uid = s.uid 
+  	left join user_interest interest on interest.to_uid = s.uid and interest.from_uid = #{uid,jdbcType=VARCHAR}
   	where s.hot = 1 
   	order by adc.achievement_count desc
   </select>

+ 82 - 0
src/main/webapp/WEB-INF/views/portal/news/newsDetail.html

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
@@ -13,4 +14,85 @@
 		<script type="text/javascript" th:src="${staticHost+'/portal/news/newsDetail.css'}"></script>
 	</div>
 </body>
+=======
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>新闻详情</title>
+	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+	<link th:href="${portalHost + '/news/newsDetail.css'}" rel="stylesheet">
+</head>
+
+<body>
+	<header>
+		<div th:replace="common::{topNav}"></div>
+	</header>
+	<div class="header_nav_detail">
+		<div class="container ">
+			<div class="row clearfix">
+				<div class="col-md-3 logo">
+					<div th:replace="common::sublogo"></div>
+				</div>
+				<div class="col-md-9">
+					<div th:replace="common::subMenu('news','')"></div>
+				</div>
+			</div>
+		</div>
+		<div class="secondary_navigation"></div>
+	</div>
+	<div>
+		<img th:src="${portalHost + '/img/newsDetail_banner.jpg'}" alt="First slide">
+	</div>
+
+	<div class="container newsDetails_content">
+		<ul id="newsDetailsTab">
+			<li class="active"><a href="/portal/news/newsDetails.html?type=0" data-toggle="tab">全部</a></li>
+			<li><a href="/portal/news/newsDetails.html?type=1" data-toggle="tab">技淘动态</a></li>
+			<li><a href="/portal/news/newsDetails.html?type=2" data-toggle="tab">政府往来</a></li>
+			<li><a href="/portal/news/newsDetails.html?type=3" data-toggle="tab">科技资讯</a></li>
+			<li><a href="/portal/news/newsDetails.html?type=4" data-toggle="tab">国家政策</a></li>
+			<li><a href="/portal/news/newsDetails.html?type=5" data-toggle="tab">地方政策</a></li>
+		</ul>
+		<div class="newsDetail_content">
+			<h4>【快讯】科技部火炬中心邀请科易网董事长林国海作专题讲座</h4>
+			<p class="from_info"><span>来源:科易网</span><span>时间:2016-09-30</span></p>
+			<div id="content_container">
+				<p class="d6_dcpb">  今天上午,科易网董事长林国海应科技部火炬中心邀请,为2016年中国创新驿站培训班作了一场关于《‘互联网+’技术转移体系与市场化探索》的专题讲座。</p>
+				<p style="text-align: center" class="d6_dcpb"><img alt="" width="600" height="450" src="http://kynews.k8008.com/UpLoad/JPG/2016/9/30/2016930100217636108265376180747.jpg"
+					 data-bd-imgshare-binded="1"></p>
+				<p style="text-align: center" class="d6_dcpb">  讲座现场</p>
+				<p class="d6_dcpb">  火炬中心技术市场管理处郭俊峰处长、郭曼工程师,苏州科技局潘华露副局长、科技服务业处朱廉诚处长等领导,与2016年中国创新驿站培训班的省市级技术市场负责人共同参加了讲座。</p>
+				<p style="text-align: center" class="d6_dcpb"><img alt="" width="600" height="450" src="http://kynews.k8008.com/UpLoad/JPG/2016/9/30/2016930100217636108265376960752.jpg"
+					 data-bd-imgshare-binded="1"></p>
+				<p style="text-align: center" class="d6_dcpb">  林董事长讲演中</p>
+				<p class="d6_dcpb">  讲座围绕技术转移的工作路径、产品思维、体系创新、商业模式的维度展开,提出了以产品思维进行供给侧改革和以机制、政策、服务、规则四大环节的创新重构,创新要素价值链等创新理念。</p>
+				<p class="d6_dcpb">  林董事长深入浅出、穿插案例、直击要点的讲演,牢牢抓住了与会人员的注意力。他关于技术转移工作的四点体会,获得了现场众多资深科技工作者的高度认同。</p>
+				<p style="text-align: center" class="d6_dcpb"><img alt="" width="600" height="450" src="http://kynews.k8008.com/UpLoad/JPG/2016/9/30/2016930100217636108265377740757.jpg"
+					 data-bd-imgshare-binded="1"></p>
+				<p style="text-align: center" class="d6_dcpb">  林董事长关于技术转移工作的四点体会</p>
+				<p class="d6_dcpb">  来自湖南省科技厅、海南省科技厅、安徽省科技成果转化中心等单位的多位参会代表,在会上积极向林董事长提问,并提出希望到科易网总部考察。</p>
+				<p style="text-align: center" class="d6_dcpb"><img alt="" width="600" height="450" src="http://kynews.k8008.com/UpLoad/JPG/2016/9/30/2016930100217636108265378208760.jpg"
+					 data-bd-imgshare-binded="1"></p>
+				<p style="text-align: center" class="d6_dcpb">  来自海南省科技厅的参会代表向林董事长提问</p>
+				<p class="d6_dcpb">  讲座结束后,参会代表们纷纷找林董事长和随行工作人员索要名片,此次带去的科易网宣传彩页更是被索取一空,现场氛围十分热烈。</p>
+				<p class="d6_dcpb">  这是科易技术市场模式受认可和欢迎的有力证明。目前,该模式已在全国30个地区得到应用,构建了有效果、可持续的区域科技创新服务体系。</p>
+				<p class="d6_dcpb">  作为技术转移领域践行者的科易网,也一直将自己定位为技术转移创新模式和理念的布道者。应邀到全国各地分享经验,已成为林董事长的“常态化”工作。</p>
+				<p class="d6_dcpb">  就在昨天,林董事长还应邀出席常州科技服务业协会成立大会上作专题报告——《“互联网+”形势下的科技服务业应对策略》,并获得了与会人员的“集体点赞”。</p>
+				<p style="text-align: center" class="d6_dcpb"><img alt="" width="600" height="438" src="http://kynews.k8008.com/UpLoad/JPG/2016/9/30/2016930100217636108265378988765.jpg"
+					 data-bd-imgshare-binded="1"></p>
+				<p style="text-align: center" class="d6_dcpb">  林董事长在常州科技服务业协会成立大会上作报告</p>
+			</div>
+		</div>
+	</div>
+	<footer>
+		<div th:replace="common::copyright"></div>
+	</footer>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/news/newsDetail.js'}"></script>
+	</div>
+</body>
+
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 </html>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 28 - 47
src/main/webapp/WEB-INF/views/portal/news/newsDetails.html