Browse Source

交易首页

liliang4869 7 years ago
parent
commit
a1f55497fd

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

@@ -25,6 +25,7 @@ import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.PageConstants;
 import com.goafanti.common.dao.ProjectInterestMapper;
+import com.goafanti.common.model.Achievement;
 import com.goafanti.common.model.AchievementInterest;
 import com.goafanti.common.model.Banners;
 import com.goafanti.common.model.Demand;
@@ -797,7 +798,33 @@ public class WebpageController extends BaseController {
 	}
 	
 
+	/*
+	 * 交易
+	 * */
+	@SuppressWarnings("unchecked")
+	@RequestMapping(value = "/portal/technologyTrading/tradingIndex")
+	public ModelAndView patentTrading(HttpServletRequest request, ModelAndView modelAndView,String id, Integer type) {
+		String showLocation="web_achievement_main";
+		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
+		modelAndView.setViewName("/portal/technologyTrading/tradingIndex");
+		//成果
+		List<AchievementObject>achievementObjects=achievementService.getHotAchievements(4, url, showLocation);
+		modelAndView.addObject("achievement",achievementObjects);
+		
+		//需求
+		List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,"web_demand_main");
+		modelAndView.addObject("demand",demandListBos);
+		
+		//政策
+		List<Policy> policies=(List<Policy>) policyService.searchPolicy(null, 2, null, null, "web_index", 1, 5).getList();
+		modelAndView.addObject("policy",policies);
+		
+		//专家
+		List<UserIdentityBo> userIdentityBos=userIdentityService.getExperts(3);
+		modelAndView.addObject("expert",userIdentityBos);
 	
+		return modelAndView;
+	}
 	
 	private void businessHelper(ModelAndView modelAndView,String categoryName,List<JtBusinessCategory> jtBusinessCategories,int[] sizes) {
 		for(int i=0;i<jtBusinessCategories.size();i++) {

+ 65 - 59
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -1,59 +1,65 @@
-package com.goafanti.user.bo;
-
-public class UserIdentityBo extends InputUserIdentity {
-	String reservationCount;
-	String graduateSchool;
-	String majorCategory;
-	String qualification;
-	String professionalTitle;
-	Integer expertAudit;
-	
-	public String getGraduateSchool() {
-		return graduateSchool;
-	}
-
-	public void setGraduateSchool(String graduateSchool) {
-		this.graduateSchool = graduateSchool;
-	}
-
-	public String getMajorCategory() {
-		return majorCategory;
-	}
-
-	public void setMajorCategory(String majorCategory) {
-		this.majorCategory = majorCategory;
-	}
-
-	public String getQualification() {
-		return qualification;
-	}
-
-	public void setQualification(String qualification) {
-		this.qualification = qualification;
-	}
-
-	public String getProfessionalTitle() {
-		return professionalTitle;
-	}
-
-	public void setProfessionalTitle(String professionalTitle) {
-		this.professionalTitle = professionalTitle;
-	}
-
-	public Integer getExpertAudit() {
-		return expertAudit;
-	}
-
-	public void setExpertAudit(Integer expertAudit) {
-		this.expertAudit = expertAudit;
-	}
-
-	public String getReservationCount() {
-		return reservationCount;
-	}
-
-	public void setReservationCount(String reservationCount) {
-		this.reservationCount = reservationCount;
-	}
-	
-}
+package com.goafanti.user.bo;
+
+public class UserIdentityBo extends InputUserIdentity {
+	String reservationCount;
+	String graduateSchool;
+	String majorCategory;
+	String qualification;
+	String professionalTitle;
+	Integer expertAudit;
+	
+	public String getGraduateSchool() {
+		return graduateSchool;
+	}
+
+	public void setGraduateSchool(String graduateSchool) {
+		this.graduateSchool = graduateSchool;
+	}
+
+	public String getMajorCategory() {
+		return majorCategory;
+	}
+
+	public void setMajorCategory(String majorCategory) {
+		this.majorCategory = majorCategory;
+	}
+
+	public String getQualification() {
+		return qualification;
+	}
+
+	public void setQualification(String qualification) {
+		this.qualification = qualification;
+	}
+
+	public String getProfessionalTitle() {
+		return professionalTitle;
+	}
+
+	public void setProfessionalTitle(String professionalTitle) {
+		this.professionalTitle = professionalTitle;
+	}
+
+	public Integer getExpertAudit() {
+		return expertAudit;
+	}
+
+	public void setExpertAudit(Integer expertAudit) {
+		this.expertAudit = expertAudit;
+	}
+
+	public String getReservationCount() {
+		return reservationCount;
+	}
+
+	public void setReservationCount(String reservationCount) {
+		this.reservationCount = reservationCount;
+	}
+	
+	@Override
+	public String getHeadPortraitUrl() {
+		// TODO Auto-generated method stub
+		if(getHeadPortraitUrl()!= null && !getHeadPortraitUrl().contains("."))return null;
+		return super.getHeadPortraitUrl();
+	}
+}

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

@@ -192,7 +192,7 @@
             <div class="logo_right"></div>
             <div class="nav">
                 <ul>
-                    <li th:class="${subM}=='serviceIndex'?active:''" >
+                    <li th:class="${subM}=='apply'?active:''" >
                     <div>
                         <a th:href="@{/portal/service/serviceIndex}">知识产权申请</a>
  
@@ -206,7 +206,7 @@
                     </li>
                     <li th:class="${subM}=='trading'?active:''" >
                    		 <div>
-	                        <a th:href="@{/portal/service/serviceIndex}">知识产权交易</a>
+	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">知识产权交易</a>
 	 						<ol class="subnavigation">
 	                            <li>
 	                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
@@ -217,7 +217,7 @@
 	                        </ol>
                         </div>
                     </li>                           
-                    <li th:class="${subM}=='serviceIndex'?active:''" >
+                    <li th:class="${subM}=='protect'?active:''" >
                     <div>
                         <a th:href="@{/portal/service/serviceIndex}">知识产权维权</a>
  
@@ -289,8 +289,8 @@
 			<div class="bottom">
 				<div class="bottom_text">
 					<div class="text_top">
-						<a href="#">关于公司/</a>
-						<a href="#">联系我们</a>
+						<a th:href="@{/portal/aboutUs}">关于公司/</a>
+						<a th:href="@{/portal/contactUs}">联系我们</a>
 						<p> Copyright &copy 2016-2017 科德 版权所有 湘ICP备15019731号
 							-2 技术支持:湖南阿凡提科技有限公司</p>
 					</div>

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


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


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


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


+ 2 - 2
src/main/webapp/WEB-INF/views/portal/service/serviceList.html

@@ -72,13 +72,13 @@
                         <ul class="pagination">
                             <li class="pagePre">
                                 <a href="#" aria-label="Previous">
-                                    <span aria-hidden="true">上一页</span>
+                                    <span aria-hidden="true">页</span>
                                 </a>
                             </li>
                             <li class="pageNumber"><a href="#" value="1">1</a></li>
                             <li class="pageNext">
                                 <a href="#" aria-label="Next">
-                                    <span aria-hidden="true">下一页</span>
+                                    <span aria-hidden="true">页</span>
                                 </a>
                             </li>
                         </ul>

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


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


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


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

@@ -108,11 +108,11 @@
 				<nav aria-label="Page navigation" class="clearfix">
 					<ul class="pagination">
 						<li class="pagePre"><a href="#" aria-label="Previous"> <span
-								aria-hidden="true">&laquo;</span>
+								aria-hidden="true">首页</span>
 						</a></li>
 						<li class="pageNumber"><a href="#" value="1">1</a></li>
 						<li class="pageNext"><a href="#" aria-label="Next"> <span
-								aria-hidden="true">&raquo;</span>
+								aria-hidden="true">末页</span>
 						</a></li>
 					</ul>
 					<span class="totalCount">共0条数据</span>