Просмотр исходного кода

政策详情、多个页面修改、页面跳转

liliang4869 лет назад: 7
Родитель
Сommit
41b62ca12a

+ 21 - 0
src/main/java/com/goafanti/common/bo/PolicyEntity.java

@@ -3,6 +3,7 @@ package com.goafanti.common.bo;
 import java.sql.Date;
 import java.sql.Date;
 
 
 public class PolicyEntity {
 public class PolicyEntity {
+	String id;
 Date createTime;
 Date createTime;
 Date editTime;
 Date editTime;
 String title;
 String title;
@@ -13,10 +14,30 @@ String cityS;
 String summary;
 String summary;
 String content;
 String content;
 String titleImg;
 String titleImg;
+String source;
 //String firstPictureUrl;
 //String firstPictureUrl;
+String sourceUrl;
+public String getSourceUrl() {
+	return sourceUrl;
+}
+public void setSourceUrl(String sourceUrl) {
+	this.sourceUrl = sourceUrl;
+}
 public Date getCreateTime() {
 public Date getCreateTime() {
 	return createTime;
 	return createTime;
 }
 }
+public String getSource() {
+	return source;
+}
+public void setSource(String source) {
+	this.source = source;
+}
+public String getId() {
+	return id;
+}
+public void setId(String id) {
+	this.id = id;
+}
 public void setCreateTime(Date createTime) {
 public void setCreateTime(Date createTime) {
 	this.createTime = createTime;
 	this.createTime = createTime;
 }
 }

+ 5 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -664,6 +664,9 @@ public class WebpageController extends BaseController {
 		return modelAndView;
 		return modelAndView;
 	}
 	}
 	
 	
+
+	
+	
 	private void businessHelper(ModelAndView modelAndView,String categoryName,List<JtBusinessCategory> jtBusinessCategories,int[] sizes) {
 	private void businessHelper(ModelAndView modelAndView,String categoryName,List<JtBusinessCategory> jtBusinessCategories,int[] sizes) {
 		for(int i=0;i<jtBusinessCategories.size();i++) {
 		for(int i=0;i<jtBusinessCategories.size();i++) {
 			List<JtBusinessProject>projects=jtBusinessService.getBusinessProjectByCategoryId(jtBusinessCategories.get(i).getId(), sizes[i]);
 			List<JtBusinessProject>projects=jtBusinessService.getBusinessProjectByCategoryId(jtBusinessCategories.get(i).getId(), sizes[i]);
@@ -672,5 +675,7 @@ public class WebpageController extends BaseController {
 		}
 		}
 		
 		
 	}
 	}
+	
+	
 
 
 }
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/NewsMapper.java

@@ -1,8 +1,10 @@
 package com.goafanti.common.dao;
 package com.goafanti.common.dao;
 
 
+import java.security.Policy;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
+import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.model.News;
 import com.goafanti.common.model.News;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.bo.NewsSummary;
 import com.goafanti.news.bo.NewsSummary;
@@ -42,5 +44,6 @@ public interface NewsMapper {
 	List<newsInterestBo> newsInterest(String uid);
 	List<newsInterestBo> newsInterest(String uid);
 	
 	
 	List<News>getNewsList(int size);
 	List<News>getNewsList(int size);
+	PolicyEntity getPolicyDetail(String id);
 	
 	
 }
 }

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

@@ -1171,7 +1171,7 @@ order by release_date desc limit #{0}
 </select>
 </select>
 
 
 <select id="getIntellectualProperty" resultType="com.goafanti.common.bo.PolicyEntity" >
 <select id="getIntellectualProperty" resultType="com.goafanti.common.bo.PolicyEntity" >
-select p.id,p.title,p.title_img as titleImg,p.summary,dg1.name as provinceS,dg2.name as cityS,edit_time as editTime ,create_time as createTime from policy p 
+select p.id,p.title,p.title_img as titleImg,p.summary,dg1.name as provinceS,dg2.name as cityS,edit_time as editTime ,create_time as createTime,p.id,p.source,p.source_url as sourceUrl  from policy p 
 left join district_glossory dg1 on dg1.id=p.province
 left join district_glossory dg1 on dg1.id=p.province
 left join district_glossory dg2 on dg2.id=p.city
 left join district_glossory dg2 on dg2.id=p.city
 where audit_status = 2
 where audit_status = 2

+ 7 - 2
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -40,7 +40,6 @@
     source, 
     source, 
     source_url as sourceUrl, 
     source_url as sourceUrl, 
     summary,
     summary,
-    jmrh_flag as jmrhFlag,
     province_id as provinceId,
     province_id as provinceId,
     audit_status as auditStatus,
     audit_status as auditStatus,
     release_status as releaseStatus,
     release_status as releaseStatus,
@@ -386,6 +385,12 @@ from
 order by
 order by
 	create_time desc limit #{0}
 	create_time desc limit #{0}
 </select>	
 </select>	
-
+<select id="getPolicyDetail" resultType="com.goafanti.common.bo.PolicyEntity">
+select p.id,p.title,p.title_img as titleImg,p.summary,
+p.content,dg1.name as provinceS,dg2.name as cityS,edit_time as editTime ,create_time as createTime,p.id,p.source,p.source_url as sourceUrl from policy p 
+left join district_glossory dg1 on dg1.id=p.province
+left join district_glossory dg2 on dg2.id=p.city
+where audit_status = 2 and p.id=#{0}
+</select>
 	
 	
 </mapper>
 </mapper>

+ 5 - 1
src/main/java/com/goafanti/news/service/NewsService.java

@@ -16,6 +16,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.NewsMapper;
 import com.goafanti.common.dao.NewsMapper;
 import com.goafanti.common.model.News;
 import com.goafanti.common.model.News;
@@ -34,7 +35,6 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 	NewsMapper newsMapper;
 	NewsMapper newsMapper;
 	@Value("${spring.profiles.active}")
 	@Value("${spring.profiles.active}")
 	private String env;
 	private String env;
-
 	private static final Logger logger = LoggerFactory.getLogger(NewsService.class);
 	private static final Logger logger = LoggerFactory.getLogger(NewsService.class);
 
 
 	@Cacheable(value = "IndexNewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize")
 	@Cacheable(value = "IndexNewsListCache", key = "'NewsList:Page:'+#pageNo+'Type:'+#type+'Size:'+#pageSize")
@@ -224,4 +224,8 @@ public class NewsService extends BaseMybatisDao<NewsMapper> {
 				return news;
 				return news;
 	}
 	}
 	
 	
+	public PolicyEntity getPolicyDetail(String id) {
+		PolicyEntity res=newsMapper.getPolicyDetail(id);
+		return res;
+	}
 }
 }

+ 37 - 2
src/main/java/com/goafanti/portal/controller/PortalNewsController.java

@@ -12,14 +12,17 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
 
 
+import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.app.bo.ProjectDetailBo;
 import com.goafanti.app.bo.ProjectDetailBo;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.business.service.BusinessProjectService;
 import com.goafanti.business.service.BusinessProjectService;
+import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.dao.AchievementMapper;
 import com.goafanti.common.model.Banners;
 import com.goafanti.common.model.Banners;
 import com.goafanti.common.model.News;
 import com.goafanti.common.model.News;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.StringUtils;
@@ -36,6 +39,9 @@ public class PortalNewsController extends BaseController {
 	private BannersService	bannersService;
 	private BannersService	bannersService;
 	@Resource
 	@Resource
 	private BusinessProjectService	businessProjectService;
 	private BusinessProjectService	businessProjectService;
+	
+	@Resource
+	private AchievementService achievementService;
 	/**
 	/**
 	 * 策源地
 	 * 策源地
 	 * 
 	 * 
@@ -114,9 +120,15 @@ public class PortalNewsController extends BaseController {
 		return res;
 		return res;
 	}
 	}
 
 
+	/*
+	 * 
+	 * type 0-政策  1-新闻
+	 * */
 	@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
 	@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
-	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview, Long id) {
+	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview, Long id,Integer type) {
 		modelview.setViewName("/portal/news/newsDetail");
 		modelview.setViewName("/portal/news/newsDetail");
+		modelview.addObject("type",type); 
+		if(type ==1) {
 		Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, 5, null, null, null);
 		Pagination<NewsPortalList> newsList = newsService.portalNewsList(6, 1, 5, null, null, null);
 		News newsDetail = newsService.findNewsDetail(id);
 		News newsDetail = newsService.findNewsDetail(id);
 		Object news = newsList.getList().get(0);
 		Object news = newsList.getList().get(0);
@@ -141,7 +153,30 @@ public class PortalNewsController extends BaseController {
 		}
 		}
 		modelview.addObject("newsDetail", newsDetail);
 		modelview.addObject("newsDetail", newsDetail);
 		modelview.addObject("newsList", newsList.getList());
 		modelview.addObject("newsList", newsList.getList());
-		modelview.addObject("news", news);
+		modelview.addObject("news", news);}
+		else {
+			List<PolicyEntity> newsList = achievementService.getIntellectualProperty(6);
+			PolicyEntity newsDetail = newsService.getPolicyDetail(id+"");
+			if (null != newsDetail) {
+	
+				String summary = newsDetail.getSummary();
+				modelview.addObject("hasHighTech",
+						summary != null && (summary.indexOf("高新") > -1 || summary.indexOf("高企") > -1));
+				modelview.addObject("hasPatent",
+						summary != null && (summary.indexOf("专利") > -1 || summary.indexOf("知识产权") > -1));
+				modelview.addObject("hasCopyright",
+						summary != null && (summary.indexOf("软著") > -1 || summary.indexOf("知识产权") > -1));
+				modelview.addObject("hasTechProj",
+						summary != null && (summary.indexOf("科技") > -1 || summary.indexOf("项目") > -1));
+			}
+			@SuppressWarnings("unchecked")
+			List<PolicyEntity> la = (List<PolicyEntity>) newsList;
+			
+			modelview.addObject("newsDetail", newsDetail);
+			modelview.addObject("newsList", newsList);
+			if(newsList!=null && newsList.size()>0)
+			modelview.addObject("news", newsList.get(0));
+		}
 		return modelview;
 		return modelview;
 	}
 	}
 
 

+ 18 - 16
src/main/webapp/WEB-INF/views/common.html

@@ -24,15 +24,15 @@
                         <a href="javascript:void(0)" class="head_login">登录</a>
                         <a href="javascript:void(0)" class="head_login">登录</a>
                     </li>
                     </li>
                     <li>
                     <li>
-                        <a href="#">注册</a>
+                        <a th:href="@{/user/signIn}">注册</a>
                     </li>
                     </li>
-                    <li>
-                        <a href="#">我的订单</a>
+                    <li th:if="${isLogin}">
+                        <a th:href="@{/user/account/index.html#techList}">我的订单</a>
                     </li>
                     </li>
-                    <li>
-                        <a href="#">我的关注</a>
+                    <li th:if="${isLogin}">
+                        <a th:href="@{/user/account/index.html#collection}">我的关注</a>
                     </li>
                     </li>
-                    <li>
+                    <li th:if="${isLogin}">
                         <a href="#">我的消息</a>
                         <a href="#">我的消息</a>
                     </li>
                     </li>
                 </ul>
                 </ul>
@@ -47,7 +47,7 @@
     <div class="container">
     <div class="container">
         <div class="navHeader">
         <div class="navHeader">
             <div class="logo">
             <div class="logo">
-                <a href="#">
+                <a th:href="@{/portal/index}">
                     <img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘">
                     <img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘">
                 </a>
                 </a>
             </div>
             </div>
@@ -69,25 +69,21 @@
                     <li>
                     <li>
                         <a href="#">技术交易</a>
                         <a href="#">技术交易</a>
                         <ol class="subnavigation">
                         <ol class="subnavigation">
-                            <li>
-                                <a th:href="@{/portal/technologyTrading/achievement}">专利产品</a>
-                            </li>
+                            
                             <li>
                             <li>
                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
                             </li>
                             </li>
                             <li>
                             <li>
                                 <a th:href="@{/portal/technologyTrading/demand}">技术需求</a>
                                 <a th:href="@{/portal/technologyTrading/demand}">技术需求</a>
                             </li>
                             </li>
-                            <li>
-                                <a th:href="@{/portal/service/serviceIndex}">技术评估</a>
-                            </li>
+                          
                         </ol>
                         </ol>
                     </li>
                     </li>
                     <li>
                     <li>
                         <a href="#">智库咨询</a>
                         <a href="#">智库咨询</a>
                         <ol class="subnavigation">
                         <ol class="subnavigation">
                             <li>
                             <li>
-                                <a href="#">智政</a>
+                                <a th:href="@{/portal/thinkTank/policyList}">智政</a>
                             </li>
                             </li>
                             <li>
                             <li>
                                 <a href="/portal/thinkTank/index.html#zizone">智者</a>
                                 <a href="/portal/thinkTank/index.html#zizone">智者</a>
@@ -96,10 +92,10 @@
                     </li>
                     </li>
 
 
                     <li>
                     <li>
-                        <a href="/portal/aboutUs.html">关于公司</a>
+                        <a th:href="@{/portal/aboutUs}">关于公司</a>
                         <ol class="subnavigation" style="display: none;">
                         <ol class="subnavigation" style="display: none;">
                             <li>
                             <li>
-                                <a href="#">联系我们</a>
+                                <a th:href="@{/portal/contactUs}">联系我们</a>
                             </li>
                             </li>
                         </ol>
                         </ol>
                     </li>
                     </li>
@@ -217,6 +213,12 @@
 						<p>联系客服</p>
 						<p>联系客服</p>
 					</a>
 					</a>
 				</li>
 				</li>
+				 <li>
+                    <a href="" class="pendent_box">
+                        <img th:src="${portalHost+'/img/index_fix4.png'}" alt="">
+                        <p>返回顶部</p>
+                    </a>
+                </li>
 			</ul>
 			</ul>
 			<span class="index_orange"></span>
 			<span class="index_orange"></span>
 		</div>
 		</div>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/aboutUs.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head th:replace="common::header(~{::title},~{::link})">
+<head >
 <title>技淘--我的技术和科技服务交易平台</title>
 <title>技淘--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/aboutUs.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/aboutUs.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/contactUs.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head th:replace="common::header(~{::title},~{::link})">
+<head >
 <title>技淘--我的技术和科技服务交易平台</title>
 <title>技淘--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/contactUs.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/contactUs.css'}" rel="stylesheet">

+ 44 - 42
src/main/webapp/WEB-INF/views/portal/index.html

@@ -36,10 +36,9 @@
 				<ul>
 				<ul>
 					<li class="indexActive">成果</li>
 					<li class="indexActive">成果</li>
 					<li>需求</li>
 					<li>需求</li>
-					<li>专利</li>
+					
 					<li>政策</li>
 					<li>政策</li>
-					<li>专家</li>
-					<li>投资机构</li>
+				
 				</ul>
 				</ul>
 				<div>
 				<div>
 					<div>
 					<div>
@@ -52,119 +51,122 @@
 			<div class="indexSeach_two">
 			<div class="indexSeach_two">
 				<div>
 				<div>
 					<div class="seachTitle">
 					<div class="seachTitle">
-						<div>技术交易</div>
+						<div>技术成果</div>
 					</div>
 					</div>
 					<div id="seachCont">
 					<div id="seachCont">
 						<div class="seachCont seachCont1" clicka="0">
 						<div class="seachCont seachCont1" clicka="0">
 							<div>
 							<div>
-								<a th:href="@{/portal/technologyTrading/achievement}">购买技术</a>
+								购买技术
 							</div>
 							</div>
 							<div>
 							<div>
-								<a th:href="@{/portal/technologyTrading/demand}">承按需求</a>
+							承按需求
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="#">技术评估</a>
+							技术评估
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="@{/portal/technologyTrading/demand}">发布需求</a>
+								发布需求
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="@{/portal/technologyTrading/achievement}">发布成果</a>
+								发布成果
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
 					<div class="seachMore">
 					<div class="seachMore">
-						更多>
+					<a th:href="@{/portal/technologyTrading/achievement}">
+						更多></a>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div>
 				<div>
 					<div class="seachTitle">
 					<div class="seachTitle">
-						<div>科技服务</div>
+						<div>技术需求</div>
 					</div>
 					</div>
 					<div id="seachCont">
 					<div id="seachCont">
-						<div class="seachCont seachCont2" clicka="0">
-							<div>
-								<a href="#">高企认定</a>
-							</div>
-							<div>
-								<a href="">项目申报</a>
-							</div>
+						<div class="seachCont seachCont4" clicka="0">
 							<div>
 							<div>
-								<a href="">体系认证</a>
+								<a href="">发布需求</a>
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">产品认证</a>
+								<a href="">承接需求</a>
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">知识产权</a>
+								<a href="">寻找需求</a>
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">资质认证</a>
+								<a href="">成果对接</a>
 							</div>
 							</div>
+							
 						</div>
 						</div>
 					</div>
 					</div>
 					
 					
 					<div class="seachMore">
 					<div class="seachMore">
-						更多>
+					<a th:href="@{/portal/technologyTrading/demand}">
+						更多></a>
 					</div>
 					</div>
 				</div>
 				</div>
+				
 				<div>
 				<div>
 					<div class="seachTitle">
 					<div class="seachTitle">
-						<div>智库咨询</div>
+						<div>科技服务</div>
 					</div>
 					</div>
 					<div id="seachCont">
 					<div id="seachCont">
-						<div class="seachCont seachCont3" clicka="0">
+						<div class="seachCont seachCont2" clicka="0">
+							<div>
+							高企认定
+							</div>
 							<div>
 							<div>
-								<a href="">中央政策</a>
+							项目申报
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">地方政策</a>
+							体系认证
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">邀约专家</a>
+								产品认证
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">涉外专家</a>
+								知识产权
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">品牌打造</a>
+								资质认证
 							</div>
 							</div>
 						</div>
 						</div>
 					</div>
 					</div>
 					
 					
 					<div class="seachMore">
 					<div class="seachMore">
-						更多>
+					<a th:href="@{/portal/service/serviceIndex}">
+						更多></a>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div>
 				<div>
 					<div class="seachTitle">
 					<div class="seachTitle">
-						<div>科技金融</div>
+						<div>智库咨询</div>
 					</div>
 					</div>
 					<div id="seachCont">
 					<div id="seachCont">
-						<div class="seachCont seachCont4" clicka="0">
+						<div class="seachCont seachCont3" clicka="0">
 							<div>
 							<div>
-								<a href="">项目路演</a>
+								中央政策
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">优质项目</a>
+							地方政策
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">联系投客</a>
+								邀约专家
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">寻找创客</a>
+							涉外专家
 							</div>
 							</div>
 							<div>
 							<div>
-								<a href="">成果对接</a>
+								品牌打造
 							</div>
 							</div>
-							
 						</div>
 						</div>
 					</div>
 					</div>
 					
 					
 					<div class="seachMore">
 					<div class="seachMore">
-						更多>
+					<a th:href="@{/portal/thinkTank/index}">
+						更多></a>
 					</div>
 					</div>
 				</div>
 				</div>
+				
 			</div>
 			</div>
 			<div class="indexSeach_three">
 			<div class="indexSeach_three">
 				<div class="seachTitle2">
 				<div class="seachTitle2">
@@ -265,8 +267,8 @@
 				</div>
 				</div>
 				<div class="policy_p">
 				<div class="policy_p">
 					
 					
-					<a href="#">
-						<div th:each="policy:${policys}">
+					<a th:each="policy:${policys}" th:href="@{/portal/news/newsDetail(id=${policy.id},type=0)}">
+						<div >
 							<div class="policy_date">
 							<div class="policy_date">
 							<h4 th:text="${#dates.format(policy.createTime,'MM-dd')}"></h4>
 							<h4 th:text="${#dates.format(policy.createTime,'MM-dd')}"></h4>
 							<p th:text="${#dates.format(policy.createTime,'yyyy')}"></p>
 							<p th:text="${#dates.format(policy.createTime,'yyyy')}"></p>

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

@@ -0,0 +1,72 @@
+<!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>
+<title>新闻详情--我的技术和科技服务交易平台</title>
+<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('news','newsDetail')"></div>
+	</header>
+	<div id="policyDetail">
+		<div id="policy_content">
+			<div class="content_left" th:each="newsDetail:${newsDetail}">
+				<h3 th:text="${newsDetail.title}?${newsDetail.title}:''"></h3>
+				<div class="small_title">
+					<span>时间:<span th:text="${newsDetail.createTime}?${#dates.format(newsDetail.createTime,'yyyy-MM-dd')}:''"></span></span>
+					<span>来源:<span th:text="${newsDetail.source}?${newsDetail.source}:行业新闻"></span></span>
+				</div>
+				<div th:if="${newsDetail.titleImg != null and newsDetail.titleImg !=''}" class="content_img">					
+					<img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" />
+				</div>
+				<p th:utext="${newsDetail.content}?${newsDetail.content}:'暂无内容'">
+				</p>
+				<h5 class="text_end">文章来自:</h5>
+				<a th:href="${newsDetail.sourceUrl}?${newsDetail.sourceUrl}:'www.jishutao.com'"></a>
+				<hr />
+				<h5 th:if="${hasHighTech || hasPatent || hasCopyright || hasTechProj}">关联业务:</h5>
+				<span th:if="${hasHighTech}"><a th:href="${basePath + '/user/account/services.html#contract'}" target="_blank">高企认证</a></span>
+				<span th:if="${hasPatent}"><a th:href="${basePath + '/user/account/services.html#contract'}" target="_blank">专利申请</a></span>
+				<span th:if="${hasCopyright}"><a th:href="${basePath + '/user/account/services.html#contract'}" target="_blank">软著申请</a></span>
+				<span th:if="${hasTechProj}"><a th:href="${basePath + '/user/account/services.html#contract'}" target="_blank">科技项目申请</a></span>
+				<hr />
+				<!-- <div class="next_div">
+					<span class="rf">
+						<h5>下一篇:</h5> <a href="#">科技探索</a>
+					</span> <span>
+						<h5>上一篇:</h5> <a href="#">探索科技</a>
+					</span>
+				</div> -->
+				<h5>推荐文章:</h5>
+				<div th:each="news:${news}">
+				    <span ><a th:href="@{/portal/news/newsDetail(id=${news.id})}"  th:text="${news.title}?${news.title}:'暂无更多内容'"></a></span>
+				</div>
+			</div>
+			<div class="contetn_right" >
+				<div class="right_title">
+					<div>热点资讯</div>
+				</div>
+				<div th:each="newsList:${newsList}">
+					<h5 ><a th:href="@{/portal/news/newsDetail(id=${newsList.id},type=${type})}"  th:text="${newsList.title}?${newsList.title}:''"></a></h5>
+					 <!-- <img th:src="${avatarUploadHost+newsDetail.titleImg}" alt="" /> -->
+					<p th:text="${newsList.createTime}?${#dates.format(newsList.createTime,'yyyy-MM-dd')}:''"></p>
+				</div>
+			</div>
+		</div>
+	</div>
+	<footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></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 + '/thinkTank/policyDetail.js'}"></script>
+	</div>
+</body>
+
+
+</html>

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


+ 3 - 3
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <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})">
+<head >
 	<title>智库咨询--我的技术和科技服务交易平台</title>
 	<title>智库咨询--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank.css'}" rel="stylesheet">
@@ -132,7 +132,7 @@
 		</div>
 		</div>
 		<!--智政详情-->
 		<!--智政详情-->
 		<div class="tab_zizone">
 		<div class="tab_zizone">
-			<div class="zizone_list" id="zyzc">
+			<!-- <div class="zizone_list" id="zyzc">
 				<h3>中央政策</h3>
 				<h3>中央政策</h3>
 				<div class="main_zizone">
 				<div class="main_zizone">
 					<span class="zizone_left">&laquo;</span>
 					<span class="zizone_left">&laquo;</span>
@@ -140,7 +140,7 @@
 					</ul>
 					</ul>
 					<span class="zizone_right">&raquo;</span>
 					<span class="zizone_right">&raquo;</span>
 				</div>
 				</div>
-			</div>
+			</div> -->
 			<!--地方政策-->
 			<!--地方政策-->
 			<div class="place" id="dfzc">
 			<div class="place" id="dfzc">
 				<h3>地方政策</h3>
 				<h3>地方政策</h3>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
 	xmlns:th="http://www.thymeleaf.org">
-<head th:replace="common::header(~{::title},~{::link})">
+<head>
 	<title>注册页</title>
 	<title>注册页</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">