소스 검색

Accept Merge Request #231 合并到生产 : (master -> prod)

Merge Request: 合并到生产
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/231
浅川 8 년 전
부모
커밋
929f33d619
29개의 변경된 파일599개의 추가작업 그리고 520개의 파일을 삭제
  1. 7 3
      src/main/java/com/goafanti/common/controller/PortalController.java
  2. 20 5
      src/main/java/com/goafanti/common/controller/WebpageController.java
  3. 13 6
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  4. 54 1
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  5. 2 5
      src/main/java/com/goafanti/common/mapper/NewsMapper.xml
  6. 2 2
      src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml
  7. 1 1
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  8. 4 1
      src/main/java/com/goafanti/common/service/FieldGlossoryService.java
  9. 17 1
      src/main/java/com/goafanti/portal/bo/AchievementPortalDetailBo.java
  10. 15 0
      src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java
  11. 9 0
      src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java
  12. 23 3
      src/main/java/com/goafanti/portal/bo/DemandPortalDetailBo.java
  13. 14 0
      src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java
  14. 31 4
      src/main/java/com/goafanti/portal/controller/PortalSearchController.java
  15. 8 0
      src/main/java/com/goafanti/user/bo/InputOrgPro.java
  16. 30 36
      src/main/resources/props/config_local.properties
  17. 22 13
      src/main/webapp/WEB-INF/views/common.html
  18. 27 22
      src/main/webapp/WEB-INF/views/portal/financial/index.html
  19. 2 6
      src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html
  20. 70 124
      src/main/webapp/WEB-INF/views/portal/index.html
  21. 67 0
      src/main/webapp/WEB-INF/views/portal/member.html
  22. 1 3
      src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html
  23. 3 5
      src/main/webapp/WEB-INF/views/portal/service/propertyRight.html
  24. 97 171
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  25. 24 14
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html
  26. 9 5
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  27. 18 8
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  28. 3 5
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html
  29. 6 76
      src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

+ 7 - 3
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -35,6 +35,8 @@ import com.goafanti.portal.bo.DemandPortalSimilarListBo;
 @Controller
 public class PortalController extends BaseController {
 	@Resource
+	private  FieldGlossoryService glossoryService;
+	@Resource
 	private AchievementService		achievementService;
 	@Resource
 	private DemandService			demandService;
@@ -205,7 +207,6 @@ public class PortalController extends BaseController {
 		if (null != achievementdetail) {
 
 			Integer category = achievementdetail.getCategory();
-			System.out.println("category:" + category);
 			if (null != category) {
 				if (category == 0) {
 					achievementdetail.setCategoryS("专利");
@@ -322,7 +323,7 @@ public class PortalController extends BaseController {
 					achievementdetail.setTransferPriceS(PRICE_NEGOTIABLE);
 				}
 			}
-
+			
 			achievementdetail.setLocation(location);
 
 		}
@@ -375,7 +376,7 @@ public class PortalController extends BaseController {
 			Integer fieldA = reachievementlist.get(i).getFieldA();
 			String field = "";
 			boolean a = Boolean.FALSE;
-			if (null != fieldA) {
+			if (null != fieldA && null !=achievementdetail ) {
 				List<AchievementPortalSimilarListBo> similarList = achievementService.findByFieldA(fieldA,
 						achievementdetail.getId(), type);
 				if (!similarList.isEmpty()) {
@@ -400,6 +401,9 @@ public class PortalController extends BaseController {
 				if (StringUtils.isNotBlank(reachievementlist.get(i).getFieldAS())) {
 					a = Boolean.TRUE;
 				}
+				
+				String fieldAs = glossoryService.getName(fieldA);
+				reachievementlist.get(i).setFieldAS(fieldAs);
 			}
 
 			field += (a ? reachievementlist.get(i).getFieldAS() : "");

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

@@ -28,6 +28,7 @@ import com.goafanti.user.bo.UserPartnerDetailBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.user.service.UserService;
+import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
 
@@ -142,10 +143,9 @@ public class WebpageController extends BaseController {
 	}
 
 	@RequestMapping(value = "/user/subscriberDetail", method = RequestMethod.GET)
-	public ModelAndView ModelAndView(HttpServletRequest request, ModelAndView modelview, String uid, Integer type) {
+	public ModelAndView subscriberDetail(HttpServletRequest request, ModelAndView modelview, String uid, Integer type) {
 		ModelAndView mv = new ModelAndView();
 		UserPartnerDetailBo rePartnerDetail =new UserPartnerDetailBo();
-		System.out.println("uid=" + uid);
 		/* 查询智者详细信息 */
 
 		if (UserType.PERSONAL.getCode().equals(type)) {
@@ -545,10 +545,25 @@ public class WebpageController extends BaseController {
 	 * 政策列表
 	 * @return 
 	 */
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value="/portal/thinkTank/policyList",method = RequestMethod.GET)
-	public ModelAndView policyList(ModelAndView modelAndView){
-		modelAndView.setViewName("/portal/thinkTank/policyList");
-		return modelAndView;
+	public ModelAndView policyList(ModelAndView modelview){
+		modelview.setViewName("/portal/thinkTank/policyList");
+		List<NewsPortalList> newsList = (List<NewsPortalList>)newsService.portalNewsList(5, 1, null, 1, null, null).getList();
+		modelview.addObject("newsList", newsList);
+		return modelview;
+	}
+	
+	/**
+	 * 会员介绍
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value="/portal/member")
+	public ModelAndView member(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/member");
+		return modelview;
 	}
 	
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {

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

@@ -1085,7 +1085,7 @@
   		a.transfer_mode as transferMode,
   		a.technical_picture_url as technicalPictureUrl
   	from achievement a 
-  	left join user u on u.id = a.owner_id
+  	<!-- left join user u on u.id = a.owner_id -->
   	where a.deleted_sign = 0 
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}
@@ -1108,9 +1108,9 @@
   	<if test="lowerPrice != null and lowerPrice != ''">
   		and a.transfer_price &gt; #{lowerPrice,jdbcType=VARCHAR}
   	</if> 	
-  	<!--
+  	
   	and a.release_status = 1
-  	and a.audit_status = 3 -->
+  	and a.audit_status = 3 
   	<if test="dateSort == 0">
   		order by a.release_date asc
   	</if>
@@ -1147,10 +1147,16 @@
   	</if>
   	<if test="lowerPrice != null and lowerPrice != ''">
   		and a.transfer_price &gt; #{lowerPrice,jdbcType=VARCHAR}
-  	</if> 
-  <!-- 
+  	</if> 	
+  	
   	and a.release_status = 1
-  	and a.audit_status = 3 -->
+  	and a.audit_status = 3 
+  	<if test="dateSort == 0">
+  		order by a.release_date asc
+  	</if>
+  	<if test="dateSort == 1">
+  		order by a.release_date desc
+  	</if>	
   </select>
   
   <select id="selectAchievementSearchDetail"  resultType="com.goafanti.portal.bo.AchievementDetailBo">
@@ -1446,6 +1452,7 @@
 		a.transfer_price as price,
 		a.summary as sketch,
 		a.technical_picture_url as pictureUrl,
+		a.owner_type as ownerType,
 		b.name as industryCatalog,
 		a.owner_name as personName
 	from 

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

@@ -931,7 +931,7 @@
   
   <select id="findSearchDemandListByPage" parameterType="String" resultType="com.goafanti.portal.bo.DemandSearchListBo">
   	select 
-	  		d.id, d.name, d.keyword,
+	  		d.id, d.name, d.keyword,d.data_category as dataCategory,d.picture_url as pictureUrl,
 	  		d.serial_number as serialNumber, d.data_category as dataCategory, d.industry_category_a as industryCategoryA,
 	  		d.industry_category_b as industryCategoryB, d.demand_type as demandType, d.budget_cost as budgetCost,
 	  		d.problem_des as problemDes, d.release_date as releaseDate, d.employer_name as employerName,
@@ -1092,7 +1092,9 @@
 		d.id,
 		d.name,
 		d.keyword,
+		d.validity_period as validityPeriod,
 		d.industry_category_a AS industryCategoryA,
+		d.picture_url as pictureUrl,
 		fg.name AS industryCategoryAS,
 		fgg.name AS industryCategorBS,
 		d.budget_cost AS budgetCost,
@@ -1120,6 +1122,8 @@
 		d.id,
 		d.name,
 		d.keyword,
+		d.picture_url as pictureUrl,
+		d.validity_period as validityPeriod,
 		d.industry_category_a AS industryCategoryA,
 		fg.name AS industryCategoryAS,
 		fgg.name AS industryCategoryBS,
@@ -1178,6 +1182,7 @@
    		b.name as industryCategory,
    		a.picture_url as pictureUrl,
    		a.problem_des as sketch,
+   		a.data_category as ownerType,
    		a.employer_name as personName
 	from 
 		demand a 
@@ -1205,4 +1210,52 @@
 	where
 		a.boutique = 1 and a.audit_status =3 and a.industry_category_a = #{industryCategoryA,jdbcType=INTEGER} 
   </select>
+  
+  <!-- 查询需求列表 -->
+	<select id="selectDemandList" parameterType="java.lang.Integer"
+		resultType="com.goafanti.demand.bo.DemandListBo">
+		SELECT
+		d.id,
+		d.name,
+		d.keyword,
+		d.data_category as dataCategory,
+		d.fixed_budget as fixedbudget,
+		d.demand_type as demandType,
+		d.picture_url as pictureUrl,
+		d.industry_category_a AS industryCategoryA,
+		fg.name AS
+		industryCategoryAS,
+		fgg.name AS industryCategorBS,
+		d.budget_cost AS
+		budgetCost,
+		d.problem_des AS problemDes,
+		dg.name AS
+		province,
+		dgg.name AS
+		city,
+		interest.id as interestId,
+		d.employer_name as
+		employerName,
+		u.lvl as
+		level
+		FROM
+		demand d
+		LEFT JOIN `user` u on u.id = d.employer_id
+		LEFT JOIN
+		user_identity ui on ui.uid = d.employer_id
+		LEFT JOIN district_glossory
+		dg ON dg.id = ui.province
+		LEFT JOIN district_glossory dgg ON dgg.id =
+		ui.city
+		LEFT JOIN field_glossory fg on fg.id = d.industry_category_a
+		LEFT JOIN field_glossory fgg on fgg.id = d.industry_category_b
+		LEFT
+		JOIN demand_interest interest on interest.demand_id = d.id and
+		interest.uid = #{uid,jdbcType=VARCHAR}
+		WHERE
+		<if test="_parameter!= null">
+			d.boutique = #{_parameter,jdbcType=INTEGER}
+		</if>
+		limit 0,30
+	</select>
 </mapper>

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

@@ -244,7 +244,7 @@
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>
-		<!-- 
+
 		<if test="type != null and type != 0" >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>
@@ -253,8 +253,7 @@
 		</if>
 		<if test="keyword != null">
 			and a.title like concat('%',#{keyword},'%')
-		</if>
-		 -->
+		</if>	
 		order by create_time desc
 		<if test="page_sql != null">
 			${page_sql}
@@ -269,7 +268,6 @@
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>
-		<!-- 
 		<if test="type != null and type != 0" >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>	
@@ -279,6 +277,5 @@
 		<if test="keyword != null">
 			and a.title like concat('%',#{keyword},'%')
 		</if>
-		-->
 	</select>
 </mapper>

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

@@ -250,7 +250,7 @@
 		a.id = c.uid
 	where 
 	a.type = 1 and b.id is not null
-	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+	and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
 	<if test="locationProvince != null and locationProvince != ''">
 		and b.location_province = #{locationProvince,jdbcType=VARCHAR}
 	</if>
@@ -276,7 +276,7 @@
 		a.id = c.uid
 	where 
 	a.type = 1 and b.id is not null
-	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+	and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
 	<if test="provinceId != null and provinceId != ''">
 		and b.location_province = #{provinceId,jdbcType=VARCHAR}
 	</if>

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

@@ -478,7 +478,7 @@
 			LEFT JOIN user_identity ui ON ui.uid = u.id
 			LEFT JOIN user_career uc ON uc.uid = u.id
 			WHERE
-				u.type = 0
+				u.type = 0 
 			<if test="null != level and level==1 ">
 				AND u.lvl <![CDATA[ >= ]]> 1 
 			</if>

+ 4 - 1
src/main/java/com/goafanti/common/service/FieldGlossoryService.java

@@ -8,6 +8,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.FieldGlossoryMapper;
+import com.goafanti.common.model.FieldGlossory;
 import com.goafanti.common.utils.LoggerUtils;
 @Service
 public class FieldGlossoryService {
@@ -19,7 +20,9 @@ public class FieldGlossoryService {
 	@Cacheable(value = "FieldGlossoryCache", key = "'FieldGlossory:'+#id")
 	public String getName(Integer id){
 		LoggerUtils.debug(logger, "缓存领域列表:[%s]", id);
-		return fieldGlossoryMapper.selectByPrimaryKey(id).getName();
+		FieldGlossory nameid = fieldGlossoryMapper.selectByPrimaryKey(id);
+		String name = nameid.getName();
+		return name;
 	}
 	
 	@CacheEvict(value = "FieldGlossoryCache", key = "'FieldGlossory:'+#id")

+ 17 - 1
src/main/java/com/goafanti/portal/bo/AchievementPortalDetailBo.java

@@ -1,6 +1,7 @@
 package com.goafanti.portal.bo;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -33,6 +34,8 @@ public class AchievementPortalDetailBo {
 	private String			fieldBS;
 
 	private Date			releaseDate;
+	
+	private String			releaseDateS;
 
 	private String			province;
 
@@ -294,7 +297,20 @@ public class AchievementPortalDetailBo {
 		this.categoryS = categoryS;
 	}
 
-	
+	public String getReleaseDateS() {
+		if(null == releaseDate) {
+			return null;
+		}else {
+			SimpleDateFormat sdf =new SimpleDateFormat(AFTConstants.YYYYMMDD);
+			releaseDateS=sdf.format(this.releaseDate);
+			return releaseDateS;
+		}
+	}
+
+	public void setReleaseDateS(String releaseDateS) {
+		this.releaseDateS = releaseDateS;
+	}
+
 	
 	
 }

+ 15 - 0
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -71,6 +71,11 @@ public class AchievementSearchListBo {
 	 * 成熟度(1--正在研发, 2-- 已有样品, 3-- 通过小试, 4-- 通过中试, 5-- 可以量产)
 	 */
 	private Integer		maturity;
+	
+	/**
+	 * 成熟度(1--正在研发, 2-- 已有样品, 3-- 通过小试, 4-- 通过中试, 5-- 可以量产)
+	 */
+	private String		maturityS;
 
 	/**
 	 * 交易方式(转让方式(0--完全转让,1--许可转让,2--技术入股))
@@ -261,4 +266,14 @@ public class AchievementSearchListBo {
 	public void setIntroduction(String introduction) {
 		this.introduction = introduction;
 	}
+
+	public String getMaturityS() {
+		return maturityS;
+	}
+
+	public void setMaturityS(String maturityS) {
+		this.maturityS = maturityS;
+	}
+
+
 }

+ 9 - 0
src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java

@@ -13,6 +13,8 @@ public class BoutiqueListBo {
 	private String industryCatalog;
 	private String pictureUrl;
 	private String technicalpictureurl;
+	/** 拥有者类别 0 - 个人, 1 - 组织 **/
+	private Integer ownerType;
 
 	public String getId() {
 		return id;
@@ -68,5 +70,12 @@ public class BoutiqueListBo {
 	public void setTechnicalpictureurl(String technicalpictureurl) {
 		this.technicalpictureurl = technicalpictureurl;
 	}
+	public Integer getOwnerType() {
+		return ownerType;
+	}
+	public void setOwnerType(Integer ownerType) {
+		this.ownerType = ownerType;
+	}
+	
 	
 }

+ 23 - 3
src/main/java/com/goafanti/portal/bo/DemandPortalDetailBo.java

@@ -1,6 +1,10 @@
 package com.goafanti.portal.bo;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.goafanti.common.constant.AFTConstants;
 
 public class DemandPortalDetailBo {
 	private String		id;
@@ -39,9 +43,11 @@ public class DemandPortalDetailBo {
 	
 	private String		employerAddress;
 	
-	private String      validityPeriod;
+	private Date      validityPeriod;
 	
 	private Integer      fixedbudget;
+	
+	private String      validityPeriodS;
 
 	public Integer getLevel() {
 		return level;
@@ -196,13 +202,27 @@ public class DemandPortalDetailBo {
 		this.fixedbudget = fixedbudget;
 	}
 
-	public String getValidityPeriod() {
+	public Date getValidityPeriod() {
 		return validityPeriod;
 	}
 
-	public void setValidityPeriod(String validityPeriod) {
+	public void setValidityPeriod(Date validityPeriod) {
 		this.validityPeriod = validityPeriod;
 	}
+
+	public String getValidityPeriodS() {
+		SimpleDateFormat sdf =new SimpleDateFormat(AFTConstants.YYYYMMDD);
+		if(null==validityPeriod) {
+		return null ;
+		}else {
+			validityPeriodS=sdf.format(this.validityPeriod);
+			return validityPeriodS;
+		}
+	}
+
+	public void setValidityPeriodS(String validityPeriodS) {
+		this.validityPeriodS = validityPeriodS;
+	}
 	
 	
 	

+ 14 - 0
src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java

@@ -72,6 +72,11 @@ public class DemandSearchListBo {
 	 */
 	private Integer		level;
 
+	/**
+	 * 用户等级
+	 */
+	private String		pictureUrl;
+	
 	public String getEmployerName() {
 		return employerName;
 	}
@@ -192,4 +197,13 @@ public class DemandSearchListBo {
 
 	}
 
+	public String getPictureUrl() {
+		return pictureUrl;
+	}
+
+	public void setPictureUrl(String pictureUrl) {
+		this.pictureUrl = pictureUrl;
+	}
+
+	
 }

+ 31 - 4
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -1,6 +1,8 @@
 package com.goafanti.portal.controller;
 
 import java.math.BigDecimal;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -13,10 +15,13 @@ import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.enums.AchievementMaturity;
 import com.goafanti.common.enums.DemandPortalSearchSignType;
 import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.enums.UserType;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.demand.service.DemandService;
+import com.goafanti.portal.bo.AchievementSearchListBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.UserIdentityService;
 
@@ -35,6 +40,7 @@ public class PortalSearchController extends BaseController {
 	/**
 	 * 项目搜索
 	 */
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
 	public Result achievementSearchList(  String keyword,Integer dataCategory,Integer category,
 			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice) {
@@ -57,8 +63,30 @@ public class PortalSearchController extends BaseController {
 		}catch (Exception e) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "金额"));
 		}
-		res.setData(achievementService.listAchievementSearchList( 
-				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice));
+		
+		Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList( 
+				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice);
+		
+		
+		List<AchievementSearchListBo> list = (List<AchievementSearchListBo>) achievementSearchList.getList();
+		for (int i = 0; i < list.size(); i++) {
+			Integer maturity = list.get(i).getMaturity();
+			if (null != maturity) {
+				if (AchievementMaturity.RESEARCH.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.RESEARCH.getDesc());
+				} else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.SAMPLE.getDesc());
+				} else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
+				} else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
+				} else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)) {
+					list.get(i).setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
+				}
+			}
+		}
+		
+		res.setData(achievementSearchList);
 		return res;
 	}
 
@@ -126,8 +154,7 @@ public class PortalSearchController extends BaseController {
 		if (UserType.PERSONAL.getCode().equals(type)) {
 			res.setData(userIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
 		} else {
-			res.setData(
-					organizationIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
+			res.setData(organizationIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
 		}
 		return res;
 	}

+ 8 - 0
src/main/java/com/goafanti/user/bo/InputOrgPro.java

@@ -298,4 +298,12 @@ public class InputOrgPro {
 		this.institutionEstablishTime = institutionEstablishTime;
 	}
 
+	public Integer getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(Integer companyType) {
+		this.companyType = companyType;
+	}
+	
 }

+ 30 - 36
src/main/resources/props/config_local.properties

@@ -1,49 +1,49 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636E\u5E93\u94FE\u63A5\uFF0C
-jdbc.url=jdbc:mysql://127.0.0.1:3306/aft_dev?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#\u5E10\u53F7
-jdbc.username=root
-#\u5BC6\u7801
+#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
+jdbc.url=jdbc:mysql://192.168.1.213:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#\u5e10\u53f7
+jdbc.username=dev
+#\u5bc6\u7801
 jdbc.password=123456
-#\u68C0\u6D4B\u6570\u636E\u5E93\u94FE\u63A5\u662F\u5426\u6709\u6548\uFF0C\u5FC5\u987B\u914D\u7F6E
+#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
-#\u521D\u59CB\u8FDE\u63A5\u6570
+#\u521d\u59cb\u8fde\u63a5\u6570
 jdbc.initialSize=3
-#\u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
+#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
 jdbc.maxActive=20
-#\u53BB\u6389\uFF0C\u914D\u7F6E\u6587\u4EF6\u5BF9\u5E94\u53BB\u6389
+#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
 #jdbc.maxIdle=20
-#\u914D\u7F6E0,\u5F53\u7EBF\u7A0B\u6C60\u6570\u91CF\u4E0D\u8DB3\uFF0C\u81EA\u52A8\u8865\u5145\u3002
+#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
 jdbc.minIdle=0
-#\u83B7\u53D6\u94FE\u63A5\u8D85\u65F6\u65F6\u95F4\u4E3A1\u5206\u949F\uFF0C\u5355\u4F4D\u4E3A\u6BEB\u79D2\u3002
+#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
 jdbc.maxWait=120000
-#\u83B7\u53D6\u94FE\u63A5\u7684\u65F6\u5019\uFF0C\u4E0D\u6821\u9A8C\u662F\u5426\u53EF\u7528\uFF0C\u5F00\u542F\u4F1A\u6709\u635F\u6027\u80FD\u3002
+#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
 jdbc.testOnBorrow=false
-#\u5F52\u8FD8\u94FE\u63A5\u5230\u8FDE\u63A5\u6C60\u7684\u65F6\u5019\u6821\u9A8C\u94FE\u63A5\u662F\u5426\u53EF\u7528\u3002
+#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
 jdbc.testOnReturn=false
-#\u6B64\u9879\u914D\u7F6E\u4E3Atrue\u5373\u53EF\uFF0C\u4E0D\u5F71\u54CD\u6027\u80FD\uFF0C\u5E76\u4E14\u4FDD\u8BC1\u5B89\u5168\u6027\u3002\u610F\u4E49\u4E3A\uFF1A\u7533\u8BF7\u8FDE\u63A5\u7684\u65F6\u5019\u68C0\u6D4B\uFF0C\u5982\u679C\u7A7A\u95F2\u65F6\u95F4\u5927\u4E8EtimeBetweenEvictionRunsMillis\uFF0C\u6267\u884CvalidationQuery\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548\u3002
+#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
 jdbc.testWhileIdle=true
-#1.Destroy\u7EBF\u7A0B\u4F1A\u68C0\u6D4B\u8FDE\u63A5\u7684\u95F4\u9694\u65F6\u95F4
-#2.testWhileIdle\u7684\u5224\u65AD\u4F9D\u636E
+#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
+#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
 jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4E00\u4E2A\u94FE\u63A5\u751F\u5B58\u7684\u65F6\u95F4\uFF08\u4E4B\u524D\u7684\u503C\uFF1A25200000\uFF0C\u8FD9\u4E2A\u65F6\u95F4\u6709\u70B9BT\uFF0C\u8FD9\u4E2A\u7ED3\u679C\u4E0D\u77E5\u9053\u662F\u600E\u4E48\u6765\u7684\uFF0C\u6362\u7B97\u540E\u7684\u7ED3\u679C\u662F\uFF1A25200000/1000/60/60 = 7\u4E2A\u5C0F\u65F6\uFF09
+#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
 jdbc.minEvictableIdleTimeMillis=300000
-#\u94FE\u63A5\u4F7F\u7528\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u662F\u5426\u56DE\u6536
+#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
 jdbc.removeAbandoned=true
-#\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u65F6\u95F4\uFF08\u5355\u4F4D\u79D2\uFF09\uFF0C\u76EE\u524D\u4E3A5\u5206\u949F\uFF0C\u5982\u679C\u6709\u4E1A\u52A1\u5904\u7406\u65F6\u95F4\u8D85\u8FC75\u5206\u949F\uFF0C\u53EF\u4EE5\u9002\u5F53\u8C03\u6574\u3002
+#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
 jdbc.removeAbandonedTimeout=300
-#\u94FE\u63A5\u56DE\u6536\u7684\u65F6\u5019\u63A7\u5236\u53F0\u6253\u5370\u4FE1\u606F\uFF0C\u6D4B\u8BD5\u73AF\u5883\u53EF\u4EE5\u52A0\u4E0Atrue\uFF0C\u7EBF\u4E0A\u73AF\u5883false\u3002\u4F1A\u5F71\u54CD\u6027\u80FD\u3002
+#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
 jdbc.logAbandoned=true
-#\u7EDF\u8BA1\u76D1\u63A7
+#\u7edf\u8ba1\u76d1\u63a7
 jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=127.0.0.1
+jedis.host=192.168.1.213
 jedis.port=6379
 jedis.timeout=5000
-jedis.password=123456
+jedis.password=aft123456
 
 pwd.hash_algorithm_name=md5
 pwd.hash_iterations=2
@@ -52,29 +52,23 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
+template.cacheable=false
 
-static.host=//afts.hnzhiming.com/1.0.44
+static.host=//sb.jishutao.com/1.0.43
+portal.host=//sf.jishutao.com/portal/2.0.0
+avatar.host=//sb.jishutao.com
+avatar.upload.host=//sb.jishutao.com/upload
 
-upload.path=/Users/xiaolong/Sites/upload
-upload.private.path=/Users/xiaolong/Sites/doc
+upload.path=E:/data/public/upload
+upload.private.path=E:/data/private/upload
 
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
-
-avatar.host=//afts.hnzhiming.com
-
 aesSecretKey=aft1234567890123
 
-template.cacheable=false
-
 mobileCodeTemplate=SMS_37845022
-
-portal.host=//afts.hnzhiming.com/portal/2.0.0
-
 patentTemplate=SMS_72005286
 
-avatar.upload.host=//afts.hnzhiming.com/upload
-
 easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
 easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 22 - 13
src/main/webapp/WEB-INF/views/common.html


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

@@ -14,16 +14,12 @@
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt="" /></a></li>
-			<li data-index=1><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt="" /></a></li>
-			<li data-index=2><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt="" /></a></li>
-			<li data-index=3><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt="" /></a></li>
-			<li data-index=4><a href=""><img
-					th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt="" /></a></li>
+			<li data-index=0><img
+					th:src="${portalHost + '/img/financial_banner01.jpg'}" alt="" /></li>
+			<li data-index=1><img
+					th:src="${portalHost + '/img/financial_banner01.jpg'}" alt="" /></li>
+			<li data-index=2><img
+					th:src="${portalHost + '/img/financial_banner01.jpg'}" alt="" /></li>
 		</ul>
 		<a class="btn btn-next" href=""> <img
 			th:src="${portalHost + '/img/index_next.png'}" alt="" />
@@ -246,7 +242,9 @@
 		<div class="allproduct_bottom">
 			<div class="allproduct_cont">
 				<ul id="demandList_patent">
-					<li><img src="../img/allproduct_img.png" alt="" />
+<<<<<<< HEAD
+=======
+					<!-- <li><img src="../img/allproduct_img.png" alt="" />
 						<div class="details_text">
 							<p>
 								融资金额: <span>10000</span>
@@ -266,20 +264,27 @@
 							<p>
 								项目名 <span> 医疗四分局王死哦风景</span>
 							</p>
-						</div></li>
+						</div></li> -->
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 				</ul>
 			</div>
 			<div class="pagination_box">
-				<span aria-hidden="true" class="page_right">&gt;&gt;</span>
-				<div>
-					<div class="paging_box">
-						<!--<span value="1" class="action_span">1</span>-->
-						<!--<span value="2" >2</span>-->
-						<!--<span value="3" >3</span>-->
-						<!--<span value="4" >4</span>-->
-					</div>
-				</div>
-				<span aria-hidden="false" class="page_left">&lt;&lt;</span>
+				<nav aria-label="Page navigation" class="clearfix">
+						<ul class="pagination">
+							<li class="pagePre">
+								<a href="#" aria-label="Previous">
+									<span aria-hidden="true" value="1">首页</span>
+								</a>
+							</li>
+							<li class="pageNumber active"><a href="#" value="1">1</a></li>
+							<li class="pageNext">
+								<a href="#" aria-label="Next">
+									<span aria-hidden="true">末页</span>
+								</a>
+							</li>
+						</ul>
+						<span class="totalCount">共 0 页 0 条数据</span>
+					</nav>
 			</div>
 		</div>
 	</div>

+ 2 - 6
src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html

@@ -33,9 +33,7 @@
 	            <ul class="detail_toptitle">
 	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
 	            	<li>></li>
-	                <li><a href="#">科技金融 </a></li>
-	                <li>></li>               
-	                <li><a href="#">我要找资金  </a></li>
+	                <li><a href="#">科技金融 </a></li>	                
 	                <li>></li>
 	                <li class="that"><a href="#" >投资机构 </a></li>
 	            </ul>
@@ -50,9 +48,7 @@
 					</div>					
 					<div class="searchs">
 		 				<div class="select">
-		 					<select name="" id="selt">
-		 											
-		 					</select>	 					
+		 					搜一搜 					
 		 				</div> 				
 		 				<div id="search_on">					
 		 					<input type="search" placeholder="高新"/>

+ 70 - 124
src/main/webapp/WEB-INF/views/portal/index.html

@@ -11,44 +11,18 @@
   	<header>
 		<div th:replace="common::nav('','')"></div>
 	</header>
-	<div class="banner_all container">
-		<div class="carousel_top">
-			<ul class="ct-img-big clear">
-				<li data-index=0><a href=""><img
-						th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt="" /></a></li>
-				<li data-index=1><a href=""><img
-						th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt="" /></a></li>
-				<li data-index=2><a href=""><img
-						th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt="" /></a></li>
-				<li data-index=3><a href=""><img
-						th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt="" /></a></li>
-				<li data-index=4><a href=""><img
-						th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt="" /></a></li>
-			</ul>
-		</div>
-		<a class="btnl btn-next" href=""> <img th:src="${portalHost + '/img/index_next.png'}"
-			alt="" />
-		</a> <a class="btnl btn-pre" href=""> <img th:src="${portalHost + '/img/index_pre.png'}"
-			alt="" />
-		</a>
-		<ul class="ct-img-small clear">
-			<li class="active"><img th:src="${portalHost +'/img/highTech_slide_1.jpg'}" alt="" /></li>
-			<li><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt="" /></li>
-			<li><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt="" /></li>
-			<li><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt="" /></li>
-			<li><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt="" /></li>
+	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/index_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/index_banner02.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/index_banner03.jpg'}" alt=""/></a></li>
 		</ul>
-		<span class="text-block">
-			<h2>一、让每一项优秀的技术产生价值</h2>
-		</span> <span>
-			<h2>二、让每一笔资金能增值</h2>
-		</span> <span>
-			<h2>三、让每一位专家不被埋没</h2>
-		</span> <span>
-			<h2>四、让每一家公司蒸蒸日上</h2>
-		</span> <span>
-			<h2>五、让每一个创业者实现梦想</h2>
-		</span>
+		<a class="btn btn-next" href="">
+			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img th:src="${portalHost+'/img/index_pre.png'}" alt=""/>
+		</a>
 	</div>
 	<div class="index_activity">
 		<div class="container">
@@ -78,11 +52,6 @@
 					<p>线下活动</p>
 				</li>
 			</ul>
-			<form action="">
-				<img th:src="${portalHost}+'/img/search.png'" class="search" alt="搜索"/>
-				<input type="text" name="" id="" placeholder="科技转移" />
-				<img th:src="${portalHost}+'/img/index_use.png'" class="index_use" alt="用户"/>
-			</form>
 		</div> 		
   	</div>
  	<div id="active">
@@ -113,103 +82,104 @@
 		<div class="caption">精品成果</div>
 		<div class="content">
 			<div class="cont cont_top1">
-				<a href="#">
+				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost}+'/img/product1.jpg'" alt=""/>
+						<img th:src="${portalHost+'/img/index_one.png'}" alt=""/>
+						<img th:src="${portalHost+'/img/product1.jpg'}" alt=""/>
 					</div>
 					<div class="text">
-						<h2>无人机项目满2000减200</h2>
-						<p>无人机项目满2000减200,联系客服有优惠,精品无人机无与伦比</p>
+						<h2>军民两用无人飞行器系统</h2>
+						<p>军民两用无人飞行器系统包括TX-03、TX-05两个系列,其中TX-03系列属于小型全电无人飞行器</p>
 					</div>
 				</a>
 			</div>
 			<div class="cont cont_bottom1">
-				<a href="#">
+				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=03120e15-6eb2-4066-9d04-ca59278fba8d&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost}+'/img/product2.jpg'" alt=""/>
+						<img th:src="${portalHost+'/img/index_two.png'}" alt=""/>
+						<img th:src="${portalHost+'/img/product2.jpg'}" alt=""/>
 					</div>
 					<div class="text">
-						<h2>无人机项目满2000减200</h2>
-						<p>无人机项目满2000减200,联系客服有优惠,精品无人机无与伦比</p>
+						<h2>新型炭纳米管-石墨烯交联网络高导热薄膜</h2>
+						<p>新型碳纳米管-石墨烯交联网络高导热薄膜由石墨烯片层堆积而成,在石墨烯片层之间原位生长碳纳米管</p>
 					</div>
 				</a>
 			</div>
 			<div class="cont cont_top2">
-				<a href="#">
+				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=73e9d01d-fc19-4585-a6e3-9ae4c9c274c6&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost}+'/img/product3.jpg'" alt=""/>
+						<img th:src="${portalHost+'/img/index_three.png'}" alt=""/>
+						<img th:src="${portalHost+'/img/product3.jpg'}" alt=""/>
 					</div>
 					<div class="text">
-						<h2>无人机项目满2000减200</h2>
-						<p>无人机项目满2000减200,联系客服有优惠,精品无人机无与伦比</p>
+						<h2>基于原位氧化吸附热敏染料废水处理技术</h2>
+						<p>1、反应在常温、常压、开放体系中进行,条件温和,占地面积小,运行可靠,操作维护简单,投资和运行成本均较低</p>
 					</div>
 				</a>
 			</div>
 			<div class="cont cont_bottom2">
-				<a href="#">
+				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=4ce4132f-3749-46da-843b-d4448c78a65b&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost}+'/img/product4.jpg'" alt=""/>
+						<img th:src="${portalHost+'/img/index_four.png'}" alt=""/>
+						<img th:src="${portalHost+'/img/product4.jpg'}" alt=""/>
 					</div>
 					<div class="text">
-						<h2>无人机项目满2000减200</h2>
-						<p>无人机项目满2000减200,联系客服有优惠,精品无人机无与伦比</p>
+						<h2>智能网联驾驶技术</h2>
+						<p>自1990年开展地面无人驾驶车辆技术研究,并联合各大汽车企业开展了自动驾驶汽车技术研发与应用</p>
 					</div>
 				</a>
 			</div>
 			<div class="cont cont_top3">
-				<a href="#">
+				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=3ffb74be-fb8c-48df-9e29-31cc721ec44e&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost}+'/img/product5.jpg'" alt=""/>
+						<img th:src="${portalHost+'/img/index_five.png'}" alt=""/>
+						<img th:src="${portalHost+'/img/product5.jpg'}" alt=""/>
 					</div>
 					<div class="text">
-						<h2>无人机项目满2000减200</h2>
-						<p>无人机项目满2000减200,联系客服有优惠,精品无人机无与伦比</p>
+						<h2>MR-PET高端医学影像装备的关键技术与关键部</h2>
+						<p>正电子发射断层成像(Positron Emission Tomography,以下简称PET)是一种非侵入性的造影方法</p>
 					</div>
 				</a>
 			</div>
 		</div>
 	</div>
 	<div id="policy">
-		<div class="caption">政策解读</div>
+		<div class="captions">政策解读</div>
 		<div class="pol_cont">
 			<div class="pol_left">
-				<img th:src="${portalHost}+'/img/policy.jpg'" alt=""/>
+				<img th:src="${portalHost+'/img/policy.jpg'}" alt=""/>
 				<div class="pol_left_cont">
-					<h3>成都科德向中国科协进行工作汇报</h3>
-					<p><a href="#">2017年4月13日,中国科协乔主任、冯处长在金坛县全国双创,2017年4月13日,中国科协乔主任、冯处长在金坛县全国双创</a>
-					</p>
+					<h3>解读习近平总书记在中央财经领导小组第十六次会议上关于知识产权工作的重要论述</h3>
+					<p>“要调动拥有知识产权的自然人和法人的积极性和主动性,提升产权意识,自觉运用法律武器依法维权。</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a href="#">MORE+</a></div>
-						<div class="data">2017-08-15</div>
+						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116557327490236416'}">MORE+</a></div>
+						<div class="data">2017-09-18</div>
 					</div>
 				</div>
 			</div>
 			<div class="pol_right">
 				<div class="pol_right_big">
-					<h3>成都科德向中国科协进行工作汇报</h3>
-					<p><a href="#">2017年4月13日,中国科协乔主任、冯处长在金坛县全国双创,2017年4月13日,中国科协乔主任、冯处长在金坛县全国双创</a>
-					</p>
+					<h3>国务院知识产权局印发《“十三五”国家知识产权保护和运用规划重点任务分工方案》</h3>
+					<p>中央组织部、中央编办、中央综治办、中央网信办,国务院知识产权战略实施工作部际联席会议各成员单位,民政部、食品药品监管总局</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a href="">MORE+</a></div>
-						<div class="data">2017-08-15</div>
+						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116558483981484032'}">MORE+</a></div>
+						<div class="data">2017-09-18</div>
 					</div>
 				</div>
 				<div class="pol_right_sm">
-					<h3>成都科德向中国科协进行工作汇报</h3>
-					<p><a href="#">2017年4月13日,中国科协乔主任、冯处长在金坛县全国双创,2017年4月13日,中国科协乔主任、冯处长在金坛县全国双创</a>
-					</p>
+					<h3>科技部发布国家重点研发计划智能机器人等重点专项2017年度项目申报指南</h3>
+					<p>各省、自治区、直辖市及计划单列市科技厅(委、局),新疆生产建设兵团科技局,国务院各有关部门科技主管司局,各有关单位</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a href="#">MORE+</a></div>
-						<div class="data">2017-08-15</div>
+						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116557895017316352'}">MORE+</a></div>
+						<div class="data">2017-09-18</div>
 					</div>
 				</div>
-				<div class="pol_right_sm pol_act">
-					<h3>成都科德向中国科协进行工作汇报</h3>
-					<p><a href="#">2017年4月13日,中国科协乔主任、冯处长在金坛县全国双创,2017年4月13日,中国科协乔主任、冯处长在金坛县全国双创</a>
-					</p>
+				<div class="pol_right_sm pol_act">				
+					<h3>开展湖南省2017年高新技术企业认定工作的通知</h3>
+					<p>申报条件:(一)在中国境内(不含港、澳、台地区)注册的企业,近三年内通过自主研发、受让、受赠、并购等方式</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a href="#">MORE+</a></div>
-						<div class="data">2017-08-15</div>
+						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116548420894081024'}">MORE+</a></div>
+						<div class="data">2017-09-18</div>
 					</div>
 				</div>
 			</div>
@@ -224,57 +194,33 @@
 				<div class="need_imgs">
 					<ul>
 						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img1.png'" alt="" />	
-								<p><span href="#">哪些明星项目不为啥东西将上档次想</p>
-							</a>
-						</li>
-						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img1.png'" alt="" />
-								<p>哪些明星项目不为啥东西将上档次想</p>
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=cdee3d8f-affe-45b0-9fd2-542cb2ed16fa'}">
+								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />	
+								<p>新型纳米涂料技术</p>
 							</a>
 						</li>
 						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img2.jpg'" alt="" />
-								<p>哪些明星项目不为啥东西将上档次想</p>
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=b17c5768-327d-4d90-8557-e4f21af050b0'}">
+								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
+								<p>汽车空调的辅助制冷装置</p>
 							</a>
 						</li>
 						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img1.png'" alt="" />
-								<p>哪些明星项目不为啥东西将上档次想</p>
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf'}">
+								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />
+								<p>高性能铅炭电池</p>
 							</a>
 						</li>
 						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img1.png'" alt="" />
-								<p>哪些明星项目不为啥东西将上档次想</p>
-							</a>
-						</li>
-						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img2.jpg'" alt=""/>
-								<p>哪些明星项目不为啥东西将上档次想</p>
-							</a>
-						</li>
-						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img1.png'" alt=""/>
-								<p>哪些明星项目不为啥东西将上档次想</p>
-						    </a>
-						</li>
-						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img1.png'" alt=""/>
-								<p>哪些明星项目不为啥东西将上档次想</p>
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9'}">
+								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
+								<p>ABS板材改性工程塑料的配方及研究</p>
 							</a>
 						</li>
 						<li>
-							<a href="#">
-								<img th:src="${portalHost}+'/img/need_img2.jpg'" alt=""/>
-								<p>哪些明星项目不为啥东西将上档次想</p>
+							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d'}">
+								<img th:src="${portalHost+'/img/need_img3.jpg'}" alt="" />
+								<p>机械领域新型产品或技术</p>
 							</a>
 						</li>
 					</ul>

+ 67 - 0
src/main/webapp/WEB-INF/views/portal/member.html

@@ -0,0 +1,67 @@
+<!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 + '/member.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('','')"></div>
+	</header>
+		<!--主体内容区域开始-->
+	<div class="member">
+		<div class="member_contant">
+			<h3>申请会员获得更多增值服务</h3>
+			<div class="member_main">							
+				<div class="member_on">
+					<h5><img th:src="${portalHost + '/img/member_1.jpg'}" alt="" />提供的专属服务</h5>
+					<p>科技成果,专家信息定点推送</p>
+					<p>查看专家的联系方式</p>
+					<p>任何业务申请,付费业享受会员专属折扣</p>
+					<p>一对一的技术经纪人服务,进行技术成果媒合服务</p>
+					<p>一对一的科技咨询师服务</p>
+					<ul class="member_left">
+						<li>1400元/6个月</li>
+						<li  class="then"><span>限时折扣</span><br /><time>800元/3个月</time></li>
+						<li>2000元/12个月</li>
+					</ul>
+				</div>	
+				<div class="partingline"></div>
+				<div class="member_on">	
+					<h5 class="blur"><img th:src="${portalHost + '/img/member_2.jpg'}" alt="" />提供的专属服务</h5>
+					<p>科技成果,专家信息定点推送</p>
+					<p>查看专家的联系方式</p>
+					<p>任何业务申请,付费业享受会员专属折扣</p>
+					<p>一对一的技术经纪人服务,进行技术成果媒合服务</p>
+					<p>一对一的科技咨询师服务</p>
+					<p>一对一的专业技术顾问,搜集技术情报,提供研发高参</p>
+					<ul>
+						<li>3500元/6个月</li>
+						<li class="then"><span>限时折扣</span><br /><time>2000元/3个月</time></li>
+						<li>5000元/12个月</li>
+					</ul>
+				</div>	
+			</div>
+			<img th:src="${portalHost + '/img/member_4.png'}" alt="黄金会员" class="gold"/>
+			<img th:src="${portalHost + '/img/member_7.jpg'}" alt="钻石会员" class="diamond"/>
+									
+		</div>
+		<div  class="shadow">
+		<img th:src="${portalHost + '/img/shadow7.png'}" alt=""/>
+		</div>
+	</div>
+	<!--主体内容区域结束-->
+	<footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+	</footer>
+	<div class="msg"><span></span></div>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/service.js'}"></script>
+	</div>
+</body>
+</html>

+ 1 - 3
src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html

@@ -16,8 +16,6 @@
 			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_1.jpg'}" alt=""/></a></li>
 			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_2.jpg'}" alt=""/></a></li>
 			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_5.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
@@ -278,7 +276,7 @@
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost + '/service/propertyRight.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/service/highTechCognizance.js'}"></script>
 	</div>
 </body>
 </html>

+ 3 - 5
src/main/webapp/WEB-INF/views/portal/service/propertyRight.html

@@ -13,11 +13,9 @@
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/property_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/property_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/property_banner01.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>

+ 97 - 171
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -14,11 +14,9 @@
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:src="${portalHost+'/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/service_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/service_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/service_banner01.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
@@ -139,158 +137,121 @@
   		</div>
   		<hr />
   		<div class="container change_left">
-	  		<ul class="customer_company">
+  			<ul class="customer_company">
+				<li class="thon">
+					<img th:src="${portalHost+'/img/service_17.jpg'}"/>
+					<p>大连科德信息咨询有限公司</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_18.jpg'}"/>
+					<p>科德华咨福州分公司</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_19.jpg'}"/>
+					<p>广西南宁科发企业信息咨询有限公司</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_20.jpg'}"/>
+					<p>广州科道企业管理咨询有限公司</p>
+				</li>
+			</ul>
+			<ul class="customer_company">
+				<li class="thon">
+					<img th:src="${portalHost+'/img/service_21.jpg'}"/>
+					<p>大连科德信息咨询有限公司</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_22.jpg'}"/>
+					<p>合肥科鼎信息咨询有限公司</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_23.jpg'}"/>
+					<p>南京科鼎信息咨询有限公司</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_24.jpg'}"/>
+					<p>沈阳科德信息咨询有限公司</p>
+				</li>
+			</ul>
+ 		<ol class="customer_circle">
+	  			<li class="thonli"></li>
+	  			<li></li>
+	  		</ol>
+  		</div>
+  		<div class="container change_right">
+  		<ul class="customer_company">
 	  			<li class="thon">
 	  				<img th:src="${portalHost+'/img/service_1.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='北京市首发高速公路建设管理公司'>北京市首发高速公路建设管理有限责任公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_2.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='北京首通建设工程有限公司'>北京首通建设工程有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_3.jpg'}"/>
-	  				<p>法拉利457</p>
+	  				<p title='北京沃尔达能源科技有限公司'>北京沃尔达能源科技有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_4.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='大连港口设计研究院有限公司'>大连港口设计研究院有限公司</p>
 	  			</li>
 	  		</ul>
 	  		<ul class="customer_company">
 	  			<li class="thon">
 	  				<img th:src="${portalHost+'/img/service_5.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='大连三川建设集团有限公司'>大连三川建设集团有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_6.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='鸿博昊天科技有限公司'>鸿博昊天科技有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_7.jpg'}"/>
-	  				<p>法拉利457</p>
+	  				<p title='华晨专用车装备科技(大连)有限公司'>华晨专用车装备科技(大连)有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_8.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='内蒙古中牧生物药业有限公司'>内蒙古中牧生物药业有限公司</p>
 	  			</li>
 	  		</ul>
 	  		<ul class="customer_company">
 	  			<li class="thon">
 	  				<img th:src="${portalHost+'/img/service_9.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='上海中建建筑设计院有限公司'>上海中建建筑设计院有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_10.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='圆通速递(北京)有限公司'>圆通速递(北京)有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_11.jpg'}"/>
-	  				<p>法拉利457</p>
+	  				<p title='中国能源建设东北电力第一工程公司'>中国能源建设集团东北电力第一工程有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_12.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='中国一冶集团有限公司'>中国一冶集团有限公司</p>
 	  			</li>
 	  		</ul>
 	  		<ul class="customer_company">
 	  			<li class="thon">
 	  				<img th:src="${portalHost+'/img/service_13.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='中航国际航空发展有限公司'>中航国际航空发展有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_14.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='中华商务联合印刷(广东)有限公司'>中华商务联合印刷(广东)有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_15.jpg'}"/>
-	  				<p>法拉利457</p>
+	  				<p title='中铁电气化局集团有限公司'>中铁电气化局集团有限公司</p>
 	  			</li>
 	  			<li>
 	  				<img th:src="${portalHost+'/img/service_16.jpg'}"/>
-	  				<p>法拉利456</p>
+	  				<p title='中铁十六局集团铁运工程有限公司'>中铁十六局集团铁运工程有限公司</p>
 	  			</li>
 	  		</ul>
-	  		<ol class="customer_circle">
-	  			<li class="thonli"></li>
-	  			<li></li>
-	  			<li></li>
-	  			<li></li>
-	  		</ol>
-  		</div>
-  		<div class="container change_right">
-			<ul class="customer_company">
-				<li class="thon">
-					<img th:src="${portalHost+'/img/service_17.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_18.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_19.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_20.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-			</ul>
-			<ul class="customer_company">
-				<li class="thon">
-					<img th:src="${portalHost+'/img/service_21.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_22.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_23.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_24.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-			</ul>
-			<ul class="customer_company">
-				<li class="thon">
-					<img th:src="${portalHost+'/img/service_25.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_26.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_27.jpg'}"/>
-					<p>法拉利123</p>                       
-				</li>                                      
-				<li>                                       
-					<img th:src="${portalHost+'/img/service_28.jpg'}"/>
-					<p>法拉利123</p>                       
-				</li>                                      
-			</ul>                                          
-			<ul class="customer_company">                  
-				<li class="thon">                          
-					<img th:src="${portalHost+'/img/service_29.jpg'}"/>
-					<p>法拉利123</p>                       
-				</li>                                      
-				<li>                                       
-					<img th:src="${portalHost+'/img/service_30.jpg'}"/>
-					<p>法拉利123</p>                        
-				</li>                                       
-				<li>                                        
-					<img th:src="${portalHost+'/img/service_31.jpg'}"/>
-					<p>法拉利123</p>                        
-				</li>                                       
-				<li>                                        
-					<img th:src="${portalHost+'/img/service_32.jpg'}"/>
-					<p>法拉利123</p>
-				</li>
-			</ul>
+			
 			<ol class="customer_circle">
 				<li class="thonli"></li>
 				<li></li>
@@ -317,112 +278,77 @@
   	<div class="cooperation">
   		<div class="container">
   			<h4>合作服务机构</h4>
-  			<ol class="work_office">
-  				<li class="patent check_li">专利事务所</li>
+  			<ol class="work_office"> 				
   				<li class="bursar">会计事务所</li>
   				<li class="lawyer">律师事务所</li>
   			</ol>
-  			<ul id="patent">
-  				<li>
-  					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-	  				<p>活生生专利事务</p>
-	  				<div class="coop_text">
-	  					<h6>活生生专利事务</h6>	  				
-	  					<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>	  							  					
-	  				</div>
-  				</li>
-  				<li>
-  					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-	  				<p>活生生专利事务</p>
-	  				<div class="coop_text">
-	  					<h6>活生生专利事务</h6>	  					
-	  					<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>	  							  					
-	  				</div>
-  				</li>
-  				<li>
-  					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-	  				<p>活生生专利事务</p>
-	  				<div class="coop_text">
-	  					<h6>活生生专利事务</h6>	  					
-	  					<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>	  							  					
-	  				</div>
-  				</li>
-  				<li>
-  					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-	  				<p>活生生专利事务</p>
-	  				<div class="coop_text">
-	  					<h6>活生生专利事务</h6>	  					
-	  					<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>	  							  					
-	  				</div>
-  				</li>
-  			</ul>
 			<ul id="bursar">
 				<li>
-					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-					<p>会计事务所</p>
+					<img th:src="${portalHost+'/img/kuaiji1.jpg'}" alt=""/>
+					<p>湖南元和联合会计师事务所</p>
 					<div class="coop_text">
-						<h6>会计事务所</h6>
-						<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>
+						<h6>湖南元和联合会计师事务所</h6>
+						<p>湖南元和联合会计师事务所是经湖南省财政厅批准成立、在长沙市工商行政管理局天心分局注册登记的联合会计师事务所。湖南元和联合会计师事务所成立于2007年,我所成立时间前后延续已有15年历史,是一所专门从事报表审计、验资、税务咨询、财务顾问、财务清理等业务的专业服务机构。</p>
 					</div>
 				</li>
 				<li>
-					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-					<p>会计事务所</p>
+					<img th:src="${portalHost+'/img/kuaiji2.jpg'}" alt=""/>
+					<p>湖南美好未来会计师事务所</p>
 					<div class="coop_text">
-						<h6>会计事务所</h6>
-						<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>
+						<h6>湖南美好未来会计师事务所</h6>
+						<p>湖南美好未来会计师事务所秉承“服务创造价值,服务共创未来”的企业理念。竭诚为客户提供优质、快捷、合理的工商注册的解决方案。 </p>
 					</div>
 				</li>
 				<li>
-					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-					<p>会计事务所</p>
+					<img th:src="${portalHost+'/img/kuaiji3.jpg'}" alt=""/>
+					<p>湖南英特会计师事务所</p>
 					<div class="coop_text">
-						<h6>会计事务所</h6>
-						<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>
+						<h6>湖南英特会计师事务所</h6>
+						<p>湖南英特是由湖南英特有限责任会计师事务所、湖南英特资产评估有限公司、长沙英特税务师事务所有限责任公司等为独立法人公司组成的综合性专业咨询机构,能够提供审计、评估、造价、税务、清算、咨询、鉴证等全方位便捷的一条龙服务。</p>
 					</div>
 				</li>
 				<li>
-					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-					<p>会计事务所</p>
+					<img th:src="${portalHost+'/img/kuaiji4.jpg'}" alt=""/>
+					<p>湖南远扬会计师事务有限公司</p>
 					<div class="coop_text">
-						<h6>会计事务所</h6>
-						<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>
+						<h6>湖南远扬会计师事务有限公司</h6>
+						<p>湖南远扬会计师事务所有限公司成立于2009年,随着公司业务高速发展,在长沙成立了湖南远扬税务师事务所有限公司、湖南远诚司法鉴定所、湖南远扬资产评估有限公司、湖南远诚工程造价咨询有限责任公司、湖南盛泰房地产评估有限公司。</p>
 					</div>
 				</li>
 			</ul>
 			<ul id="lawyer">
 				<li>
-					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-					<p>活生生专利事务</p>
+					<img th:src="${portalHost+'/img/lvshi1.jpg'}" alt=""/>
+					<p>北京冠和权律师事务所</p>
 					<div class="coop_text">
-						<h6>律师事务所</h6>
-						<p>看女生对苍井空块九点半纳斯达克就看你的见死不救</p>
+						<h6>北京冠和权律师事务所</h6>
+						<p>北京冠和权由从事多年知识产权行业的资深代理人创立,由业界资深的律师、知识产权顾问等专业人士组成。北京冠和权专业代理海内外商标注册、答辩、侵权诉讼、著名商标和驰名商标认定、国内外专利检索和申请、著作权登记、海关备案等知识产权相关的服务。</p>
 					</div>
 				</li>
 				<li>
-					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-					<p>律师事务所</p>
+					<img th:src="${portalHost+'/img/lvshi2.jpg'}" alt=""/>
+					<p>罗云律师网</p>
 					<div class="coop_text">
-						<h6>律师事务所</h6>
-						<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>
+						<h6>罗云律师网</h6>
+						<p>罗云律所始创于1986年,总部位于杭州,并在上海设有分所,是中国知名的大型律师事务所和长三角地区领先的律师事务所之一,综合实力最近15年一直居于浙江首位,天册(包括上海分所)目前共有200余名律师。在公司、金融、商事、涉外、知识产权及诉讼仲裁领域的优异表现在业内外赢得较高声誉。</p>
 					</div>
 				</li>
 				<li>
-					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-					<p>律师事务所</p>
+					<img th:src="${portalHost+'/img/lvshi3.jpg'}" alt=""/>
+					<p>北京宣言律师事务所</p>
 					<div class="coop_text">
-						<h6>律师事务所</h6>
-						<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>
+						<h6>北京宣言律师事务所</h6>
+						<p>北京宣言律师事务所在对团队合作的及其重视下组成了专业及高效的服务团队(点击进入律师介绍),通过法律执业部门与客户服务部门的积极配合,使当事人能够获得更加高效、热情、细致的法律服务。承办律师、指导律师、监督律师、律师助理等,明确的职能分工,科学的管理流程,使每件委托事务,都能获得优良法律服务支持和实现最佳法律效果。</p>
 					</div>
 				</li>
-				<li>
-					<img th:src="${portalHost+'/img/service_11.png'}" alt=""/>
-					<p>律师事务所</p>
+				<!-- <li>
+					<img th:src="${portalHost+'/img/lvshi4.jpg'}" alt=""/>
+					<p>湖南二十世纪律师事务所</p>
 					<div class="coop_text">
-						<h6>律师事务所</h6>
+						<h6>湖南二十世纪律师事务所</h6>
 						<p>年加拿大 睡多久才能发生大家看女生对苍井空块九点半纳斯达克就看你的见死不救</p>
 					</div>
-				</li>
+				</li> -->
 			</ul>
   		</div>
   	</div>	

+ 24 - 14
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -15,16 +15,16 @@
 	<div id="all_achievement">
 		<div class="detail">
 			<div class="detail_top">
-				<div class="detail_topimg">
+<!-- 				<div class="detail_topimg">
 					<a href="#"><img
 						th:src="${portalHost + '/img/detail_facebook.jpg'}" alt="" /></a> <a
 						href="#"><img
 						th:src="${portalHost + '/img/detail_weixin.jpg'}" alt="" /></a> <a
 						href="#"><img th:src="${portalHost + '/img/detail_weibo.jpg'}"
 						alt="" /></a>
-				</div>
+				</div>-->				
 				<div class="detail_toptitle">
-					<a href="#">技术交易</a> <a href="#">技术专利</a> <a href="#"
+					<a href="#">技术交易&nbsp;&nbsp;></a> <a href="#">技术专利&nbsp;&nbsp;></a> <a href="#"
 						class="a_detail">专利详情</a>
 				</div>
 			</div>
@@ -62,30 +62,38 @@
 					</div>
 					<div class="fine" >
 						<div class="fine_title">精品专利</div>
-						<div th:each="reboutiqueachievement:${reboutiqueachievement}">
+						<div th:each="reboutiqueachievement:${reboutiqueachievement}" class="pointer">
 							<img th:src="${avatarUploadHost+reboutiqueachievement.technicalpictureurl}" alt="" />
 							<p th:text="${reboutiqueachievement.name}"></p>
+							<p th:text="${reboutiqueachievement.id}" class="achievementId"></p>
+							<p th:text="${reboutiqueachievement.ownerType}" class="achievementTyp"></p>
 						</div>
 					</div>
 				</div>
 				<div class="detail_centertext" th:each="achievementdetail:${achievementdetail}">
 					<div class="text_left">
 						<div>
+							<h5 class="left_p">拥有者:</h5>
+							<p th:text="${achievementdetail.ownerName}?${achievementdetail.ownerName}:未公开">未公开</p>
+						</div>
+						<div>
 							<h5 class="left_p">技术成熟度:</h5>
-							<p >可以量产</p>
+							<p th:text="${achievementdetail.maturityS}?${achievementdetail.maturityS}:未知">未知</p>
+							
 						</div>
 						<div>
 							<h5>类型:</h5>
-							<p  th:text="${achievementdetail.categoryS}">发明专利</p>
+							<p th:text="${achievementdetail.categoryS}?${achievementdetail.categoryS}:暂无分类信息">发明专利</p>
 						</div>
 						<div>
-							<h5>最近更新</h5>
-							<p  th:text="${achievementdetail.releaseDate}">2017-09-17</p>
+							<h5>最近更新:</h5>
+							<p th:text="${achievementdetail.releaseDateS}?${achievementdetail.releaseDateS}:暂无该信息">2017-09-17</p>
 						</div>
 					</div>
 					<div class="text_right">
 						<div>技术简介</div>
-						<p th:text="${achievementdetail.introduction}"></p>
+						<p th:text="${achievementdetail.introduction}?${achievementdetail.introduction}:暂无相关简介"></p>
+						
 					</div>
 				</div>
 			</div>
@@ -97,21 +105,23 @@
 							<img th:src="${avatarUploadHost+reachievementlist.technicalpictureurl}" alt="" />
 							<div class="list_text">
 								<p>
-									行业:<span th:text="${reachievementlist.field}"></span>
+									行业:<span th:text="${reachievementlist.fieldAS}?${reachievementlist.fieldAS}:暂无分类信息"></span>
 								</p>
 								<p >
-									名称:<span th:text="${reachievementlist.name}"></span>
+									名称:<span th:text="${reachievementlist.name}?${reachievementlist.name}:未知"></span>
 								</p>
 							    <p >
-									类型<span th:text="${reachievementlist.ownerTypeS}"></span>
+									类型:<span th:text="${reachievementlist.ownerTypeS}?${reachievementlist.ownerTypeS}:个人所有"></span>
 								</p> 
 								<p >
-									交易方式:<span th:text="${reachievementlist.transferModeS}"></span>
+									交易方式:<span th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
 								</p>
+								<p class="likeId" th:text="${reachievementlist.id}"></p>
+								<p class="likeType" th:text="${reachievementlist.ownerType}"></p>
 								<a href="#">了解详情</a>
 							</div>
 							<div class="star">
-								<p >成熟度:<span th:text="${reachievementlist.maturityS}"></span></p>
+								<p >成熟度:<span th:text="${reachievementlist.maturityS}?${reachievementlist.maturityS}:暂无信息"></span></p>
 							</div>
 						</li>
 					</ul>

+ 9 - 5
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -16,13 +16,13 @@
 	<div id="all_achievement">
 		<div class="detail">
 			<div class="detail_top">
-				<div class="detail_topimg">
+				<!-- <div class="detail_topimg">
 					<a href="#"> <img th:src="${portalHost + '/img/detail_facebook.jpg'}" alt="" /></a> 
 					<a href="#"> <img th:src="${portalHost + '/img/detail_weixin.jpg'}" alt="" /></a> 
 					<a href="#"> <img th:src="${portalHost + '/img/detail_weibo.jpg'}" alt="" /></a>
-				</div>
+				</div> -->
 				<div class="detail_toptitle" th:each="demand:${demand}">
-					<a href="#">技术交易</a>  <a href="#">技术需求</a>  <a href="#"class="a_detail" th:text="${demand.name}">关于超细颗粒金属碳化物的制造技术</a>
+					<a href="#">技术交易&nbsp;&nbsp;></a>  <a href="#">技术需求&nbsp;&nbsp;></a>  <a href="#"class="a_detail" th:text="${demand.name}">关于超细颗粒金属碳化物的制造技术</a>
 				</div>
 			</div>
 			<div class="detail_center">
@@ -53,16 +53,18 @@
 							<span>需求预算:</span> <span th:text="${demand.fixedbudget}?${demand.fixedbudget}:价格面议"></span>
 						</div>
 						<div class="inline_span">
-							<span>有效日期:</span> <span th:text="${demand.validityPeriod}"></span>
+							<span>有效日期:</span> <span th:text="${demand.validityPeriodS}?${demand.validityPeriodS}:永久"></span>
 						</div>
 						<!-- <span> <img src="../../img/detail_img5.jpg" alt="" /> <span>8</span></span> -->
 						<div class="detail_btn">我要咨询</div>
 					</div>
 					<div class="fine">
 						<div class="fine_title">精品需求</div>
-						<div th:each="reboutiquedemand:${reboutiquedemand}">
+						<div th:each="reboutiquedemand:${reboutiquedemand}" class="pointer">
 							<img th:src="${avatarUploadHost+reboutiquedemand.pictureUrl}" alt="" />
 							<p th:text="${reboutiquedemand.name}"></p>
+							<p th:text="${reboutiquedemand.id}" class="demandId"></p>
+							<p th:text="${reboutiquedemand.dataCategory}" class="demandTyp"></p>
 						</div>
 					</div>
 				</div>
@@ -91,6 +93,8 @@
 								<p class="money">
 									预算:<span th:text="${redemandlist.fixedbudget}?${redemandlist.fixedbudget}:价格面议"></span>
 								</p>
+								<p th:text="${redemandlist.id}" class="demandId"></p>
+								<p th:text="${redemandlist.dataCategory}" class="demandTyp"></p>
 								<a href="#">了解详情</a>
 							</div>
 							<div class="star">

+ 18 - 8
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

@@ -137,7 +137,7 @@
 						</div>
 					</div>
 					<img th:src="${portalHost + '/img/technology_text.png'}" alt=""/>
-					<span>更 多</span>
+					<!-- <span>更 多</span> -->
 				</div>
 			</div>
 			<!-- <div class="technolo_center">
@@ -217,7 +217,7 @@
 						</div>
 					</div>
 					<img th:src="${portalHost + '/img/technology_question.png'}" alt=""/>
-					<span>更 多</span>
+					<!-- <span>更 多</span> -->
 				</div>
 			</div>
 		</div>
@@ -265,12 +265,22 @@
 					</ul>
 				</div>			
 				<div class="pagination_box">
-				<span aria-hidden="true" class="page_right">&gt;&gt;</span>
-					<div>
-						<div class="paging_box">							
-						</div>
-					</div>
-				<span aria-hidden="false" class="page_left">&lt;&lt;</span>
+				<nav aria-label="Page navigation" class="clearfix">
+						<ul class="pagination">
+							<li class="pagePre">
+								<a href="#" aria-label="Previous">
+									<span aria-hidden="true" value="1">首页</span>
+								</a>
+							</li>
+							<li class="pageNumber active"><a href="#" value="1">1</a></li>
+							<li class="pageNext">
+								<a href="#" aria-label="Next">
+									<span aria-hidden="true">末页</span>
+								</a>
+							</li>
+						</ul>
+						<span class="totalCount">共 0 页 0 条数据</span>
+					</nav>
 				</div>
 			</div>
 		</div>

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

@@ -14,11 +14,9 @@
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
+			<li data-index=1 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
+			<li data-index=2 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>

+ 6 - 76
src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

@@ -51,9 +51,7 @@
 					</div>					
 					<div class="searchs">
 		 				<div class="select">
-		 					<select name="" id="selt">
-		 											
-		 					</select>	 					
+		 					搜一搜 					
 		 				</div> 				
 		 				<div id="search_on">					
 		 					<input type="search" placeholder="高新"/>
@@ -68,50 +66,6 @@
        			<div class="invest_left">       					 				
 		 			<div class="policy">
 	 				    <ul>
-		 					<li value="">
-		 						<div class="policy_time">
-		 							<p>30</p>
-		 							<time>2017-09</time>
-		 						</div>
-		 						<div class="policy_details">
-		 							<h4><a href="#">高新是什家纺的的大学城赴会而费尽覅么?</a></h4>
-			 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-			 						<a href="#">MORE+</a>
-		 						</div>
-		 					</li>
-		 					<li value="">
-		 						<div class="policy_time">
-		 							<p>30</p>
-		 							<time>2017-09</time>
-		 						</div>
-		 						<div class="policy_details">
-		 							<h4><a href="">高新是什家纺的的大学城赴会而费尽覅么?</a></h4>
-			 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-			 						<a href="#">MORE+</a>
-		 						</div>
-		 					</li>
-		 					<li value="">
-		 						<div class="policy_time">
-		 							<p>30</p>
-		 							<time>2017-09</time>
-		 						</div>
-		 						<div class="policy_details">
-		 							<h4><a href="">高新是什家纺的的大学城赴会而费尽覅么?</a></h4>
-			 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-			 						<a href="#">MORE+</a>
-		 						</div>
-		 					</li>
-		 					<li value="">
-		 						<div class="policy_time">
-		 							<p>30</p>
-		 							<time>2017-09</time>
-		 						</div>
-		 						<div class="policy_details">
-		 							<h4><a href="">高新是什家纺的的大学城赴会而费尽覅么?</a></h4>
-			 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
-			 						<a href="#">MORE+</a>
-		 						</div>
-		 					</li>
 	 					</ul>	 				
 	 				</div>		
        				<div class="pagination_box">
@@ -136,36 +90,12 @@
        			<div class="invest_right">
        				<h5>热点资讯</h5>
        				<ul>
-       					<li>
-       						<a href="">
-	       						<p>高新是什家纺的的大学城赴会而</p>
-	       						<time>2017-09-18</time>
+       					<li th:each="news:${newsList}">
+       						<a th:href="@{/portal/news/newsDetail(id=${news.id})}">
+	       						<p th:text="${news.title}"></p>
+	       						<time th:text="${news.createTimeFormattedDate}"></time>
        						</a>
-       					</li> 
-       					<li>
-       						<a href="">
-	       						<p>高新是什家纺的的大学城赴会而</p>
-	       						<time>2017-09-18</time>
-       						</a>
-       					</li>
-       					<li>
-       						<a href="">
-	       						<p>高新是什家纺的的大学城赴会而</p>
-	       						<time>2017-09-18</time>
-       						</a>
-       					</li>
-       					<li>
-       						<a href="">
-	       						<p>高新是什家纺的的大学城赴会而</p>
-	       						<time>2017-09-18</time>
-       						</a>
-       					</li>
-       					<li>
-       						<a href="">
-	       						<p>高新是什家纺的的大学城赴会而</p>
-	       						<time>2017-09-18</time>
-       						</a>
-       					</li>
+       					</li>     					
        				</ul>
        			</div> 
        		</div>