Browse Source

科技金融

wanghui 8 years ago
parent
commit
b0598ff644
26 changed files with 822 additions and 378 deletions
  1. 2 1
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  2. 16 3
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  3. 2 2
      src/main/java/com/goafanti/common/controller/WebpageController.java
  4. 7 2
      src/main/java/com/goafanti/common/dao/OrganizationInfoMapper.java
  5. 45 20
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  6. 6 1
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  7. 110 4
      src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml
  8. 12 0
      src/main/java/com/goafanti/common/model/OrganizationInfo.java
  9. 1 1
      src/main/java/com/goafanti/demand/service/DemandService.java
  10. 7 2
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  11. 1 3
      src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java
  12. 117 0
      src/main/java/com/goafanti/portal/bo/FinancialListBo.java
  13. 75 0
      src/main/java/com/goafanti/portal/controller/PortalFinancialController.java
  14. 16 5
      src/main/java/com/goafanti/portal/controller/PortalSearchController.java
  15. 28 0
      src/main/java/com/goafanti/portal/service/PortalFinancialService.java
  16. 43 0
      src/main/java/com/goafanti/portal/service/impl/PortalFinancialServiceImpl.java
  17. 1 1
      src/main/resources/props/config_local.properties
  18. 11 4
      src/main/webapp/WEB-INF/views/common.html
  19. 1 1
      src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html
  20. 113 0
      src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html
  21. 116 0
      src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html
  22. 1 0
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  23. 38 152
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  24. 41 164
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  25. 11 11
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html
  26. 1 1
      src/main/webapp/WEB-INF/views/user/signIn.html

+ 2 - 1
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -52,7 +52,8 @@ public interface AchievementService {
 	void insertImport(List<AchievementImportBo> data);
 	void insertImport(List<AchievementImportBo> data);
 
 
 	Pagination<AchievementSearchListBo> listAchievementSearchList(
 	Pagination<AchievementSearchListBo> listAchievementSearchList(
-			String keyword,Integer dataCategory ,Integer fieldA,String transferMode, Integer pageNo, Integer pageSize);
+			String keyword,Integer dataCategory ,Integer category, Integer fieldA,String transferMode, Integer pageNo, Integer pageSize,
+			Integer timeSort,String upperPrice,String lowerPrice);
 
 
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
 	
 	

+ 16 - 3
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -411,7 +411,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
 	public Pagination<AchievementSearchListBo> listAchievementSearchList(
 	public Pagination<AchievementSearchListBo> listAchievementSearchList(
-			String keyword,Integer dataCategory, Integer fieldA, String transferMode,Integer pNo, Integer pSize ) {
+			String keyword,Integer dataCategory, Integer category,Integer fieldA, String transferMode,Integer pNo, Integer pSize,
+			Integer dateSort,String upperPrice,String lowerPrice) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
 		if (!StringUtils.isBlank(keyword)) {
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
 			params.put("keyword", keyword);
@@ -420,7 +421,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != dataCategory) {
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
 			params.put("dataCategory", dataCategory);
 		}
 		}
-
+		
+		if(null!= category){
+			params.put("category", category);
+		}
 		if (null != fieldA) {
 		if (null != fieldA) {
 			params.put("fieldA", fieldA);
 			params.put("fieldA", fieldA);
 		}
 		}
@@ -428,7 +432,15 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (!StringUtils.isBlank(transferMode)) {
 		if (!StringUtils.isBlank(transferMode)) {
 			params.put("transferMode", transferMode);
 			params.put("transferMode", transferMode);
 		}
 		}
-		
+		if(dateSort != null){
+			params.put("dateSort", dateSort);
+		}
+		if(upperPrice != null){
+			params.put("upperPrice", upperPrice);
+		}
+		if(lowerPrice != null){
+			params.put("lowerPrice", lowerPrice);
+		}
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
 		}
 		}
@@ -440,6 +452,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		List<AchievementSearchListBo> AchievementSearchList = (List<AchievementSearchListBo>) result.getList();
 		List<AchievementSearchListBo> AchievementSearchList = (List<AchievementSearchListBo>) result.getList();
 		for (int i = 0; i < AchievementSearchList.size(); i++) {
 		for (int i = 0; i < AchievementSearchList.size(); i++) {
 			String introduction = AchievementSearchList.get(i).getIntroduction();
 			String introduction = AchievementSearchList.get(i).getIntroduction();
+			if(introduction != null)
 			introduction=introduction.length()>20?introduction.substring(0, 20)+"... ...":introduction;
 			introduction=introduction.length()>20?introduction.substring(0, 20)+"... ...":introduction;
 
 
 		}
 		}

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

@@ -348,9 +348,9 @@ public class WebpageController extends BaseController {
 	/**
 	/**
 	 * 金融圈
 	 * 金融圈
 	 */
 	 */
-	@RequestMapping(value = "/portal/financial/financialIndex", method = RequestMethod.GET)
+	@RequestMapping(value = "/portal/financial/index", method = RequestMethod.GET)
 	public ModelAndView portalFinancialFinancialIndex(HttpServletRequest request, ModelAndView modelview) {
 	public ModelAndView portalFinancialFinancialIndex(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/financial/financialIndex");
+		modelview.setViewName("/portal/financial/index");
 		handleBanners(modelview, BannersType.JIN_RONG_QUAN);
 		handleBanners(modelview, BannersType.JIN_RONG_QUAN);
 		return modelview;
 		return modelview;
 	}
 	}

+ 7 - 2
src/main/java/com/goafanti/common/dao/OrganizationInfoMapper.java

@@ -1,6 +1,9 @@
 package com.goafanti.common.dao;
 package com.goafanti.common.dao;
 
 
+import java.util.List;
+
 import com.goafanti.common.model.OrganizationInfo;
 import com.goafanti.common.model.OrganizationInfo;
+import com.goafanti.portal.bo.FinancialListBo;
 
 
 public interface OrganizationInfoMapper {
 public interface OrganizationInfoMapper {
     int deleteByPrimaryKey(String id);
     int deleteByPrimaryKey(String id);
@@ -14,8 +17,10 @@ public interface OrganizationInfoMapper {
     int updateByPrimaryKeySelective(OrganizationInfo record);
     int updateByPrimaryKeySelective(OrganizationInfo record);
 
 
     int updateByPrimaryKey(OrganizationInfo record);
     int updateByPrimaryKey(OrganizationInfo record);
-    
-    
 
 
 	OrganizationInfo selectOrgInfoByUserId(String uid);
 	OrganizationInfo selectOrgInfoByUserId(String uid);
+	
+	List<FinancialListBo> selectRecommendCompany();
+	
+	FinancialListBo selectCompanyDetai(String companyId);
 }
 }

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

@@ -1080,27 +1080,44 @@
   		a.field_a as fieldA, 
   		a.field_a as fieldA, 
   		a.field_b as fieldB,
   		a.field_b as fieldB,
   		a.transfer_price as transferPrice,
   		a.transfer_price as transferPrice,
-  		a.technical_picture_url as technicalpictureurl
+  		a.maturity,
+  		a.introduction,
+  		a.transfer_mode as transferMode,
+  		a.technical_picture_url as technicalPictureUrl
   	from achievement a 
   	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 
   	where a.deleted_sign = 0 
-  	<if test="keyword != null">
+  	<if test="dataCategory != null and dataCategory != ''">
+  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
+  	</if>
+  	<if test="category != null and category != ''">
+  		and a.category = #{category,jdbcType=INTEGER}
+  	</if>
+  	<if test="fieldA != null and fieldA != ''">
+  		and a.field_a = #{fieldA,jdbcType=INTEGER}
+  	</if>
+  	<if test="keyword != null and keyword != ''">
   		and a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   		and a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   	</if>
   	</if>
   	<if test="transferMode != null">
   	<if test="transferMode != null">
   		and a.transfer_mode = #{transferMode,jdbcType=INTEGER}
   		and a.transfer_mode = #{transferMode,jdbcType=INTEGER}
   	</if>
   	</if>
-  	<if test="dataCategory != null">
-  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
-  	</if>
-  	<if test="fieldA != null">
-  		and a.field_a = #{fieldA,jdbcType=INTEGER}
+  	<if test="upperPrice != null and upperPrice != ''">
+  		and a.transfer_price &lt; #{upperPrice,jdbcType=VARCHAR}
   	</if>
   	</if>
-  	and a.deleted_sign = 0 
+  	<if test="lowerPrice != null and lowerPrice != ''">
+  		and a.transfer_price &gt; #{lowerPrice,jdbcType=VARCHAR}
+  	</if> 	
+  	<!--
   	and a.release_status = 1
   	and a.release_status = 1
-  	and a.audit_status = 3
-  	order by a.release_date desc
-  	<if test="page_sql!=null">
+  	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>	
+  	<if test="page_sql != null">
 		${page_sql}
 		${page_sql}
 	</if>
 	</if>
   </select>
   </select>
@@ -1110,22 +1127,30 @@
   		count(1)
   		count(1)
   	from achievement a
   	from achievement a
   	where a.deleted_sign = 0 
   	where a.deleted_sign = 0 
-  	<if test="keyword != null">
+  	<if test="dataCategory != null and dataCategory != ''">
+  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
+  	</if>
+  	<if test="category != null and category != ''">
+  		and a.category = #{category,jdbcType=INTEGER}
+  	</if>
+  	<if test="fieldA != null and fieldA != ''">
+  		and a.field_a = #{fieldA,jdbcType=INTEGER}
+  	</if>
+  	<if test="keyword != null and keyword != ''">
   		and a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   		and a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   	</if>
   	</if>
   	<if test="transferMode != null">
   	<if test="transferMode != null">
   		and a.transfer_mode = #{transferMode,jdbcType=INTEGER}
   		and a.transfer_mode = #{transferMode,jdbcType=INTEGER}
   	</if>
   	</if>
-  	<if test="dataCategory != null">
-  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
-  	</if>
-  	<if test="fieldA != null">
-  		and a.field_a = #{fieldA,jdbcType=INTEGER}
+  	<if test="upperPrice != null and upperPrice != ''">
+  		and a.transfer_price &lt; #{upperPrice,jdbcType=VARCHAR}
   	</if>
   	</if>
-  	and a.deleted_sign = 0 
+  	<if test="lowerPrice != null and lowerPrice != ''">
+  		and a.transfer_price &gt; #{lowerPrice,jdbcType=VARCHAR}
+  	</if> 
+  <!-- 
   	and a.release_status = 1
   	and a.release_status = 1
-  	and a.audit_status = 3
-  	order by a.release_date desc
+  	and a.audit_status = 3 -->
   </select>
   </select>
   
   
   <select id="selectAchievementSearchDetail"  resultType="com.goafanti.portal.bo.AchievementDetailBo">
   <select id="selectAchievementSearchDetail"  resultType="com.goafanti.portal.bo.AchievementDetailBo">

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

@@ -963,7 +963,12 @@
   		and d.deleted_sign = 0 
   		and d.deleted_sign = 0 
   		and d.release_status = 1
   		and d.release_status = 1
   		and d.audit_status = 3
   		and d.audit_status = 3
-  		order by d.release_date desc
+  		<if test="dateSort == 0">
+  			order by d.release_date asc
+  		</if>
+  		<if test="dateSort == 1">
+  			order by d.release_date desc
+  		</if>
   	<if test="page_sql!=null">
   	<if test="page_sql!=null">
 		${page_sql}
 		${page_sql}
 	</if>
 	</if>

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

@@ -15,11 +15,12 @@
     <result column="logo_url" property="logoUrl" jdbcType="VARCHAR" />
     <result column="logo_url" property="logoUrl" jdbcType="VARCHAR" />
     <result column="publicity_picture_url" property="publicityPictureUrl" jdbcType="VARCHAR" />
     <result column="publicity_picture_url" property="publicityPictureUrl" jdbcType="VARCHAR" />
     <result column="country_name_zh" jdbcType="VARCHAR" property="countryNameZh" />
     <result column="country_name_zh" jdbcType="VARCHAR" property="countryNameZh" />
+    <result column="company_type" property="companyType" jdbcType="INTEGER"/>
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List" >
   <sql id="Base_Column_List" >
     id, uid, identity_type, company_name, location_province, location_city,location_area,
     id, uid, identity_type, company_name, location_province, location_city,location_area,
     unit_size, company_introduction, 
     unit_size, company_introduction, 
-    home_unit,  logo_url, publicity_picture_url,country_name_zh
+    home_unit,  logo_url, publicity_picture_url,country_name_zh,company_type
   </sql>
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     select 
@@ -36,13 +37,14 @@
       company_name, location_province, location_city,location_area,
       company_name, location_province, location_city,location_area,
       unit_size, 
       unit_size, 
       company_introduction, home_unit,  
       company_introduction, home_unit,  
-      logo_url, publicity_picture_url,country_name_zh)
+      logo_url, publicity_picture_url,country_name_zh,company_type)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{identityType,jdbcType=VARCHAR}, 
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{identityType,jdbcType=VARCHAR}, 
       #{companyName,jdbcType=VARCHAR},
       #{companyName,jdbcType=VARCHAR},
       #{locationProvince,jdbcType=INTEGER}, #{locationCity,jdbcType=INTEGER}, #{locationArea,jdbcType=INTEGER}, 
       #{locationProvince,jdbcType=INTEGER}, #{locationCity,jdbcType=INTEGER}, #{locationArea,jdbcType=INTEGER}, 
       #{unitSize,jdbcType=VARCHAR}, 
       #{unitSize,jdbcType=VARCHAR}, 
       #{companyIntroduction,jdbcType=VARCHAR}, #{homeUnit,jdbcType=VARCHAR},  
       #{companyIntroduction,jdbcType=VARCHAR}, #{homeUnit,jdbcType=VARCHAR},  
-      #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR}, #{countryNameZh,jdbcType=VARCHAR})
+      #{logoUrl,jdbcType=VARCHAR}, #{publicityPictureUrl,jdbcType=VARCHAR}, #{countryNameZh,jdbcType=VARCHAR},
+      #{companyType,jdbcType=INTEGER})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
     insert into organization_info
     insert into organization_info
@@ -86,6 +88,9 @@
       <if test="countryNameZh != null">
       <if test="countryNameZh != null">
       	country_name_zh,
       	country_name_zh,
       </if>
       </if>
+      <if test="companyType != null">
+      	company_type,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
       <if test="id != null" >
@@ -127,6 +132,9 @@
       <if test="countryNameZh != null">
       <if test="countryNameZh != null">
       	#{countryNameZh,jdbcType=VARCHAR},
       	#{countryNameZh,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="companyType != null">
+      	#{companyType,jdbcType=INTEGER}
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OrganizationInfo" >
@@ -168,6 +176,9 @@
       <if test="countryNameZh != null">
       <if test="countryNameZh != null">
       	country_name_zh = #{countryNameZh,jdbcType=VARCHAR},
       	country_name_zh = #{countryNameZh,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="companyType != null">
+      	company_type = #{companyType,jdbcType=INTEGER}
+      </if>
     </set>
     </set>
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
@@ -184,7 +195,8 @@
       home_unit = #{homeUnit,jdbcType=VARCHAR},
       home_unit = #{homeUnit,jdbcType=VARCHAR},
       logo_url = #{logoUrl,jdbcType=VARCHAR},
       logo_url = #{logoUrl,jdbcType=VARCHAR},
       publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR},
       publicity_picture_url = #{publicityPictureUrl,jdbcType=VARCHAR},
-      country_name_zh = #{countryNameZh,jdbcType=VARCHAR}
+      country_name_zh = #{countryNameZh,jdbcType=VARCHAR},
+      company_typ e= #{companyType,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   </update>
   
   
@@ -194,4 +206,98 @@
     from organization_info
     from organization_info
     where uid = #{uid,jdbcType=VARCHAR}
     where uid = #{uid,jdbcType=VARCHAR}
   </select>
   </select>
+  
+  <select id="selectRecommendCompany" resultType="com.goafanti.portal.bo.FinancialListBo">
+  	select 
+  		b.id,
+  		b.company_name  as companyName,
+  		b.logo_url as logoUrl,
+  		b.publicity_picture_url as publicityPictureUrl,
+  		b.company_introduction as companyIntroduction
+	from 
+		user a 
+	left join 
+		organization_info b 
+	on 
+		a.id = b.uid
+	left join 
+		user_identity c 
+	on 
+		a.id = c.uid
+	where b.id is not null 
+	<!-- 	c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1  -->
+	order by 
+		a.create_time asc 
+	limit 0,10
+  </select>
+  
+  <select id="selectFinancialByPage" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.FinancialListBo">
+  	select 
+  		b.id,
+  		b.company_name as companyName,
+  		b.logo_url as logoUrl,
+  		b.publicity_picture_url as publicityPictureUrl,
+  		b.company_introduction as companyIntroduction
+	from 
+		user a 
+	left join 
+		organization_info b 
+	on 
+		a.id = b.uid
+	left join 
+		user_identity c 
+	on 
+		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  -->
+	<if test="locationProvince != null and locationProvince != ''">
+		and b.location_province = #{locationProvince,jdbcType=VARCHAR}
+	</if>
+	order by 
+		a.create_time desc
+	<if test="page_sql != null">
+    	${page_sql}
+    </if>
+  </select>
+  
+  <select id="selectFinancialCount" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select 
+  		count(0)
+  	from 
+		user a 
+	left join 
+		organization_info b 
+	on 
+		a.id = b.uid
+	left join 
+		user_identity c 
+	on 
+		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  -->
+	<if test="provinceId != null and provinceId != ''">
+		and b.location_province = #{provinceId,jdbcType=VARCHAR}
+	</if>
+	<if test="keyword != null and keyword !=''">
+		and b.company_name like concat('%',#{keyword},'%')  
+	</if>
+  </select>
+  
+  <select id="selectCompanyDetai" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.FinancialListBo">
+	select
+		b.company_name as companyName,
+		b.logo_url as logoUrl,
+		b.publicity_picture_url as publicityPictureUrl,
+		b.company_introduction as companyIntroduction,
+		d.ability_label as abilityLabel,
+		e.name as companyLocation
+	from user a 
+	left join organization_info b on a.id = b.uid 
+	left join user_identity c on a.id = c.uid 
+	left join user_ability d on a.id = d.uid
+	left join district_glossory e on b.location_province = e.id
+	where b.id = #{organizationId,jdbcType=VARCHAR}
+  </select>
 </mapper>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/common/model/OrganizationInfo.java

@@ -60,6 +60,10 @@ public class OrganizationInfo {
      * 国际中文名
      * 国际中文名
      */
      */
     private String 	countryNameZh;
     private String 	countryNameZh;
+    /**
+     *  企业类型 1-投产公司
+     */
+    private Integer companyType;
     
     
 	public String getId() {
 	public String getId() {
 		return id;
 		return id;
@@ -164,4 +168,12 @@ public class OrganizationInfo {
 	public void setCountryNameZh(String countryNameZh) {
 	public void setCountryNameZh(String countryNameZh) {
 		this.countryNameZh = countryNameZh;
 		this.countryNameZh = countryNameZh;
 	}
 	}
+
+	public Integer getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(Integer companyType) {
+		this.companyType = companyType;
+	}
 }
 }

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -57,7 +57,7 @@ public interface DemandService {
 
 
 	Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
 	Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
-			Integer pNo, Integer pSize);
+			Integer pNo, Integer pSize,Integer dateSort);
 
 
 	DemandSearchDetailBo selectDemandSearchDetail(String uid, String id);
 	DemandSearchDetailBo selectDemandSearchDetail(String uid, String id);
 
 

+ 7 - 2
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -443,7 +443,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Override
 	@Override
 	public Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
 	public Pagination<DemandSearchListBo> listDemandSearchList(Integer sign, String keyword, Integer industryCategoryA,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
 			Integer industryCategoryB, Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper,
-			Integer pNo, Integer pSize) {
+			Integer pNo, Integer pSize,Integer dateSort) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
 		if (!StringUtils.isBlank(keyword)) {
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
 			params.put("keyword", keyword);
@@ -472,7 +472,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (null != sign) {
 		if (null != sign) {
 			params.put("sign", sign);
 			params.put("sign", sign);
 		}
 		}
-
+		
+		if(null != dateSort){
+			params.put("dateSort", dateSort);
+		}
+		
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
 		}
 		}
@@ -480,6 +484,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (pSize == null || pSize < 0 || pSize > 10) {
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 			pSize = 10;
 		}
 		}
+		
 		return (Pagination<DemandSearchListBo>) findPage("findSearchDemandListByPage", "findSearchDemandCount", params,
 		return (Pagination<DemandSearchListBo>) findPage("findSearchDemandListByPage", "findSearchDemandCount", params,
 				pNo, pSize);
 				pNo, pSize);
 	}
 	}

+ 1 - 3
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.model.Achievement;
 
 
 public class AchievementSearchListBo {
 public class AchievementSearchListBo {
 	private String		id;
 	private String		id;
@@ -261,7 +262,4 @@ public class AchievementSearchListBo {
 	public void setIntroduction(String introduction) {
 	public void setIntroduction(String introduction) {
 		this.introduction = introduction;
 		this.introduction = introduction;
 	}
 	}
-	
-	
-
 }
 }

+ 117 - 0
src/main/java/com/goafanti/portal/bo/FinancialListBo.java

@@ -0,0 +1,117 @@
+package com.goafanti.portal.bo;
+
+public class FinancialListBo{
+	
+	private String id;
+	/**
+	 * 公司名称
+	 */
+	private String	companyName;
+
+	/**
+	 * 所在地--省
+	 */
+	private Integer	locationProvince;
+	
+	/**
+	 * logo图
+	 */
+	private String	logoUrl;
+	
+	/**
+	 * 宣传图片
+	 */
+	private String	publicityPictureUrl;
+	
+	/**
+     *  企业类型  1-投产公司
+     */
+    private Integer companyType;
+    
+    /**
+	 * 单位简介
+	 */
+	private String	companyIntroduction;
+
+	/**
+	 * 能力标签
+	 */
+	private String abilityLabel;
+	
+	/**
+	 *  公司所在地
+	 */
+	private String companyLocation;
+	
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	public Integer getLocationProvince() {
+		return locationProvince;
+	}
+
+	public void setLocationProvince(Integer locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+
+	public String getLogoUrl() {
+		return logoUrl;
+	}
+
+	public void setLogoUrl(String logoUrl) {
+		this.logoUrl = logoUrl;
+	}
+
+	public String getPublicityPictureUrl() {
+		return publicityPictureUrl;
+	}
+
+	public void setPublicityPictureUrl(String publicityPictureUrl) {
+		this.publicityPictureUrl = publicityPictureUrl;
+	}
+
+	public Integer getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(Integer companyType) {
+		this.companyType = companyType;
+	}
+
+	public String getCompanyIntroduction() {
+		return companyIntroduction;
+	}
+
+	public void setCompanyIntroduction(String companyIntroduction) {
+		this.companyIntroduction = companyIntroduction;
+	}
+
+	public String getAbilityLabel() {
+		return abilityLabel;
+	}
+
+	public void setAbilityLabel(String abilityLabel) {
+		this.abilityLabel = abilityLabel;
+	}
+
+	public String getCompanyLocation() {
+		return companyLocation;
+	}
+
+	public void setCompanyLocation(String companyLocation) {
+		this.companyLocation = companyLocation;
+	}
+}

+ 75 - 0
src/main/java/com/goafanti/portal/controller/PortalFinancialController.java

@@ -0,0 +1,75 @@
+package com.goafanti.portal.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.portal.bo.FinancialListBo;
+import com.goafanti.portal.service.PortalFinancialService;
+
+/**
+ * 
+ * @author Administrator
+ *	科技金融
+ */
+@Controller
+public class PortalFinancialController extends BaseController{
+	
+	@Resource
+	private PortalFinancialService portalFinancialService;
+	
+	/**
+	 * 金融首页
+	 * @return
+	 */
+	@RequestMapping(value="/portal/financial/investmentInstitution",method = RequestMethod.GET)
+	public ModelAndView investmentInstitution(){
+		ModelAndView mv = new ModelAndView();
+		List<FinancialListBo> recommendCompanyList = portalFinancialService.selectRecommendCompany();
+		mv.addObject("recommendCompanyList", recommendCompanyList);
+		mv.setViewName("/portal/financial/investmentInstitution");
+		return mv;
+	}
+	
+	/**
+	 * 金融机构查询 
+	 * @return
+	 */
+	@RequestMapping(value = "/portal/financial/search", method = RequestMethod.GET)
+	@ResponseBody
+	public Result financialSearch(Integer provinceId,String keyword,Integer pageSize,Integer pageNo){
+		pageSize = pageSize == null ? 10 : pageSize;
+		pageNo = pageNo == null ? 10 : pageNo;
+		Result result = new Result();
+		Pagination<FinancialListBo> financialCompanyList = 
+				portalFinancialService.selectFinancialByPage(provinceId,keyword,pageSize,pageNo);
+		result.data(financialCompanyList);
+		return result;
+	}
+	
+	/**
+	 * 金融机构详情
+	 * @param organizationId
+	 * @return
+	 */
+	@RequestMapping(value = "/portal/financial/investmentDetail", method = RequestMethod.GET)
+	public ModelAndView investmentDetail(String organizationId){
+		ModelAndView mv = new ModelAndView();
+		FinancialListBo bo = portalFinancialService.selectCompanyDetail(organizationId);
+		List<FinancialListBo> recommendCompanyList = portalFinancialService.selectRecommendCompany();
+		mv.addObject("recommendCompanyList", recommendCompanyList);
+		mv.addObject("bo", bo);
+		mv.setViewName("/portal/financial/investmentDetail");
+		return mv;
+	}
+	
+}

+ 16 - 5
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -36,19 +36,29 @@ public class PortalSearchController extends BaseController {
 	 * 项目搜索
 	 * 项目搜索
 	 */
 	 */
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
-	public Result achievementSearchList(  String keyword,Integer dataCategory,
-			Integer fieldA, String pageNo, String pageSize,String transferMode ) {
+	public Result achievementSearchList(  String keyword,Integer dataCategory,Integer category,
+			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
 		Integer pSize = 20;
 		Integer pSize = 20;
+		if(null != dateSort && dateSort != 0 && dateSort != 1){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "时间排序"));
+		}
+		
 		if (StringUtils.isNumeric(pageSize)) {
 		if (StringUtils.isNumeric(pageSize)) {
 			pSize = Integer.parseInt(pageSize);
 			pSize = Integer.parseInt(pageSize);
 		}
 		}
 		if (StringUtils.isNumeric(pageNo)) {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 			pNo = Integer.parseInt(pageNo);
 		}
 		}
+		try{
+			new BigDecimal(upperPrice);
+			new BigDecimal(lowerPrice);
+		}catch (Exception e) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "金额"));
+		}
 		res.setData(achievementService.listAchievementSearchList( 
 		res.setData(achievementService.listAchievementSearchList( 
-				  keyword, dataCategory,fieldA, transferMode, pNo, pSize));
+				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice));
 		return res;
 		return res;
 	}
 	}
 
 
@@ -58,7 +68,7 @@ public class PortalSearchController extends BaseController {
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
 	@RequestMapping(value = "/demandList", method = RequestMethod.GET)
 	public Result demandSearchList(Integer sign, String keyword, Integer industryCategoryA, Integer industryCategoryB,
 	public Result demandSearchList(Integer sign, String keyword, Integer industryCategoryA, Integer industryCategoryB,
 			Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper, String pageNo,
 			Integer demandType, BigDecimal budgetCostLower, BigDecimal budgetCostUpper, String pageNo,
-			String pageSize) {
+			String pageSize,Integer dateSort) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
 		Integer pSize = 10;
 		Integer pSize = 10;
@@ -79,7 +89,7 @@ public class PortalSearchController extends BaseController {
 			pNo = Integer.parseInt(pageNo);
 			pNo = Integer.parseInt(pageNo);
 		}
 		}
 		res.setData(demandService.listDemandSearchList(sign, keyword, industryCategoryA, industryCategoryB, demandType,
 		res.setData(demandService.listDemandSearchList(sign, keyword, industryCategoryA, industryCategoryB, demandType,
-				budgetCostLower, budgetCostUpper, pNo, pSize));
+				budgetCostLower, budgetCostUpper, pNo, pSize,dateSort));
 		return res;
 		return res;
 	}
 	}
 
 
@@ -156,4 +166,5 @@ public class PortalSearchController extends BaseController {
 		}
 		}
 		return res;
 		return res;
 	}
 	}
+	
 }
 }

+ 28 - 0
src/main/java/com/goafanti/portal/service/PortalFinancialService.java

@@ -0,0 +1,28 @@
+package com.goafanti.portal.service;
+
+import java.util.List;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.portal.bo.FinancialListBo;
+
+public interface PortalFinancialService {
+	/**
+	 * 
+	 * @return 推荐列表
+	 */
+	public List<FinancialListBo> selectRecommendCompany();
+	
+	/**
+	 * 
+	 * @return 金融机构查询
+	 */
+	public Pagination<FinancialListBo> selectFinancialByPage(Integer provinceId,String keyword,Integer pageSize,Integer pageNo);
+	
+	
+	/**
+	 * 金融机构详情
+	 * @param companyId
+	 * @return
+	 */
+	public FinancialListBo selectCompanyDetail(String companyId);
+}

+ 43 - 0
src/main/java/com/goafanti/portal/service/impl/PortalFinancialServiceImpl.java

@@ -0,0 +1,43 @@
+package com.goafanti.portal.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.OrganizationInfoMapper;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.portal.bo.FinancialListBo;
+import com.goafanti.portal.service.PortalFinancialService;
+
+@Service
+public class PortalFinancialServiceImpl extends BaseMybatisDao<OrganizationInfoMapper> implements PortalFinancialService {
+	
+	@Autowired
+	private OrganizationInfoMapper organizationInfoMapper;
+	@Override
+	public List<FinancialListBo> selectRecommendCompany() {
+		return organizationInfoMapper.selectRecommendCompany();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<FinancialListBo> selectFinancialByPage(Integer provinceId,String keyword,Integer pageSize,Integer pageNo) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(null != provinceId) params.put("provinceId", provinceId);
+		if(StringUtils.isNotBlank(keyword)) params.put("keyword", keyword);
+		Pagination<FinancialListBo> result = 
+				(Pagination<FinancialListBo>) findPage("selectFinancialByPage","selectFinancialCount",params,pageNo,pageSize);
+		return result;
+	}
+
+	@Override
+	public FinancialListBo selectCompanyDetail(String organizationId) {
+		return organizationInfoMapper.selectCompanyDetai(organizationId);
+	}
+
+}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 app.name=AFT
 template.cacheable=false
 template.cacheable=false
 
 
-static.host=//sb.jishutao.com/front/2.0.0
+static.host=//sb.jishutao.com/1.0.41
 portal.host=//sf.jishutao.com/portal/2.0.0
 portal.host=//sf.jishutao.com/portal/2.0.0
 avatar.host=//sb.jishutao.com
 avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload
 avatar.upload.host=//sb.jishutao.com/upload

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

@@ -33,11 +33,11 @@
   					</li>
   					</li>
   					<li th:classappend="${mainM=='technologyTrading'}? 'active'">
   					<li th:classappend="${mainM=='technologyTrading'}? 'active'">
   						<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
   						<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
-  						<ol>
-  							<li th:classappend="${subM=='achievement'}? 'active'">
+  						<ol class="subnavigation">
+  							<li>
   								<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">科技专利</a>
   								<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">科技专利</a>
   							</li>
   							</li>
-  							<li th:classappend="${subM=='demand'}? 'active'">
+  							<li>
   								<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">科技需求</a>
   								<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">科技需求</a>
   							</li>
   							</li>
   						</ol>
   						</ol>
@@ -45,7 +45,14 @@
   					<li th:classappend="${mainM=='thinkTank'}? 'active'">
   					<li th:classappend="${mainM=='thinkTank'}? 'active'">
   						<a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a>
   						<a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a>
   					</li>
   					</li>
-  					<li><a href="#">科技金融</a></li>
+  					<li>
+  						<a th:href="${basePath + '/portal/financial/index.html'}">科技金融</a>
+  						<ol class="subnavigation">
+  							<li>
+  								<a th:href="${basePath + '/portal/financial/investmentInstitution.html'}">投资机构</a>
+  							</li>
+  						</ol>
+  					</li>
   					<li><a href="#">科技活动</a></li>
   					<li><a href="#">科技活动</a></li>
   					<li><a href="#">平台共建</a></li> 					
   					<li><a href="#">平台共建</a></li> 					
   				</ul>
   				</ul>

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

@@ -10,7 +10,7 @@
 
 
 <body>
 <body>
 	<header>
 	<header>
-		<div th:replace="common::{nav}"></div>
+		<div th:replace="common::nav('financial','')"></div>
 	</header>
 	</header>
 	<div class="carouselt">
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
 		<ul class="ct-img-big clear">

+ 113 - 0
src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html

@@ -0,0 +1,113 @@
+<!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 + '/financial/investmentDetail.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('financial','investmentDetail')"></div>
+	</header>
+	<!--banner-->
+  	<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>
+		</ul>
+		<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="main_top">
+    	<div class="head_bj">
+	    	<div class="container">    		           
+	            <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>></li>
+	                <li><a href="#" >投资机构 </a></li>
+	                <li>></li>
+	             	<li class="that" th:text="${bo.companyName}"></li>
+	            </ul>
+	        </div>
+	    </div>    
+        <div class="detail_contant container">
+        	<div class="detail_left">
+        		<div class="introduction">
+        			<h4>机构简介</h4>
+        			<p th:text="${bo.companyIntroduction}"></p>
+        		</div>
+        		<div class="list_logo">
+        			<h4>投资案例</h4>
+        			<div class="list_imgs">
+        				<span class="need_prev"><img th:src="${portalHost + '/img/inverDetails_left.png'}" alt="" /></span>
+            			<div class="list_width need_imgs">
+	            			<ol>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>	
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_10.png'}" alt="" /></a></li>
+	            				<li><a href=""><img th:src="${portalHost + '/img/inverDetails_11.png'}" alt="" /></a></li>		            			   
+	            			</ol>
+            			</div>
+            			<span class="need_next"><img th:src="${portalHost + '/img/inverDatauuils_30.png'}" alt="" /></span>
+        			</div>
+        		</div>
+        	</div>
+        	<div class="detail_right">
+        		<div class="institutions_top">
+        			<div class="institutions_love">
+        				<img th:src="${portalHost + '/img/inverDetails_01.png'}" alt="" />
+        				<div class="love_text">
+        					<p><img th:src="${portalHost + '/img/inverDatails_love.png'}" alt="" /><span> 12 </span> 收藏</p>
+        					<p>线下约见<span> 32次</span></p>
+        				</div>
+        			</div>        			
+        			<h4 th:text="${bo.companyName}"></h4>
+        			<p>所在地:   <span th:text=${bo.companyLocation}></span></p>
+        			<a href="">在线咨询</a>       			
+        		</div>
+        		<div class="institutions_bottom">
+        			<h4>相关机构</h4>
+        			<ul>
+       				<li th:each="company : ${recommendCompanyList}">
+       						<img th:src="${portalHost + company.logoUrl}" alt="" />
+       						<a th:href="@{/portal/financial/investmentDetail(organizationId=${company.id})}">
+	       						<p th:text="${company.companyName}"></p>
+	       						<p th:text="${company.companyIntroduction}"></p>
+       						</a>
+       					</li> 				
+       				</ul>
+        		</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 + '/financial/investmentDetail.js'}"></script>
+	</div>
+</body>
+</html>

+ 116 - 0
src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html

@@ -0,0 +1,116 @@
+<!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 + '/financial/investmentInstitution.css'}" rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('financial','investmentInstitution')"></div>
+	</header>
+	<!--banner-->
+  	<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>
+		</ul>
+		<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="main_top">
+    	<div class="head_bj">
+	    	<div class="container">    		           
+	            <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>></li>
+	                <li class="that"><a href="#" >投资机构 </a></li>
+	            </ul>
+	            <div class="portal-content">
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
+							<span>所在区域</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul id="industryList" class="clearfix"></ul>
+						</div>
+					</div>					
+					<div class="searchs">
+		 				<div class="select">
+		 					<select name="" id="selt">
+		 											
+		 					</select>	 					
+		 				</div> 				
+		 				<div id="search_on">					
+		 					<input type="search" placeholder="高新"/>
+		 				</div>
+		 				<button id="btn_search"></button>						 			
+			 		</div>
+			 	</div>
+			</div>	       
+	    </div>	   
+        <div class="invest_midt  container">
+       		<h6>投资机构</h6>
+       		<div class="invest_contant">
+       			<div class="invest_left">      				
+       				<div class="invest_imglist">
+       					<ul>
+       					</ul>
+       				</div>
+       				<div class="pagination_box">
+						<nav aria-label="Page navigation" class="clearfix">							
+							<ul class="pagination">								
+								<li class="pagePre">
+									<a href="#" aria-label="Previous">
+										<span aria-hidden="true">首页</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">共 2 页 0 条数据</span>
+						</nav>
+					</div>
+       			</div>
+       			<div class="invest_right">
+       				<h5>推荐机构</h5>
+       				<ul>		
+       					<li th:each="company : ${recommendCompanyList}">
+       						<img th:src="${portalHost + company.logoUrl}" alt="" />
+       						<a th:href="@{/portal/financial/investmentDetail(organizationId=${company.id})}">
+	       						<p th:text="${company.companyName}"></p>
+	       						<p th:text="${company.companyIntroduction}"></p>
+       						</a>
+       					</li>     					
+       				</ul>
+       			</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 + '/financial/investmentInstitution.js'}"></script>
+	</div>
+</body>
+</html>

+ 1 - 0
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -321,6 +321,7 @@
   	<div class="img_city"></div>
   	<div class="img_city"></div>
 	<footer>
 	<footer>
 		<div th:replace="common::copyright"></div>
 		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
 	</footer>
 	</footer>
 	<div class="msg"><span></span></div>
 	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
 	<div th:replace="common::footer(~{::script})">

+ 38 - 152
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -13,37 +13,40 @@
 	<!--banner-->
 	<!--banner-->
   	<div class="carouselt">
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<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>
 		</ul>
 		</ul>
-		<a class="btn btn-next" href="">
-			<img th:href="${portalHost + '/img/index_next.png'}" alt=""/>
+		<a class="btn btn-next" src="">
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
 		</a>
 		</a>
-		<a class="btn btn-pre" href="">
-			<img th:href="${portalHost + '/img/index_pre.png'}" alt=""/>
+		<a class="btn btn-pre" src="">
+			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
 		</a>
 		</a>
 	</div>
 	</div>
 	
 	
 	<!--主体内容区域开始-->
 	<!--主体内容区域开始-->
   	<div class="contant">
   	<div class="contant">
-  		<div class="achievement_top"><img th:href="${portalHost + '/img/achievement_01.png'}" alt=""/></div>  		
+  		<div class="achievement_top"><img th:src="${portalHost + '/img/achievement_01.png'}" alt=""/></div>  		
   	</div>
   	</div>
   	<div class="container">
   	<div class="container">
   		<div class="achievement_header">
   		<div class="achievement_header">
   			<p>全部结果: </p>
   			<p>全部结果: </p>
   			<ul>
   			<ul>
   				<li>  					
   				<li>  					
-  					<p>教育休闲1111</p>
-  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
+  					<p>教育休闲</p>
+  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
   				</li>
   				</li>
   				<li>  					
   				<li>  					
-  					<p>教育休闲111</p>
-  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
+  					<p>教育休闲</p>
+  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
   				</li>
   				</li>
   			</ul>
   			</ul>
+  			<div class="text_replace">
+  				<img th:src="${portalHost + '/img/achievement_01_next.jpg'}" alt="" /><span></span>
+  			</div>
   		</div>
   		</div>
   		<div class="wrap active">
   		<div class="wrap active">
 			<div class="portal-body">
 			<div class="portal-body">
@@ -56,15 +59,15 @@
 							<ul id="industryList" class="clearfix"></ul>
 							<ul id="industryList" class="clearfix"></ul>
 						</div>
 						</div>
 					</div>
 					</div>
-					<div class="search-criteria row" id="industryChildrenBox">
+					<div class="search-criteria row">
 						<div class="search-title col-md-1">
 						<div class="search-title col-md-1">
 							<span>技术类型</span>
 							<span>技术类型</span>
 						</div>
 						</div>
 						<div class="search-select col-md-11">
 						<div class="search-select col-md-11">
-							<ul>
+							<ul id="selectAct">
 								<li class="active"><span>不限</span></li>
 								<li class="active"><span>不限</span></li>
 								<li>
 								<li>
-									<label for="patent" class="patent">
+									<label for="patent" class="demand">
 										专利<input type="checkbox" name="fot" id="patent" value="0" />
 										专利<input type="checkbox" name="fot" id="patent" value="0" />
 									</label>
 									</label>
 								</li>
 								</li>
@@ -100,26 +103,24 @@
 				<div class="head-left">
 				<div class="head-left">
 					<p>排序方式</p>
 					<p>排序方式</p>
 					<ul>							
 					<ul>							
-						<li class="active">不限</li>
 						<li>
 						<li>
-							<p><span>发布时间</span><img th:href="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
+							<p><span>发布时间</span><img th:src="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
 							<div class="time_select">
 							<div class="time_select">
-								<ul>
-									<li>09-12</li>
-									<li>03-08</li>
-									<li>02-03</li>
+								<ul class="timeSelect">
+									<li value="0">由远到近</li>
+									<li value="1">由近到远</li>	
 								</ul>
 								</ul>
 							</div>
 							</div>
 						</li>
 						</li>
 						<li>
 						<li>
-							<p><span>价格</span><img th:href="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
-							<div class="time_select">
-								<ul>
-									<li>10万以上</li>
-									<li>5万-10万</li>
-									<li>1万-5万</li>
-									<li>1万以下</li>
-								</ul>
+							<p><span>价格</span></p>							
+						</li>
+						<li>
+							<div class="inp_select">
+								<input type="number" name="" id="minprice" placeholder="最小价格" maxlength="6" min="0"/>
+								<span>-</span>
+								<input type="number" id="maxprice" placeholder="最大价格" maxlength="6" min="0"/>
+								<button>确定</button>
 							</div>
 							</div>
 						</li>
 						</li>
 					</ul>
 					</ul>
@@ -127,139 +128,24 @@
 				<div class="head_right">
 				<div class="head_right">
 					<div class="searchs">
 					<div class="searchs">
 		 				<div class="select">
 		 				<div class="select">
-		 					<select name="" id="selt">
-		 											
-		 					</select>	 					
+		 					搜一搜
 		 				</div> 				
 		 				</div> 				
 		 				<div id="search_on">					
 		 				<div id="search_on">					
 		 					<input type="search" placeholder="医药生物"/>
 		 					<input type="search" placeholder="医药生物"/>
 		 				</div>
 		 				</div>
-		 				<button></button>				
+		 				<button id="btn_search"></button>				
 		 			</div>
 		 			</div>
 		 			<ol>
 		 			<ol>
 		 				<li>医药生物</li>
 		 				<li>医药生物</li>
-		 				<li>医药生物</li>
-		 				<li>医药生物</li>
-		 				<li>医药生物</li>
+		 				<li>建筑科技</li>
+		 				<li>教育休闲</li>
+		 				<li>航空航天</li>
 		 			</ol>
 		 			</ol>
 				</div>
 				</div>
 			</div>
 			</div>
 			<div class="main_introduce">
 			<div class="main_introduce">
 				<ul>
 				<ul>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
-	 						<a href="#">了解详情</a>
-	 					</div>
-	 					<div class="star">
-	 						<p>成熟度</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
-	 						<a href="#">了解详情</a>
-	 					</div>
-	 					<div class="star">
-	 						<p>成熟度</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
-	 						<a href="#">了解详情</a>
-	 					</div>
-	 					<div class="star">
-	 						<p>成熟度</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>	 							
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img src="../../img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
-	 						<a href="#">了解详情</a>
-	 					</div>
-	 					<div class="star">
-	 						<p>成熟度</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>	 							
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
-	 						<a href="#">了解详情</a>
-	 					</div>
-	 					<div class="star">
-	 						<p>成熟度</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>	 							
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
-	 						<a href="#">了解详情</a>
-	 					</div>
-	 					<div class="star">
-	 						<p>成熟度</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							
-	 						</ol>
-	 					</div>
-					</li>				
+								
 				</ul>
 				</ul>
 			</div>
 			</div>
 			<div class="container pagination_box">
 			<div class="container pagination_box">

+ 41 - 164
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -1,10 +1,11 @@
 <!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 th:replace="common::header(~{::title},~{::link})">
-	<title>科技需求</title>
-	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${portalHost + '/technologyTrading/demand.css'}" rel="stylesheet">
+<title>科技需求</title>
+<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/technologyTrading/demand.css'}" rel="stylesheet">
 </head>
 </head>
 <body>
 <body>
 	<header>
 	<header>
@@ -13,39 +14,38 @@
 	<!--banner-->
 	<!--banner-->
   	<div class="carouselt">
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<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>
 		</ul>
 		</ul>
-		<a class="btn btn-next" href="">
-			<img th:href="${portalHost + '/img/index_next.png'}" alt=""/>
+		<a class="btn btn-next" src="">
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
 		</a>
 		</a>
-		<a class="btn btn-pre" href="">
-			<img th:href="${portalHost + '/img/index_pre.png'}" alt=""/>
+		<a class="btn btn-pre" src="">
+			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
 		</a>
 		</a>
 	</div>
 	</div>
 	<!--主体内容区域开始-->
 	<!--主体内容区域开始-->
   	<div class="contant">
   	<div class="contant">
-  		<div class="achievement_top"><img th:href="${portalHost + '/img/demand_01.png'}" alt=""/></div>  		
+  		<div class="achievement_top"><img th:src="${portalHost + '/img/demand_01.png'}" alt=""/></div>  		
   	</div>
   	</div>
   	<div class="container">
   	<div class="container">
   		<div class="achievement_header">
   		<div class="achievement_header">
   			<p>全部结果: </p>
   			<p>全部结果: </p>
   			<ul>
   			<ul>
   				<li>  					
   				<li>  					
-  					<p>教育休闲1111</p>
-  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
+  					<p>教育休闲</p>
+  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
   				</li>
   				</li>
   				<li>  					
   				<li>  					
-  					<p>教育休闲111</p>
-  					<img th:href="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
-  				</li>
-  				<li>  					
-  					<p>教育休闲111</p>
-  					<img th:href="${portalHost + '/img/achievement_del.jpg'}"/>
+  					<p>教育休闲</p>
+  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
   				</li>
   				</li>
+  				<div class="text_replace">
+  					<img th:src="${portalHost + '/img/achievement_01_next.jpg'}" alt="" /><span></span>
+  				</div>
   			</ul>
   			</ul>
   		</div>
   		</div>
   		<div class="wrap active">
   		<div class="wrap active">
@@ -63,7 +63,7 @@
 						<div class="search-title col-md-1">
 						<div class="search-title col-md-1">
 							<span>技术类型</span>
 							<span>技术类型</span>
 						</div>
 						</div>
-						<div class="search-select col-md-8">
+						<div class="search-select col-md-11">
 							<ul id="technologyModeList" class="clearfix">
 							<ul id="technologyModeList" class="clearfix">
 								<li value="999" class="active"><span>不限</span></li>
 								<li value="999" class="active"><span>不限</span></li>
 								<li value="0"><span>技术购买型需求</span></li>
 								<li value="0"><span>技术购买型需求</span></li>
@@ -85,26 +85,24 @@
 				<div class="head-left">
 				<div class="head-left">
 					<p>排序方式</p>
 					<p>排序方式</p>
 					<ul>							
 					<ul>							
-						<li class="active">不限</li>
 						<li>
 						<li>
-							<p><span>发布时间</span><img th:href="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
+							<p><span>发布时间</span><img th:src="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
 							<div class="time_select">
 							<div class="time_select">
-								<ul>
-									<li>09-12</li>
-									<li>03-08</li>
-									<li>02-03</li>
+								<ul class="timeSelect">
+									<li value="0">由远到近</li>
+									<li value="1">由近到远</li>
 								</ul>
 								</ul>
 							</div>
 							</div>
 						</li>
 						</li>
 						<li>
 						<li>
-							<p><span>价格</span><img th:href="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
-							<div class="time_select">
-								<ul>
-									<li>10万以上</li>
-									<li>5万-10万</li>
-									<li>1万-5万</li>
-									<li>1万以下</li>
-								</ul>
+							<p><span>价格</span></p>							
+						</li>
+						<li>
+							<div class="inp_select">
+								<input type="number" name="" id="minprice" placeholder="最小价格" maxlength="6" min="0"/>
+								<span>-</span>
+								<input type="number" id="maxprice" placeholder="最大价格" maxlength="6" min="0"/>
+								<button>确定</button>
 							</div>
 							</div>
 						</li>
 						</li>
 					</ul>
 					</ul>
@@ -112,14 +110,12 @@
 				<div class="head_right">
 				<div class="head_right">
 					<div class="searchs">
 					<div class="searchs">
 		 				<div class="select">
 		 				<div class="select">
-		 					<select name="" id="selt">
-		 											
-		 					</select>	 					
+							搜一搜		 											
 		 				</div> 				
 		 				</div> 				
 		 				<div id="search_on">					
 		 				<div id="search_on">					
 		 					<input type="search" placeholder="医药生物"/>
 		 					<input type="search" placeholder="医药生物"/>
 		 				</div>
 		 				</div>
-		 				<button></button>				
+		 				<button id="btt_search"></button>				
 		 			</div>
 		 			</div>
 		 			<ol>
 		 			<ol>
 		 				<li>医药生物</li>
 		 				<li>医药生物</li>
@@ -131,126 +127,7 @@
 			</div>
 			</div>
 			<div class="main_introduce">
 			<div class="main_introduce">
 				<ul>
 				<ul>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p class="money">预算<span>10万</span></p>	 							 							
-	 						<a href="#">了解详情</a>	 							 						
-	 					</div>
-	 					<div class="star">
-	 						<p>精品</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p class="money">预算<span>10万</span></p>	 							 							
-	 						<a href="#">了解详情</a>	 							 						
-	 					</div>
-	 					<div class="star">
-	 						<p>精品</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p class="money">预算<span>10万</span></p>	 							 							
-	 						<a href="#">了解详情</a>	 							 						
-	 					</div>
-	 					<div class="star">
-	 						<p>精品</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p class="money">预算<span>10万</span></p>	 							 							
-	 						<a href="#">了解详情</a>	 							 						
-	 					</div>
-	 					<div class="star">
-	 						<p>精品</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p class="money">预算<span>10万</span></p>	 							 							
-	 						<a href="#">了解详情</a>	 							 						
-	 					</div>
-	 					<div class="star">
-	 						<p>精品</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 						</ol>
-	 					</div>
-					</li>
-					<li>
-						<img th:href="${portalHost + '/img/achievement_05.png'}" alt="" />
-	 					<div class="list_text">
-	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
-	 						<p>名称<span>怒吼道</span></p>
-	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
-	 						<p class="money">预算<span>10万</span></p>	 							 							
-	 						<a href="#">了解详情</a>	 							 						
-	 					</div>
-	 					<div class="star">
-	 						<p>精品</p>
-	 						<ol>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 							<li></li>
-	 						</ol>
-	 					</div>
-					</li>
+					
 				</ul>
 				</ul>
 			</div>
 			</div>
 			<div class="container pagination_box">
 			<div class="container pagination_box">
@@ -278,8 +155,8 @@
 		<div th:replace="common::login"></div>
 		<div th:replace="common::login"></div>
 	</footer>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
 	<div th:replace="common::footer(~{::script})">
-		<script type="text/javascript" th:href="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:href="${portalHost + '/technologyTrading/demand.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/technologyTrading/demand.js'}"></script>
 	</div>
 	</div>
 </body>
 </body>
 </html>
 </html>

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

@@ -14,31 +14,31 @@
 	<!--banner-->
 	<!--banner-->
   	<div class="carouselt">
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:href="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<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>
 		</ul>
 		</ul>
 		<a class="btn btn-next" href="">
 		<a class="btn btn-next" href="">
-			<img th:href="${portalHost + '/img/index_next.png'}" alt=""/>
+			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
 		</a>
 		</a>
 		<a class="btn btn-pre" href="">
 		<a class="btn btn-pre" href="">
-			<img th:href="${portalHost + '/img/index_pre.png'}" alt=""/>
+			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
 		</a>
 		</a>
 	</div>
 	</div>
 	<!--主体内容区域开始-->
 	<!--主体内容区域开始-->
 	<div class="container ">
 	<div class="container ">
 		<div class="row zizone">
 		<div class="row zizone">
 			<div class="col-md-6 zone_left actives">
 			<div class="col-md-6 zone_left actives">
-				<img th:href="${portalHost + '/img/think_blur1.png'}" alt="" />
+				<img th:src="${portalHost + '/img/think_blur1.png'}" alt="" />
 				<div class="img_right">
 				<div class="img_right">
 					<h4>智政</h4>
 					<h4>智政</h4>
 					<p>您身边为您出谋划策的智者</p>
 					<p>您身边为您出谋划策的智者</p>
 				</div>
 				</div>
 			</div>
 			</div>
 			<div class="col-md-6  zone_right">
 			<div class="col-md-6  zone_right">
-				<img th:href="${portalHost + '/img/think_bai1.png'}" alt="" />
+				<img th:src="${portalHost + '/img/think_bai1.png'}" alt="" />
 				<div class="img_right">
 				<div class="img_right">
 					<h4>智者</h4>
 					<h4>智者</h4>
 					<p>您身边为您出谋划策的智者</p>
 					<p>您身边为您出谋划策的智者</p>
@@ -48,14 +48,14 @@
 		<!--搜索-->
 		<!--搜索-->
 		<div class="zizone_search">
 		<div class="zizone_search">
 			<div class="search_left">
 			<div class="search_left">
-				<img th:href="${portalHost + '/img/think_03.png'}" alt="" />
+				<img th:src="${portalHost + '/img/think_03.png'}" alt="" />
 				<div class="img_txt">
 				<div class="img_txt">
 					<h4>海量专家</h4>
 					<h4>海量专家</h4>
 					<p>严选超过8千位行家专属服务</p>
 					<p>严选超过8千位行家专属服务</p>
 				</div>
 				</div>
 			</div>
 			</div>
 			<div class="search_left">
 			<div class="search_left">
-				<img th:href="${portalHost + '/img/think_05.png'}" alt="" />
+				<img th:src="${portalHost + '/img/think_05.png'}" alt="" />
 				<div class="img_txt">
 				<div class="img_txt">
 					<h4>按需顾问</h4>
 					<h4>按需顾问</h4>
 					<p>严选超过8千位行家专属服务</p>
 					<p>严选超过8千位行家专属服务</p>

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

@@ -8,7 +8,7 @@
 </head>
 </head>
 <body>
 <body>
 	<header>
 	<header>
-		<div th:replace="common::{nav}"></div>
+		<div th:replace="common::nav('','')"></div>
 	</header>
 	</header>
 	<!--主体内容区域开始-->
 	<!--主体内容区域开始-->
   	  	<!--主体内容区域开始-->
   	  	<!--主体内容区域开始-->