Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 years ago
parent
commit
0309ed2e0e
28 changed files with 389 additions and 100 deletions
  1. 1 0
      src/main/java/com/goafanti/achievement/service/impl/AchievementInterestServiceImpl.java
  2. 16 10
      src/main/java/com/goafanti/common/controller/PortalController.java
  3. 13 3
      src/main/java/com/goafanti/common/controller/WebpageController.java
  4. 1 1
      src/main/java/com/goafanti/common/dao/AchievementInterestMapper.java
  5. 5 1
      src/main/java/com/goafanti/common/dao/DemandInterestMapper.java
  6. 1 0
      src/main/java/com/goafanti/common/mapper/AchievementInterestMapper.xml
  7. 3 2
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  8. 15 1
      src/main/java/com/goafanti/common/mapper/DemandInterestMapper.xml
  9. 4 0
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  10. 1 1
      src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml
  11. 2 2
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  12. 1 1
      src/main/java/com/goafanti/demand/service/DemandInterestService.java
  13. 5 2
      src/main/java/com/goafanti/demand/service/impl/DemandInterestServiceImpl.java
  14. 11 1
      src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java
  15. 43 0
      src/main/java/com/goafanti/portal/bo/DemandPortalDetailBo.java
  16. 0 1
      src/main/java/com/goafanti/portal/controller/PortalInterestApiController.java
  17. 12 0
      src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java
  18. 28 27
      src/main/webapp/WEB-INF/views/common.html
  19. 21 6
      src/main/webapp/WEB-INF/views/portal/service/propertyRight.html
  20. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  21. 1 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementOrder.html
  22. 152 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html
  23. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  24. 6 2
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  25. 12 12
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandOrder.html
  26. 22 16
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  27. 1 1
      src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html
  28. 10 8
      src/main/webapp/WEB-INF/views/user/subscriberDetail.html

+ 1 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementInterestServiceImpl.java

@@ -68,4 +68,5 @@ public class AchievementInterestServiceImpl extends BaseMybatisDao<AchievementIn
 	public AchievementInterest selectAchievementInterestByUidAndAchievementId(String uid, String id) {
 		return achievementInterestMapper.selectAchievementInterestByUidAndAchievementId(uid, id);
 	}
+
 }

+ 16 - 10
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -17,6 +17,7 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
 import com.goafanti.achievement.bo.AchievementListBo;
+import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.enums.AchievementBargainingMode;
 import com.goafanti.common.enums.AchievementMaturity;
@@ -26,6 +27,7 @@ import com.goafanti.common.enums.UserType;
 import com.goafanti.common.service.FieldGlossoryService;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandListBo;
+import com.goafanti.demand.service.DemandInterestService;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
@@ -42,6 +44,8 @@ public class PortalController extends BaseController {
 	private DemandService demandService;
 	@Resource
 	private FieldGlossoryService fieldGlossoryService;
+	@Resource
+	private DemandInterestService  demandInterestService;
 
 	private static final String UNIT = "万元";
 
@@ -74,6 +78,12 @@ public class PortalController extends BaseController {
 	public ModelAndView portalDemandDetail(String id, Integer type) {
 		ModelAndView mv = new ModelAndView();
 		DemandPortalDetailBo demand = null;
+		int countDemandInterest = demandInterestService.countDemandInterest(id);
+		if(demandInterestService.selectDemandInterestByUidAndDemandId(TokenManager.getUserId(),id) != null) {
+			mv.addObject("isInterester", 0);
+		}else{
+			mv.addObject("isInterester", 1);
+		};
 		if (UserType.PERSONAL.getCode().equals(type)) {
 			demand = demandService.findUserPortalDemandDetail(id);
 		} else if (UserType.ORGANIZATION.getCode().equals(type)) {
@@ -92,6 +102,7 @@ public class PortalController extends BaseController {
 					demand.setEmployerName(" ");
 				}
 			}
+			demand.setCountDemandInterest(countDemandInterest);
 			Integer industryCategoryA = demand.getIndustryCategoryA();
 			boolean hasCategoryA = false;
 			boolean hasCategoryB = false;
@@ -215,9 +226,7 @@ public class PortalController extends BaseController {
 					redemandlist.get(i).setPictureUrl(picurl[0]);
 				}
 			}
-		}
-		;
-
+		};
 		mv.setViewName("/portal/technologyTrading/demandDetail");
 		mv.addObject("demand", demand);
 		mv.addObject("reboutiquedemand", reboutiquedemand);
@@ -241,7 +250,6 @@ public class PortalController extends BaseController {
 		if (null != achievementdetail) {
 			achievementdetail.setId(id);
 			achievementdetail.setOwnerType(String.valueOf(type));
-			System.out.println(achievementdetail.getOwnerType());
 			Integer category = achievementdetail.getCategory();
 			if (null != category) {
 				if (category == 0) {
@@ -535,7 +543,6 @@ public class PortalController extends BaseController {
 		if (null != achievementdetail) {
 			achievementdetail.setId(id);
 			achievementdetail.setOwnerType(String.valueOf(type));
-			System.out.println(achievementdetail.getOwnerType());
 			Integer category = achievementdetail.getCategory();
 			if (null != category) {
 				if (category == 0) {
@@ -711,6 +718,8 @@ public class PortalController extends BaseController {
 				}
 			}
 		}
+		
+		
 		mv.setViewName("/portal/technologyTrading/achievementOrder");
 		mv.addObject("achievementdetail", achievementdetail);
 		mv.addObject("reachievementlist", reachievementlist);
@@ -780,7 +789,7 @@ public class PortalController extends BaseController {
 				demand.setPictureUrl(picurl[0]);
 			}
 		}
-
+		
 		/*--------------查询精品需求---------------*/
 		List<DemandListBo> boutiquedemand = demandService.selectDemandList(1);
 		List<DemandListBo> reboutiquedemand = new ArrayList<DemandListBo>();
@@ -862,14 +871,11 @@ public class PortalController extends BaseController {
 					redemandlist.get(i).setPictureUrl(picurl[0]);
 				}
 			}
-		}
-		;
-
+		};
 		mv.setViewName("/portal/technologyTrading/demandOrder");
 		mv.addObject("demand", demand);
 		mv.addObject("reboutiquedemand", reboutiquedemand);
 		mv.addObject("redemandlist", redemandlist);
-
 		return mv;
 	}
 }

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

@@ -217,17 +217,15 @@ public class WebpageController extends BaseController {
 				reuserPartner.get(i).setPersonalProfile(personalProfile);
 			}
 		}
-
+		rePartnerDetail.setUid(uid);
 		mv.setViewName("/user/subscriberDetail");
 		mv.addObject("rePartnerDetail", rePartnerDetail);
 		mv.addObject("reuserPartner", reuserPartner);
 		partnerAchievementList.size();
 		if (partnerAchievementList.size()<=0) {
 			mv.addObject("showflg", 0);
-			System.out.println("showflg=1");
 		}else{
 			mv.addObject("showflg", 1);
-			System.out.println("showflg=1");
 		};
 		mv.addObject("uid", uid);
 		return mv;
@@ -605,6 +603,18 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	
+	/**
+	 *  技术评估
+	 * @param request
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value="/portal/technologyTrading/assessMent")
+	public ModelAndView assessMent(HttpServletRequest request, ModelAndView modelview){
+		modelview.setViewName("/portal/technologyTrading/assessMent");
+		return modelview;
+	}
+	
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {

+ 1 - 1
src/main/java/com/goafanti/common/dao/AchievementInterestMapper.java

@@ -16,5 +16,5 @@ public interface AchievementInterestMapper {
     int updateByPrimaryKey(AchievementInterest record);
 
 	AchievementInterest selectAchievementInterestByUidAndAchievementId(String uid, String id);
-
+	
 }

+ 5 - 1
src/main/java/com/goafanti/common/dao/DemandInterestMapper.java

@@ -1,9 +1,11 @@
 package com.goafanti.common.dao;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.common.model.DemandInterest;
 
 public interface DemandInterestMapper {
-    int deleteByPrimaryKey(String id);
+    int deleteByPrimaryKey(@Param("id")String id,@Param("uid")String uid);
 
     int insert(DemandInterest record);
 
@@ -16,4 +18,6 @@ public interface DemandInterestMapper {
     int updateByPrimaryKey(DemandInterest record);
 
 	DemandInterest selectDemandInterestByUidAndDemandId(String uid, String id);
+	
+	int countInterestById(@Param("id")String id);
 }

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

@@ -113,4 +113,5 @@
     from achievement_interest
     where uid = #{0} and achievement_id = #{1}
   </select>
+  
 </mapper>

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

@@ -1160,9 +1160,10 @@
   		a.maturity,
   		a.introduction,
   		a.transfer_mode as transferMode,
-  		a.technical_picture_url as technicalPictureUrl
+  		a.technical_picture_url as technicalPictureUrl,
+  		b.name as fieldAs
   	from achievement a 
-  	<!-- left join user u on u.id = a.owner_id -->
+  	left join field_glossory b on a.field_a = b.id
   	where a.deleted_sign = 0 
   	<if test="dataCategory != null and dataCategory != ''">
   		and a.data_category = #{dataCategory,jdbcType=INTEGER}

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

@@ -3,6 +3,7 @@
 <mapper namespace="com.goafanti.common.dao.DemandInterestMapper" >
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.DemandInterest" >
     <id column="id" property="id" jdbcType="VARCHAR" />
+    <id column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="demand_id" property="demandId" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
@@ -18,7 +19,13 @@
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from demand_interest
-    where id = #{id,jdbcType=VARCHAR}
+    where 1=1
+      <if test="id != null" >
+        and demand_id = #{id,jdbcType=VARCHAR}
+      </if>
+      <if test="uid != null" >
+        and uid = #{uid,jdbcType=VARCHAR}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.DemandInterest" >
     insert into demand_interest (id, demand_id, uid, 
@@ -113,4 +120,11 @@
     from demand_interest
     where uid = #{0} and demand_id = #{1}
   </select>
+  
+    <select id="countInterestById" resultType="Integer">
+  	    select count(0) from demand_interest where 1=1  
+  	    <if test="id != null">
+  	       and demand_id = #{id,jdbcType=VARCHAR}
+  	    </if> 
+  </select>
 </mapper>

+ 4 - 0
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -1181,6 +1181,8 @@
 		d.validity_period as validityPeriod,
 		d.industry_category_a AS industryCategoryA,
 		d.picture_url as pictureUrl,
+		d.employer_contacts_mobile as employerContactsMobile,
+		d.data_category as dataCategory,
 		fg.name AS industryCategoryAS,
 		fgg.name AS industryCategorBS,
 		d.budget_cost AS budgetCost,
@@ -1210,6 +1212,8 @@
 		d.keyword,
 		d.picture_url as pictureUrl,
 		d.validity_period as validityPeriod,
+		d.employer_contacts_mobile as employerContactsMobile,
+		d.data_category as dataCategory,
 		d.industry_category_a AS industryCategoryA,
 		fg.name AS industryCategoryAS,
 		fgg.name AS industryCategoryBS,

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

@@ -358,7 +358,7 @@
 		where mm.effective =1 and x.audit_status=3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
   	</if>
   	<if test="category == 2"> <!-- 需求 -->
-  		select mm.product_id as productId,x.demand_type as ownerType,x.name,mm.cover_img as coverImg
+  		select mm.product_id as productId,x.data_category as ownerType,x.name,mm.cover_img as coverImg
 		from marketing_management mm left join demand x on mm.product_id = x.id
 		where mm.effective =1  and x.audit_status =3 and x.deleted_sign = 0 and mm.show_page= #{showPage,jdbcType=VARCHAR}
   	</if>

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

@@ -441,7 +441,7 @@
 		LEFT JOIN user_info info ON info.uid = u.id
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		WHERE
-			u.type = 0
+			u.type = 0 and ui.expert = 1
 		<if test="null != level and level==1 ">
 			AND u.lvl <![CDATA[ >= ]]> 1 
 		</if>
@@ -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 and ui.expert = 1
 			<if test="null != level and level==1 ">
 				AND u.lvl <![CDATA[ >= ]]> 1 
 			</if>

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

@@ -15,5 +15,5 @@ public interface DemandInterestService {
 
 	Pagination<DemandInterestListBo> listDemandInterest(Integer pNo, Integer pSize);
 
-
+	int countDemandInterest(String id); 
 }

+ 5 - 2
src/main/java/com/goafanti/demand/service/impl/DemandInterestServiceImpl.java

@@ -25,7 +25,7 @@ public class DemandInterestServiceImpl extends BaseMybatisDao<DemandInterestMapp
 
 	@Override
 	public int saveCancelDemandInterest(String id) {
-		return demandInterestMapper.deleteByPrimaryKey(id);
+		return demandInterestMapper.deleteByPrimaryKey(id,TokenManager.getUserId());
 	}
 
 	@Override
@@ -68,5 +68,8 @@ public class DemandInterestServiceImpl extends BaseMybatisDao<DemandInterestMapp
 				"findDemandInterestCount", params, pNo, pSize);
 	}
 
-	
+	@Override
+	public int countDemandInterest(String id) {
+		return demandInterestMapper.countInterestById(id);
+	}
 }

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

@@ -101,7 +101,10 @@ public class AchievementSearchListBo {
 	 * 项目介绍
 	 */
 	private String		introduction;
-
+	
+	/** 行业分类 **/
+	private String 		fieldAs;
+	
 	public Integer getLevel() {
 		return level;
 	}
@@ -275,5 +278,12 @@ public class AchievementSearchListBo {
 		this.maturityS = maturityS;
 	}
 
+	public String getFieldAs() {
+		return fieldAs;
+	}
 
+	public void setFieldAs(String fieldAs) {
+		this.fieldAs = fieldAs;
+	}
+	
 }

+ 43 - 0
src/main/java/com/goafanti/portal/bo/DemandPortalDetailBo.java

@@ -48,6 +48,12 @@ public class DemandPortalDetailBo {
 	private Integer      fixedbudget;
 	
 	private String      validityPeriodS;
+	
+	private Integer countDemandInterest;
+	
+	private String employerContactsMobile;
+	
+	private String dataCategory;
 
 	public Integer getLevel() {
 		return level;
@@ -223,6 +229,43 @@ public class DemandPortalDetailBo {
 	public void setValidityPeriodS(String validityPeriodS) {
 		this.validityPeriodS = validityPeriodS;
 	}
+
+	public Integer getCountDemandInterest() {
+		return countDemandInterest;
+	}
+
+	public void setCountDemandInterest(Integer countDemandInterest) {
+		this.countDemandInterest = countDemandInterest;
+	}
+
+	public String getEmployerContactsMobile() {
+		return employerContactsMobile;
+	}
+
+	public void setEmployerContactsMobile(String employerContactsMobile) {
+		this.employerContactsMobile = employerContactsMobile;
+	}
+
+	public String getDataCategory() {
+		return dataCategory;
+	}
+
+	public void setDataCategory(String dataCategory) {
+		this.dataCategory = dataCategory;
+	}
+
+	@Override
+	public String toString() {
+		return "DemandPortalDetailBo [id=" + id + ", name=" + name + ", keyword=" + keyword + ", industryCategoryA="
+				+ industryCategoryA + ", industryCategoryAS=" + industryCategoryAS + ", industryCategoryBS="
+				+ industryCategoryBS + ", budgetCost=" + budgetCost + ", budgetCostS=" + budgetCostS + ", province="
+				+ province + ", city=" + city + ", problemDes=" + problemDes + ", interestId=" + interestId
+				+ ", location=" + location + ", industryCategory=" + industryCategory + ", employerName=" + employerName
+				+ ", level=" + level + ", pictureUrl=" + pictureUrl + ", employerAddress=" + employerAddress
+				+ ", validityPeriod=" + validityPeriod + ", fixedbudget=" + fixedbudget + ", validityPeriodS="
+				+ validityPeriodS + ", countDemandInterest=" + countDemandInterest + ", employerContactsMobile="
+				+ employerContactsMobile + ", dataCategory=" + dataCategory + "]";
+	}
 	
 	
 	

+ 0 - 1
src/main/java/com/goafanti/portal/controller/PortalInterestApiController.java

@@ -136,7 +136,6 @@ public class PortalInterestApiController extends CertifyApiController{
 	@RequestMapping(value = "/achievementInterest", method = RequestMethod.POST)
 	public Result achievementInterest(String id) {
 		Result res = new Result();
-		System.out.println("感兴趣的id="+id);
 
 		if (StringUtils.isBlank(id)) {
 			System.out.println("找不到成果ID");

+ 12 - 0
src/main/java/com/goafanti/user/bo/UserPartnerDetailBo.java

@@ -1,6 +1,8 @@
 package com.goafanti.user.bo;
 
 public class UserPartnerDetailBo {
+	private String uid;
+	
 	private String	username;
 
 	private Integer	province;
@@ -171,6 +173,16 @@ public class UserPartnerDetailBo {
 	public void setProvinceS(String provinceS) {
 		this.provinceS = provinceS;
 	}
+	
+	
+
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
 
 	@Override
 	public String toString() {

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

@@ -53,6 +53,9 @@
 							<li><a
 								th:href="${basePath + '/portal/technologyTrading/demand.html'}">技术需求</a>
 							</li>
+							<li><a
+								th:href="${basePath + '/portal/technologyTrading/assessMent.html'}">技术评估</a>
+							</li>
 						</ol>
 					</li>
 					<li th:classappend="${mainM=='thinkTank'}? 'active'"><a
@@ -68,8 +71,7 @@
 								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>
 			</div>
 			<div class="nav_right" th:if="${!isLogin}">
@@ -79,10 +81,9 @@
 				<div></div>
 			</div>
 			<div class="nav_right" th:if="${isLogin}">
-				<a
-					th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
-					th:text="${userName}">个人中心</a> <a
-					th:href="${basePath + '/user/logout'}">退出</a> <a href="">关于我们</a>
+				<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
+					th:text="${#strings.isEmpty(userName)?'个人中心':userName}">个人中心</a> 
+				<a th:href="${basePath + '/user/logout'}">退出</a> <a href="">关于我们</a>
 				<div></div>
 			</div>
 		</div>
@@ -150,27 +151,27 @@
 					</div>
 					<div class="text_bottom">
 						<p>友情链接</p>
-						<a href="http://www.hnst.gov.cn/">湖南省科技厅/</a> <a
-							href="http://www.cssti.cn/">长沙市科技局/</a> <a
-							href="http://www.cast.org.cn/">中国科学技术协会/</a> <a
-							href="http://www.chinatorch.gov.cn/">科技部火炬中心/</a> <a
-							href="http://www.nosta.gov.cn/web/index.aspx">国家科技成果奖励办/</a> <a
-							href="http://www.nast.org.cn/">国家科技成果网/</a> <a
-							href="http://www.hnast.org.cn/portal/comm/index.action">湖南省科学技术协会/</a>
-						<a href="http://www.hncgw.gov.cn/">湖南省科技成果转化公共服务平台/</a> <a
-							href="http://www.hnjxw.gov.cn/">湖南省经济信息化委员会/</a> <a
-							href="http://kyy.hnu.cn/">湖南大学科学技术研究院/</a> <a
-							href="http://www.gxst.gov.cn/gxkjt/">广西省科技厅/</a> <a
-							href="http://www.nmkjt.gov.cn/">内蒙古自治区科技厅/</a> <a
-							href="http://www.cshtz.gov.cn/">长沙市高新区管委会/</a> <a
-							href="http://www.jxas.ac.cn/">江西省科学院/</a> <a
-							href="http://www.cnic.cn/front/index.html#/cnicSite/home">中科院计算机网络信息中心/</a>
-						<a href="http://kxyjb.csu.edu.cn/">中南大学科学研究部/</a> <a
-							href="http://www.cast.org.cn/">中国科协创新创业服务中心/</a> <a
-							href="http://www.hbstd.gov.cn/">湖北省科技厅/</a> <a
-							href="http://www.gdstc.gov.cn/">广东省科技厅/</a> <a
-							href="http://www.hnkjt.gov.cn/">河南省科技厅/</a> <a
-							href="http://www.cbtm.gov.cn/">技术合同登记官网</a>
+						<a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a> <a
+							href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a> <a
+							href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a> <a
+							href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a> <a
+							href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a> <a
+							href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a> <a
+							href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
+						<a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a> <a
+							href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a> <a
+							href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a> <a
+							href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a> <a
+							href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a> <a
+							href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a> <a
+							href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a> <a
+							href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
+						<a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a> <a
+							href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a> <a
+							href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a> <a
+							href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a> <a
+							href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a> <a
+							href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
 					</div>
 				</div>
 			</div>

+ 21 - 6
src/main/webapp/WEB-INF/views/portal/service/propertyRight.html

@@ -94,18 +94,30 @@
   				</a>
   			</div>  			
   		</div> 
-  		<div class="welfare_href">
-  			<a onclick="_MEIQIA('showPanel')">立即申请</a>
-  			<a onclick="_MEIQIA('showPanel')">专利征集</a>
+  		<div th:if="${!isLogin}" class="welfare_href">
+  			<a class="head_login">立即申请</a>
+  			<a class="head_login">专利征集</a>
+  		</div>
+  		<div th:if="${isLogin}" class="welfare_href">
+  			<a th:href="${basePath + '/user/account/services.html#patent'}">
+				立即申请
+			</a>
+			<a th:href="${basePath + '/user/account/services.html#contract'}">
+				专利征集
+			</a>
   		</div> 		
   	</div>
   	<div class="propery_star"></div>  		 	
   	<div class="copyright ">  		
   		<div class="copyright_contant">
   			<h4>软件著作权</h4>
-	  		<div class="copyright_left">
+	  		<div th:if="${!isLogin}" class="copyright_left">
+	  			<img th:src="${portalHost+'/img/property_05.png'}" alt="" />
+	  			<a href="" class="head_login">立即申请</a>
+			</div>
+			<div th:if="${isLogin}" class="copyright_left">
 	  			<img th:src="${portalHost+'/img/property_05.png'}" alt="" />
-	  				<a onclick="_MEIQIA('showPanel')">立即申请</a>
+	  			<a th:href="${basePath + '/user/account/services.html#copyright'}">立即申请</a>
 			</div>
 	  		<div class="copyright_right">
 	  			<h6>软著动态</h6>
@@ -135,9 +147,12 @@
   		</div>    		
   	</div>
   	<div class="container">
-  		<div class="intellectual">
+  		<div th:if="${!isLogin}" class="intellectual">
   			<a onclick="_MEIQIA('showPanel')">立即咨询</a>
   		</div>
+  		<div th:if="${isLogin}" class="intellectual">
+  			<a th:href="${basePath + '/user/account/services.html#intellectual'}">立即咨询</a>
+  		</div>
   		<div class="intellectual_right">
   			<h4>知识产权贯标</h4>
   			<p>什么是知识产权贯标:企业按照GB/T29490-2013《企业知识产权管理规范》建立一套既适应经济和社会发展状况又符合企业自身发展需求的知识产权管理体系,

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

@@ -174,7 +174,7 @@
 							</a>
 						</li>
 					</ul>
-					<span class="totalCount">共0条数据</span>
+					<span class="totalCount"></span>
 				</nav>
 			</div>
 		</div>

+ 1 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementOrder.html

@@ -131,6 +131,7 @@
 		<script type="text/javascript"
 			th:src="${portalHost + '/technologyTrading/achievementOrder.js'}"></script>
 	</div>
+	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
 
 </html>

+ 152 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -0,0 +1,152 @@
+<!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 + '/technologyTrading/assessMent.css'}"
+	rel="stylesheet">
+</head>
+<body>
+	<header>
+		<div th:replace="common::nav('technologyTrading','assessMent')"></div>
+	</header>
+	<!--banner-->
+  	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=1><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=2><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.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>
+		<ul class="ct-img-small clear">
+
+		</ul>
+	</div>
+	
+	<!--主体内容区域开始-->
+  	<div class="assessMent">
+  		<div class="container">
+  			<ul>
+  				<li>
+  					<div>
+  						<img th:src="${portalHost + '/img/assessMent_01.png'}" alt="" class="people"/><span>项目服务</span>
+  						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line"/>
+  					</div>
+  				</li>
+  				<li>
+  					<div>
+  						<img th:src="${portalHost + '/img/assessMent_02.png'}" alt=""  class="people"/><span>政策法规</span>
+  						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line"/>
+  					</div>
+  				</li>
+  				<li>
+  					<div>
+  						<img th:src="${portalHost + '/img/assessMent_03.png'}" alt="" class="people"/><span>为何选我</span>
+  						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line" />
+  					</div>
+  				</li>
+  				<li>
+  					<div>
+  						<img th:src="${portalHost + '/img/assessMent_04.png'}" alt=""  class="people"/><span>服务案例</span>
+  					</div>
+  				</li>
+  			</ul>
+  		</div>
+  	</div>
+  	<div class="contant">
+  		<div class="contant_box">
+  			<div class="col-md-6" >
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_05.png'}" alt="" />
+  					<p>基本资料</p>
+  				</div>
+  				<p>技术名称、所属行业、转让方式等指标系统自动内置,您只需动动鼠标</p>
+  			</div>
+  			<div class="col-md-6 thon">
+  				<img th:src="${portalHost + '/img/assessMent_sjxzou.png'}" alt="" class="sjx_left"/>
+  				<div class="con_box">  					
+  					<img th:src="${portalHost + '/img/assessMent_06.png'}" alt="" />
+  					<p>法律评况</p>
+  				</div>
+  				<p>自主研发技术、外购获取、授权许可专利证书自助提交</p>
+  			</div>
+  		</div>
+  		<div class="contant_box">
+  			<div class="col-md-6 thon"> 				
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_06.png'}" alt="" />
+  					<p>技术评况</p>
+  				</div>
+  				<p>创新性、替代性、成熟度、供求关系步步为营</p>
+  				<img th:src="${portalHost + '/img/assessMent_sjx.png'}" alt="" class="sjx_right"/>
+  			</div>
+  			<div class="col-md-6">
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_08.png'}" alt="" />
+  					<p>历史收入</p>
+  				</div>
+  				<p>历史盈收情况收集</p>
+  			</div>
+  		</div>
+  		<div class="contant_box">
+  			<div class="col-md-6">
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_09.png'}" alt="" />
+  					<p>收入预估</p>
+  				</div>
+  				<p>市场份额法、数量单价法精准预估</p>
+  			</div>
+  			<div class="col-md-6 thon">
+  				<img th:src="${portalHost + '/img/assessMent_sjxzou.png'}" alt="" class="sjx_left"/>
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_10.png'}" alt="" />
+  					<p>所得税预估</p>
+  				</div>
+  				<p>企业所得税优惠政策税率一目了然</p>
+  			</div>
+  		</div>
+  		<div class="contant_box">
+  			<div class="col-md-6 thon" > 				
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_11.png'}" alt="" />
+  					<p>风险预估</p>
+  				</div>
+  				<p>政策、技术、市场、管理风险,全面评测</p>
+  				<img th:src="${portalHost + '/img/assessMent_sjx.png'}" alt="" class="sjx_right"/>
+  			</div>
+  			<div class="col-md-6">
+  				<div class="con_box">
+  					<img th:src="${portalHost + '/img/assessMent_12.png'}" alt="" />
+  					<p>完成评估</p>
+  				</div>
+  				<p>系统根据提供的关键指标,同时结合平台专家意见给出最具专业的评估报告</p>
+  			</div>  			
+  		</div>  		
+  	</div>
+  	<div class="Consultation">
+  			<a th:if="${!isLogin}" class="head_login" href="">立刻评估</a>
+  			<a th:if="${isLogin}" th:href="${basePath+'/user/account/services.html#evaluate'}">立刻评估</a> 			
+  			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
+  	</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 + '/technologyTrading/assessMent.js'}"></script>
+	</div>
+</body>
+</html>

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

@@ -149,7 +149,7 @@
 							</a>
 						</li>
 					</ul>
-					<span class="totalCount">共0条数据</span>
+					<span class="totalCount"></span>
 				</nav>
 			</div>
 		</div>

+ 6 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -53,11 +53,15 @@
 							<span>有效日期:</span> <span th:text="${demand.validityPeriodS}?${demand.validityPeriodS}:永久"></span>
 						</div>
 						<div class="loves">  
-                       		<span class="box_love"></span><span class="dem_number">8</span><span>我感兴趣</span>
-							<input type="hidden" th:val="${demand.id}">                     
+                       		<span class="box_love"></span><span class="dem_number" th:text="${demand.countDemandInterest}"></span><span>我感兴趣</span>
+							<input type="hidden" th:val="${demand.id}" id="demand_id">                     
+							<input type="hidden" th:isInterester="${isInterester}" id="isInterester">                     
                     	</div>
 	                    <div class="detail_btn">
 	                       <a href="javascript:;" onclick="_MEIQIA('showPanel')">我要咨询</a><a href="javascript:;" id="purchase">立即购买</a>
+	                        <input type="hidden" th:val="${demand.id}" id="Id_" />
+							<input type="hidden" th:typ="${demand.dataCategory}" id="ownerType_" />
+							<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
 	                    </div>
 
 					</div>

+ 12 - 12
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandOrder.html

@@ -6,7 +6,7 @@
 <title>订单页--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 <link
-	th:href="${portalHost + '/technologyTrading/achievementOrder.css'}"
+	th:href="${portalHost + '/technologyTrading/demandOrder.css'}"
 	rel="stylesheet">
 </head>
 <body>
@@ -27,30 +27,30 @@
 						</div>
 						<div>
 							<h4>产品类型:</h4>
-							<p th:text="${demand.categoryS}?${demand.categoryS}:暂无分类信息">发明专利</p>
+							<p th:text="${demand.industryCategoryAS}?${demand.industryCategoryAS}:暂无行业分类"></p>
 						</div>
 						<div>
-							<h4>交易方式:</h4>
-							<p th:text="${demand.transferModeS}?${demand.transferModeS}:暂无"></p>
+							<h4>有效期:</h4>
+							<p th:text="${demand.validityPeriodS}?${demand.validityPeriodS}:永久"></p>
 						</div>
 						<div>
-							<h4>技术持有人:</h4>
-							<p th:text="${demand.ownerName}?${demand.ownerName}:陈灿"></p>
+							<h4>需求发布人:</h4>
+							<p th:text="${demand.employerName}?${demand.employerName}:陈灿"></p>
 						</div>
 						<div>
-							<h4>技术购买人:</h4>
+							<h4>需求解决人:</h4>
 							<p th:text="${userData != null}?${userData.nickname}:暂无"></p>
 						</div>
 					</div>
 					<div class="order_right">
 						<div class="order_right_p">
-							<h4>交易金额:</h4>
-							<p th:text="${demand.transferPrice}?${demand.transferPrice}:暂无"></p>
+							<h4>需求预算:</h4>
+							<p th:text="${demand.fixedbudget}?${demand.fixedbudget}:价格面议"></p>
 							<span onclick="_MEIQIA('showPanel')">立即议价</span>
 						</div>
 						<div>
 							<h4>电话:</h4>
-							<p th:text="${demand.ownerMobile}?${demand.ownerMobile}:073184121803"></p>
+							<p th:text="${demand.employerContactsMobile}?${demand.employerContactsMobile}:073184121803"></p>
 						</div>
 						<div>
 							<h4 >电话:</h4>
@@ -59,7 +59,7 @@
 					</div>
 				</div>
 				<div class="order_button">
-					<div>加入订单</div>
+					<div th:val="${demand.id}" id='id_'>加入订单</div>
 					<div>去支付</div>
 				</div>
 				<div class="order_text">加入订单,技术所有人很快就会联系你呦~,技淘祝您交易成功!</div>
@@ -129,7 +129,7 @@
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"
-			th:src="${portalHost + '/technologyTrading/achievementOrder.js'}"></script>
+			th:src="${portalHost + '/technologyTrading/demandOrder.js'}"></script>
 	</div>
 </body>
 

+ 22 - 16
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

@@ -183,41 +183,47 @@
 			<h5>业务速通</h5>
 			<ul th:if="${!isLogin}">
 				<li class="head_login">
-					<a href=""> 
-						<p>发布技术</p>
-					</a>
+					<a href="">发布技术</a>
 				</li>
 				<li class="head_login">
-					<a href=""> 
-						<p>发布需求</p>
-					</a>
+					<a href="">发布需求</a>
 				</li>
-				<li><a href="">技术评估</a></li>
 				<li class="head_login">
-					<a href=""> 
-						<p>专利申请</p>
-					</a>
+					<a href="">技术评估</a>
+				</li>
+				<li class="head_login">
+					<a href="">专利申请</a>
+				</li>
+				<li class="head_login">
+					<a href="">专利征集</a>
 				</li>
-				<li><a href="">专利征集</a></li>
 			</ul>
 			<ul th:if="${isLogin}">
 				<li>
 					<a th:href="${basePath + '/user/account/achievement.html#techAchievement'}">
-						<p>发布技术</p>
+						发布技术
 					</a>
 				</li>
 				<li>
 					<a th:href="${basePath + '/user/account/demand.html#techDemand'}">
-						<p>发布需求</p>
+						发布需求
 					</a>
 				</li>				
-				<li><a href="">技术评估</a></li>
+				<li>
+					<a th:href="${basePath+'/user/account/services.html#evaluate'}">
+						技术评估
+					</a>
+				</li>
 				<li>
 					<a th:href="${basePath + '/user/account/services.html#patent'}">
-						<p>专利申请</p>
+						专利申请
+					</a>
+				</li>
+				<li>
+					<a th:href="${basePath + '/user/account/services.html#contract'}">
+						专利征集
 					</a>
 				</li>
-				<li><a href="">专利征集</a></li>
 			</ul>
 		</div>
 	</div>

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

@@ -37,7 +37,7 @@
 	            	<li>></li> 
 	                 <li><a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a></li>
 	                <li>></li>               
-	                <li><a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a></li>
+	                <li class="that"><a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a></li>
 	            </ul>
 	            <div class="portal-content">
 					<div class="search-criteria row">

+ 10 - 8
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -29,10 +29,11 @@
 					</div>
 				</div>
 				<div class="detailtop_img">
-					<div class="head_img">
-						<img
-							th:src="${avatarUploadHost+rePartnerDetail.personPortraitUrl}"
-							alt="" />
+					<div th:if="${rePartnerDetail.personPortraitUrl == null or rePartnerDetail.personPortraitUrl == ''}" class="head_img">
+						<img th:src="${avatarUploadHost+ '/default/person.jpg'}" alt="" />
+					</div>
+					<div th:if="${rePartnerDetail.personPortraitUrl != null and rePartnerDetail.personPortraitUrl != ''}" class="head_img">
+						<img th:src="${avatarUploadHost+ rePartnerDetail.personPortraitUrl}" alt="" />
 					</div>
 					<div class="people_name" th:text="${rePartnerDetail.username}"></div>
 				</div>
@@ -77,7 +78,7 @@
 							th:src="${avatarUploadHost + '/default/subscriberDetail.jpg'}"
 							alt="" />
 					</p>
-					<div>
+					<div >
 						线下约见 <span>32次</span>
 					</div>
 				</div>
@@ -98,9 +99,10 @@
 						<p
 							th:text="${rePartnerDetail.personalProfile}?${rePartnerDetail.personalProfile}:无"></p>
 					</div>
-					<div class="right_btn">
-						<div class="btn_right">在线咨询</div>
-						<div id="consultBtn">线下约见</div>
+					<div class="right_btn" th:val="${rePartnerDetail.uid}">
+						<div class="btn_right" onclick="_MEIQIA('showPanel')">在线咨询</div>
+						<div id="consultBtn" >线下约见</div>
+						<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
 					</div>
 				</div>
 				<h3>相关智者</h3>