Browse Source

成果详情、成果首页

liliang4869 7 years ago
parent
commit
714bfa71a9

+ 6 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -117,4 +117,10 @@ public List<AchievementObject>getPracticalTechnologys(int size,String url,String
 
 List<PolicyEntity> getIntellectualProperty(int size);
 
+AchievementObject getAchievementDetail(String id,Integer type);
+
+List<AchievementObject>getBoutiquePatent(int size);
+
+List<AchievementObject>guessYouLike(int size);
+
 }

+ 18 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -905,6 +905,24 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		// TODO Auto-generated method stub
 		return achievementMapper.getIntellectualProperty(size);
 	}
+
+	@Override
+	public AchievementObject getAchievementDetail(String id, Integer type) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getAchievementDetail(id,type);
+	}
+
+	@Override
+	public List<AchievementObject> getBoutiquePatent(int size) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getBoutiquePatent( size);
+	}
+
+	@Override
+	public List<AchievementObject> guessYouLike(int size) {
+		// TODO Auto-generated method stub
+		return achievementMapper.guessYouLike(size);
+	}
 	
 	
 	

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

@@ -552,5 +552,22 @@ public class WebpageController extends BaseController {
 		modelview.addObject("policyList",intellectualPropertyPolicyList);
 		return modelview;
 	}
+	
+	@RequestMapping(value = "/portal/technologyTrading/achievementDetail")
+	public ModelAndView achievementDetail(HttpServletRequest request, ModelAndView modelAndView,String id, Integer type) {
+		//详情
+		AchievementObject achievementObject=achievementService.getAchievementDetail(id,type);
+		modelAndView.addObject("achievementdetail",achievementObject);
+		//精品
+		List<AchievementObject>boutiques=LimitLengthUtil.LimitListLengthRandomly(achievementService.getBoutiquePatent(10),3,10);
+		modelAndView.addObject("reboutiqueachievement",boutiques);
+		
+		//猜你喜欢
+		List<AchievementObject> guess =LimitLengthUtil.LimitListLengthRandomly(achievementService.guessYouLike(10), 4, 10);
+		modelAndView.addObject("guess",guess); 
+		//view
+		modelAndView.setViewName("/portal/technologyTrading/achievementDetail");
+		return modelAndView;
+	}
 
 }

+ 6 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -90,4 +90,10 @@ public interface AchievementMapper {
 	
 	List<PolicyEntity>getIntellectualProperty(int size);
 	
+	AchievementObject getAchievementDetail(String id,Integer type);
+	
+	List<AchievementObject>getBoutiquePatent(int size);
+	
+	List<AchievementObject>guessYouLike(int size);
+	
 }

+ 42 - 0
src/main/java/com/goafanti/common/enums/Maturity.java

@@ -0,0 +1,42 @@
+package com.goafanti.common.enums;
+
+public enum Maturity {
+	Type1(0,"正在研发"),
+	Type2(1,"已有样品"),
+	Type3(2,"通过小试"),
+	Type4(3,"通过中试"),
+	Type5(4,"可以量产"),
+	Unknow(-1,"未知成熟度")
+	;
+		int i;
+		String name;
+		
+		Maturity(int i, String name) {
+			this.i = i;
+			this.name = name;
+		}
+
+		public int getI() {
+			return i;
+		}
+
+		public void setI(int i) {
+			this.i = i;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+		public static Maturity find(int i)
+		{
+			for(Maturity m:values())
+			{
+				if(m.getI()==i)return m;
+			}
+			return Unknow;
+		}
+}

+ 1 - 1
src/main/java/com/goafanti/common/enums/TransferModes.java

@@ -4,7 +4,7 @@ public enum TransferModes {
 	TransferOfPropertyRights(0,"产权转让"),
 	AuthorizedProduction(1,"授权生产"),
 	Permissions(2,"实施许可"),
-	 Shareholder(3,"作入股"),
+	 Shareholder(3,"作入股"),
 CooperativeDevelopment(4,"合作生产"),
 	Unknow(-1,"未知类型")
 	;

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

@@ -2227,7 +2227,7 @@ on INSTR(branchInfo.domain_name,#{1})>0
 left join achievement_publish ap
  on ap.achievement_id=a.id
 left join 
-(select 
+(select  
 count(0) as ct,
 achievement_id as interest_aid
 from achievement_interest
@@ -2250,6 +2250,7 @@ select
 	a.name,
 	a.technical_picture_url as technicalPictureUrl,
 	a.category,
+	data_category as dataCategory,
 	release_date as releaseDate
 from
 	achievement a
@@ -2294,7 +2295,72 @@ order by release_date desc limit #{0}
 select p.id,p.title,p.title_img as titleImg,p.summary,dg1.name as provinceS,dg2.name as cityS,edit_time as editTime from policy p 
 left join district_glossory dg1 on dg1.id=p.province
 left join district_glossory dg2 on dg2.id=p.city
+where audit_status = 2
 order by edit_time
 limit #{0}
 </select>
+
+<select id="getAchievementDetail" resultType="com.goafanti.portal.bo.AchievementObject" >
+select
+	a.name as name,
+	a.transfer_mode as transferMode,
+	a.technical_picture_url as technicalPictureUrl,
+	a.maturity,
+	a.category,
+	a.owner_postal_address as city,
+	fg.name as fieldAS,
+	fgg.name as fieldBS,
+	release_date as releaseDate,
+	introduction
+from
+	achievement a
+left join field_glossory fg on
+	fg.id = a.field_a
+left join field_glossory fgg on
+	fgg.id = a.field_b
+where
+	a.id = #{0}
+	and a.data_category=#{1}
+</select>
+
+<select id="getBoutiquePatent" resultType="com.goafanti.portal.bo.AchievementObject">
+select
+	a.technical_picture_url as technicalPictureUrl,
+	name,
+	id,
+	data_category as dataCategory
+from
+	achievement a
+where
+	a.info_sources = 1
+	and audit_status=2
+	and a.boutique = 1
+limit #{0}
+</select>
+
+<select id="guessYouLike" resultType="com.goafanti.portal.bo.AchievementObject">
+select
+	a.id,
+	a.data_category as dataCategory,
+	a.name as name,
+	a.transfer_mode as transferMode,
+	a.technical_picture_url as technicalPictureUrl,
+	a.maturity,
+	a.category,
+	fg.name as fieldAS,
+	fgg.name as fieldBS,
+	release_date as releaseDate,
+	owner_type as ownerType,
+	introduction
+from
+	achievement a
+left join field_glossory fg on
+	fg.id = a.field_a
+left join field_glossory fgg on
+	fgg.id = a.field_b
+where
+audit_status=2
+and info_sources=1
+order by release_date limit #{0}
+</select>
 </mapper>

+ 9 - 8
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -1123,7 +1123,8 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   </select>
   
     <select id="selectCompanyDemand" resultType="com.goafanti.demand.bo.DemandListBo">
- select d.name,picture_url as pictureUrl,d.id from demand d  
+ select d.name,picture_url as pictureUrl,d.id ,data_category as dataCategory
+ from demand d  
    left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
  where d.data_category=1 and info_sources=1 and d.audit_status=2  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
@@ -1133,7 +1134,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   
    <select id="getUrgentDemand" resultType="com.goafanti.demand.bo.DemandListBo">
  select name,release_date as releaseDate,d.id,problem_des as problemDes,research_type as researchType,budget_cost as fundForPersonnel,crowd_cost as fundForCrowd,demand_type as demandType,
- validity_period as validityPeriod
+ data_category as dataCategory,validity_period as validityPeriod
   from demand d  
     left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
@@ -1143,7 +1144,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   
   <select id="getHotDemand" resultType="com.goafanti.demand.bo.DemandListBo">
  select name,release_date as releaseDate,d.id,problem_des as problemDes,research_type as researchType,budget_cost as fundForPersonnel,crowd_cost as fundForCrowd,demand_type as demandType,
- validity_period as validityPeriod
+ data_category as dataCategory,validity_period as validityPeriod
   from demand d 
       left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
@@ -1152,7 +1153,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   </select>
   
    <select id="getAreaDemand" resultType="com.goafanti.demand.bo.DemandListBo">
- select name,picture_url as pictureUrl ,problem_des as problemDes ,d.id from demand d 
+select name,picture_url as pictureUrl ,problem_des as problemDes , data_category as dataCategory,d.id from demand d 
        left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
   where d.demand_type=4 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
@@ -1160,7 +1161,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   </select>
   
    <select id="getProLearnStudyDemand" resultType="com.goafanti.demand.bo.DemandListBo">
-    select d.name as name,picture_url as pictureUrl ,problem_des as problemDes,employer_name as employerName,d.id,fg.name as industryCategory1,fgg.name as industryCategory2 from demand d  
+    select d.name as name,picture_url as pictureUrl ,problem_des as problemDes,employer_name as employerName,d.id,fg.name as industryCategory1,data_category as dataCategory,fgg.name as industryCategory2 from demand d  
     left join aft.field_glossory  fg  on fg.id=d.industry_category_a
     left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
            left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
@@ -1169,7 +1170,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  order by  release_date  desc limit #{0}
   </select>
    <select id="getFundCrowdDemand" resultType="com.goafanti.demand.bo.DemandListBo">
-  select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,crowd_cost as fundForCrowd,research_type as researchType from demand d  
+  select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,crowd_cost as fundForCrowd,data_category as dataCategory,research_type as researchType from demand d  
              left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
   where d.demand_type=3 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
@@ -1178,7 +1179,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   </select>
   
    <select id="getPersonnelDemand" resultType="com.goafanti.demand.bo.DemandListBo">
-  select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,budget_cost as fundForPersonnel from demand d  
+  select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,data_category as dataCategory,budget_cost as fundForPersonnel from demand d  
  left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
   where d.demand_type=5 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
@@ -1186,7 +1187,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   </select>
   
  <select id="getDemandDetail" resultType="com.goafanti.demand.bo.DemandListBo">
-  select d.name,d.budget_cost as budgetCost,d.validity_period as validityPeriod,d.picture_url as pictureUrl,problem_des as problemDes,
+  select d.name,d.budget_cost as budgetCost,d.validity_period as validityPeriod,data_category as dataCategory,d.picture_url as pictureUrl,problem_des as problemDes,
   fg.name as industryCategory1,fgg.name as industryCategory2
    from demand d
   left join aft.field_glossory  fg  on fg.id=d.industry_category_a

+ 23 - 2
src/main/java/com/goafanti/portal/bo/AchievementObject.java

@@ -5,6 +5,7 @@ import java.sql.Date;
 import com.goafanti.achievement.bo.InputAchievement;
 import com.goafanti.common.enums.AchievementCategory;
 import com.goafanti.common.enums.AchievementDataCategory;
+import com.goafanti.common.enums.Maturity;
 import com.goafanti.common.enums.TransferModes;
 
 public class AchievementObject extends InputAchievement {
@@ -21,8 +22,14 @@ public class AchievementObject extends InputAchievement {
 	private int interestCount;
 	private String dataCategoryS;
 	private String firstPicture;
-
+	private String city;
 	
+	public String getCity() {
+		return city;
+	}
+	public void setCity(String city) {
+		this.city = city;
+	}
 	public String getDataCategoryS() {
 		return dataCategoryS;
 	}
@@ -128,11 +135,25 @@ public class AchievementObject extends InputAchievement {
 	public void setTransferMode(Integer transferMode) {
 		// TODO Auto-generated method stub
 		super.setTransferMode(transferMode);
-		System.out.println(transferMode.intValue());
+//		System.out.println(transferMode.intValue()+"\n");
 		setTransferModeS(TransferModes.find(transferMode.intValue()).getName());
 	}
 	
+	@Override
+	public void setMaturity(Integer maturity) {
+		// TODO Auto-generated method stub
+		super.setMaturity(maturity);
+		setMaturityS(Maturity.find(maturity.intValue()).getName());
+	}
 	
+	@Override
+	public void setOwnerType(Integer ownerType) {
+		// TODO Auto-generated method stub
+		super.setOwnerType(ownerType);
+		if(ownerType==null)return;
+		if(ownerType.intValue()==1)setOwnerTypeS("组织所有");
+		else setOwnerTypeS("个人所有");
+	}
 	
 	
 }

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

@@ -220,13 +220,15 @@
         <div class="newRelease">
             <div></div>
             <ul>
-                <li th:each="ra:${recentAchievements}">
+                <li th:each="ra:${recentAchievements}" >
+                <a th:href="@{/portal/technologyTrading/achievementDetail(id=${ra.id},type=${ra.dataCategory})}">
                     <img th:src="${ra.firstPicture}==null?${portalHost+'/img/newMenu/achievement_2.jpg'}:${avatarUploadHost+ra.firstPicture}" alt="">
                     <div>
-                            <p th:text="${ra.name}"></p>
+                            <p th:text="${#strings.abbreviate(ra.name,15)}"></p>
                             <p><span class="orange" th:text="${ra.dataCategoryS}"></span>
-                            <span class="blur" th:text="${ra.releaseDate}==null?'未知发布时间':${#dates.format(ra.releaseDate,'yyyy-MM-dd')}"></span></p> 
+                            <span class="blur" th:text="${ra.releaseDate}==null?'未知时间':${#dates.format(ra.releaseDate,'yyyy-MM-dd')}"></span></p> 
                         </div>
+                        </a>
                 </li>
               
             </ul>
@@ -252,6 +254,7 @@
             <ul class="row">
               
                 <li class="col-sm-4" th:each="hota:${hotAchievements}">
+                  <a th:href="@{/portal/technologyTrading/achievementDetail(id=${hota.id},type=${hota.dataCategory})}">
                     <div>
                         <img th:src="${hota.firstPicture}==null?${portalHost+'/img/newMenu/achievement_8.jpg'}:${avatarUploadHost+hota.firstPicture}" alt="">
                         <div>
@@ -263,6 +266,7 @@
                             <span class="technology" th:text="${hota.categoryS}"></span></p>
                             
                         </div>
+                        </a>
                     </div>
                 </li>
             </ul>
@@ -285,10 +289,12 @@
                     <ul class="row">
                      
                         <li class="col-sm-4" th:each="pts:${patents}">
+                          <a th:href="@{/portal/technologyTrading/achievementDetail(id=${pts.id},type=${pts.dataCategory})}">
                             <div>
                                 <img th:src="${pts.firstPicture}==null?${portalHost+'/img/newMenu/achievement_14.jpg'}:${avatarUploadHost+pts.firstPicture}" alt="">
                                 <p th:text="${pts.name}"></p>
                             </div>
+                            </a>
                         </li>
                     </ul>
                 </div>
@@ -307,6 +313,7 @@
                 <ul>
                     
                     <li th:each="pt,ptStat:${practicalTechnology}" th:if="${ptStat.index}<5">
+                      <a th:href="@{/portal/technologyTrading/achievementDetail(id=${pt.id},type=${pt.dataCategory})}">
                         <div class="imgBj" >
                             <img th:src="${pt.firstPicture}==null?${portalHost+'/img/newMenu/achievement_19.jpg'}:${avatarUploadHost+pt.firstPicture}" alt="">   
                             <span></span>
@@ -318,15 +325,17 @@
                         </div>
                         <div class="hr"></div>
                         <div class="btnTxt">
-                            <span class="float-left" th:text="${pt.fieldAS}==null?'未知类型':${pt.fieldAS}">环保</span>
-                            <span class="float-right" th:text="${pt.fieldBS}==null?'未知类型':${pt.fieldBS}">医疗</span>
+                            <span class="float-left" th:text="${pt.fieldAS}==null?'未知类型':${pt.fieldAS}"></span>
+                            <span class="float-right" th:text="${pt.fieldBS}==null?'未知类型':${pt.fieldBS}"></span>
                         </div>
+                        </a>
                     </li>
                 </ul>
                 <div class="practicalGrounp">
                     <ol>
                       
                         <li  th:each="pt,ptStat:${practicalTechnology}" th:if="${ptStat.index}>=5 and ${ptStat.index}<8">
+                          <a th:href="@{/portal/technologyTrading/achievementDetail(id=${pt.id},type=${pt.dataCategory})}">
                             <img th:src="${pt.firstPicture}==null?${portalHost+'/img/newMenu/achievement_19.jpg'}:${avatarUploadHost+pt.firstPicture}" alt="">
                             <div class="practicalGrounpTxt">
                                 <div class="txts">
@@ -340,6 +349,7 @@
                             <span class="float-right" th:text="${pt.fieldBS}==null?'未知类型':${pt.fieldBS}">医疗</span>
                                 </div>
                             </div>
+                            </a>
                         </li>
                     </ol>
                 </div>
@@ -388,12 +398,12 @@
             <div class="transactionImg">
                 <img th:src="${portalHost+'/img/newMenu/achievement_29.jpg'}" alt="">
                 <div th:each="policy,policyStat:${policyList}" th:if="${policyStat.index}==0">
-                    <address><img th:src="${policy.titleImg}==null?${portalHost+'/img/newMenu/achievement_28.jpg'}:${avatarUploadHost+policy.titleImg}" alt="">
-                    <span th:text="${policy.provinceS+policy.cityS}"></span>
+                    <address><img th:src="${portalHost+'/img/newMenu/achievement_28.jpg'}" alt="">
+                    <span th:text="${#strings.abbreviate(policy.provinceS+policy.cityS,8)}"></span>
                     <time th:text="${#dates.format(policy.editTime,'yyyy-MM-dd')}"></time>
                     </address>
-                    <h5>《<span th:text="${policy.title}"></span>》</h5>
-                    <p th:text="${policy.summary}"></p>
+                    <h5>《<span th:text="${#strings.abbreviate(policy.title,12)}"></span>》</h5>
+                    <p th:text="${#strings.abbreviate(policy.summary,45)}"></p>
                     <a href="#">查看更多 > </a>
                 </div>
             </div>
@@ -405,10 +415,10 @@
                         <span th:text="${#dates.format(policy.editTime,'yyyy-MM')}"></span>
                     </div>
                     <div class="introduce">
-                       <address><img th:src="${policy.titleImg}==null?${portalHost+'/img/newMenu/achievement_28.jpg'}:${avatarUploadHost+policy.firstPicture}" alt="">
-                       <span th:text="${policy.provinceS+policy.cityS}"></span>
-                       <span class="title" >《<span th:text="${policy.title}"></span>》</span></address>
-                        <p  th:text="${policy.summary}"></p>
+                       <address><img th:src="${portalHost+'/img/newMenu/achievement_28.jpg'}" alt="">
+                       <span th:text="${#strings.abbreviate(policy.provinceS+policy.cityS,8)}"></span>
+                       <span class="title" >《<span th:text="${#strings.abbreviate(policy.title,12)}"></span>》</span></address>
+                        <p  th:text="${#strings.abbreviate(policy.summary,45)}"></p>
                     </div>
                 </li>
             </ul>
@@ -422,10 +432,10 @@
                         <span  th:text="${#dates.format(policy.editTime,'yyyy-MM')}">2018-06</span>
                     </div>
                     <div class="introduce">
-                       <address><img th:src="${policy.titleImg}==null?${portalHost+'/img/newMenu/achievement_28.jpg'}:${avatarUploadHost+policy.firstPicture}" alt="">
-                       <span th:text="${policy.provinceS+policy.cityS}"></span>
-                       <span class="title">《<span th:text="${policy.title}"></span>》</span></address>
-                        <p th:text="${policy.summary}"></p>
+                       <address><img th:src="${portalHost+'/img/newMenu/achievement_28.jpg'}" alt="">
+                       <span th:text="${#strings.abbreviate(policy.provinceS+policy.cityS,8)}"></span>
+                       <span class="title">《<span th:text="${#strings.abbreviate(policy.title,12)}"></span>》</span></address>
+                        <p th:text="${#strings.abbreviate(policy.summary,45)}"></p>
                     </div>
                 </li>
             </ol>

+ 18 - 37
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -23,7 +23,7 @@
 						href="#"><img th:src="${portalHost + '/img/detail_weibo.jpg'}"
 						alt="" /></a>
 				</div>-->				
-				<div class="detail_toptitle" th:each="achievementdetail:${achievementdetail}">
+				<div class="detail_toptitle" th:each="achievementdetail:${achievementdetail}" >
 					<a href="/portal/technologyTrading/index.html">技术交易&nbsp;&nbsp;></a> <a href="/portal/technologyTrading/achievement.html">技术专利&nbsp;&nbsp;></a> <a href="#"
 						class="a_detail" th:text="${achievementdetail.name}">详情</a>
 				</div>
@@ -43,7 +43,7 @@
 					</div>
 					<div class="basic">
 						<div class="inline_span">
-							<span>行业:</span>  <span th:text="${achievementdetail.field}?${achievementdetail.field}:暂无行业信息"></span>
+							<span>行业:</span>  <span th:text="${achievementdetail.fieldAS}?${achievementdetail.fieldAS}:暂无行业信息"></span>
 						</div>
 						<div class="inline_span" >
 							<span>交易方式:</span> <span th:text="${achievementdetail.transferModeS}?${achievementdetail.transferModeS}:面议"></span>
@@ -58,7 +58,7 @@
 							<span>类型:</span> <span th:text="${achievementdetail.categoryS}?${achievementdetail.categoryS}:暂无分类信息"></span>
 						</div>
 						<div class="inline_span1">
-							<span>最近更新</span><span th:text="${achievementdetail.releaseDateS}?${achievementdetail.releaseDateS}:暂无该信息"></span>  
+							<span>最近更新</span><span th:text="${achievementdetail.releaseDate}?${achievementdetail.releaseDate}:暂无该信息"></span>  
 						</div>
 						<div class="loves">							
                        		<span class="box_love"></span><span class="dem_number" ></span><span>我感兴趣</span>
@@ -75,17 +75,18 @@
 					</div>
 					<div class="fine">
 						<div class="fine_title">精品专利</div>
-						<div th:each="reboutiqueachievement:${reboutiqueachievement}" class="pointer">
+						<div th:each="reboutiqueachievement:${reboutiqueachievement}" class="pointer" >
 							
-							<div th:if="${reboutiqueachievement.technicalpictureurl} == null " >
+							<div th:if="${reboutiqueachievement.technicalPictureUrl} == null " >
 								<img th:src="${avatarUploadHost+ '/default/zhuanliimg_null.png'}" alt=""/>
 							</div>
-							<div th:if="${reboutiqueachievement.technicalpictureurl} != null ">
-								<img th:src="${avatarUploadHost+reboutiqueachievement.technicalpictureurl}" alt=""/>
+							<div th:if="${reboutiqueachievement.technicalPictureUrl} != null ">
+								<img th:src="${avatarUploadHost+reboutiqueachievement.technicalPictureUrl}" alt=""/>
 							</div>
 							<p th:text="${reboutiqueachievement.name}"></p>
-							<p th:text="${reboutiqueachievement.id}" class="demandId"></p>
-							<p th:text="${reboutiqueachievement.ownerType}" class="demandTyp"></p>
+							<p class="demandId" th:text="${reboutiqueachievement.id}"></p>
+							<p class="demandTyp" th:text="${reboutiqueachievement.dataCategory}"></p>
+				
 						</div>
 					</div>
 				</div>
@@ -100,15 +101,17 @@
 				<div class="line">猜你喜欢</div>
 				<div class="main_introduce" >
 					<ul>
-						<li th:each="reachievementlist:${reachievementlist}">
-							<div th:if="${reachievementlist.technicalpictureurl} == null " >
+						<li th:each="reachievementlist:${guess}">
+							<div th:if="${reachievementlist.technicalPictureUrl} == null " >
 								<img th:src="${avatarUploadHost+ '/default/zhuanliimg_null.png'}" alt=""/>
 							</div>
-							<div th:if="${reachievementlist.technicalpictureurl} != null " >
-								<img th:src="${avatarUploadHost+reachievementlist.technicalpictureurl}" alt=""/>
+							<div th:if="${reachievementlist.technicalPictureUrl} != null " >
+								<img th:src="${avatarUploadHost+reachievementlist.technicalPictureUrl}" alt=""/>
 							</div>
 							
 							<div class="list_text">
+								<p class="likeId" th:text="${reachievementlist.id}"></p>
+							<p class="likeType" th:text="${reachievementlist.dataCategory}"></p>
 								<p>
 									行业:<span th:text="${reachievementlist.fieldAS}?${reachievementlist.fieldAS}:暂无分类信息"></span>
 								</p>
@@ -121,41 +124,19 @@
 								<p >
 									交易方式:<span th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
 								</p>
-								<p class="likeId" th:text="${reachievementlist.id}"></p>
-								<p class="likeType" th:text="${reachievementlist.ownerType}"></p>
 								<a href="#">了解详情</a>
 							</div>
 							<div class="star">
 								<p >成熟度:<span th:text="${reachievementlist.maturityS}?${reachievementlist.maturityS}:暂无信息"></span></p>
 							</div>
+							
 						</li>
 					</ul>
 				</div>
 			</div>
 		</div>
 	</div>
-	<!--主体内容区域结束-->
-	<div class="pub_fix">
-		<span class="index_blur"></span>
-		<ul class="ret_top">
-			<li><a href=""> <img th:src="${portalHost + '/img/index_fix1.png'}" alt="" />
-					<p>发布需求</p>
-			</a></li>
-			<li><a href=""><img th:src="${portalHost + '/img/index_fix2.png'}" alt="" />
-					<p>发布技术</p>
-			</a></li>
-			<li>	
-				<a onclick="_MEIQIA('showPanel')">
-					<img th:src="${portalHost + '/img/index_fix3.png'}" alt="" />
-					<p>联系客服</p>
-				</a>
-			</li>
-			<li><a href="" class="pendent_box"> <img th:src="${portalHost + '/img/index_fix4.png'}" alt="" />
-					<p>返回顶部</p>
-			</a></li>
-		</ul>
-		<span class="index_orange"></span>
-	</div>
+
 	<footer>
 		<div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>

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

@@ -227,6 +227,7 @@
 						<img th:src="${portalHost+'/img/newMenu/demand-3.png'}" alt="">
 					</div>
 					<div class="col-md-7" th:each="u2:${urgentDemand2}">
+					<a th:href="@{/portal/technologyTrading/demandDetail(id=${u2.id},type=${u2.dataCategory})}">
 						<div>
 							<div th:switch="${u2.demandType}">
 								<span class="talents" th:case='0' th:text="企业技术需求"></span>
@@ -246,12 +247,13 @@
 								 <span class="colorOrange" th:if="${u2.demandType}==3" th:text="${'期望资金:¥'+u2.fundForCrowd}+'万'"></span>
 							</div>
 						</div>
+						</a>
 					</div>
 				</div>
 				<div class="talentsTxt row">
 					<ol>
 						<li th:each="u3:${urgentDemand3}">
-							
+							<a th:href="@{/portal/technologyTrading/demandDetail(id=${u3.id},type=${u3.dataCategory})}">
 								<p class="introduceP">
 								<div th:switch="${u3.demandType}">
 									<span class="talents" th:case='0' th:text="企业技术需求"></span>
@@ -275,7 +277,7 @@
 							 <span class="colorTime" th:if="${u3.validityPeriod}!=null" th:text="${#dates.format(u3.validityPeriod,'yyyy-MM-dd')+'到期'}"></span>
 								
 							</p>
-							
+							</a>
 						</li>
 
 					</ol>
@@ -302,6 +304,7 @@
 						<img th:src="${portalHost+'/img/newMenu/demand-4.png'}" alt="">
 					</div>
 					<div class="col-md-7" th:each="h2:${hotDemand2}">
+					<a th:href="@{/portal/technologyTrading/demandDetail(id=${h2.id},type=${h2.dataCategory})}">
 						<div>
 							<div th:switch="${h2.demandType}">
 								<span class="talents" th:case='0' th:text="企业技术需求"></span>
@@ -323,13 +326,14 @@
 								 
 							</div>
 						</div>
+						</a>
 				</div>
 			
 			</div>
 				<div class="talentsTxt row">
 					<ol>
 						<li th:each="h3:${hotDemand3}">
-							
+							<a th:href="@{/portal/technologyTrading/demandDetail(id=${h3.id},type=${h3.dataCategory})}">
 							<p class="introduceP">
 								<div th:switch="${h3.demandType}">
 									<span class="talents" th:case='0' th:text="企业技术需求"></span>
@@ -350,7 +354,7 @@
 			
 									<img th:src="${portalHost+'/img/newMenu/demand-5.jpg'}" alt="">
 							</p>
-							
+							</a>
 						</li>
 
 					</ol>
@@ -371,10 +375,14 @@
 				<div class="imgGroup col-md-10">
 					<ul>
 
-						<li th:each="companyDemandList:${companyDemandList}"><img
+						<li th:each="companyDemandList:${companyDemandList}">
+						<a th:href="@{/portal/technologyTrading/demandDetail(id=${companyDemandList.id},type=${companyDemandList.dataCategory})}">
+						<img
 							th:src="${companyDemandList.pictureUrl}==null?${portalHost+'/img/newMenu/demand-9.png'}:${avatarUploadHost +companyDemandList.pictureUrl}"
 							alt="">
-							<p th:text="${companyDemandList.name}"></p></li>
+							<p th:text="${companyDemandList.name}"></p>
+							</a>
+							</li>
 					</ul>
 				</div>
 			</div>
@@ -392,6 +400,7 @@
 			<div class="fullImgTxt container">
 				<ul class="row">
 					<li class="col-md-3" th:each="areaDemand,iterStat:${areaDemandList}">
+						<a th:href="@{/portal/technologyTrading/demandDetail(id=${areaDemand.id},type=${areaDemand.dataCategory})}">
 						<div class="warpImg">
 							<div th:if="${iterStat.even}" class="btnAreaBj">
 								<span class="btnArea" th:text="${areaDemand.name}"></span>
@@ -406,6 +415,7 @@
 								<span>立即查看产业需求</span>
 							</div>
 						</div>
+						</a>
 					</li>
 				</ul>
 			</div>
@@ -421,6 +431,7 @@
 			<div class="col-sm-10">
 				<ul class="row">
 					<li class="col-sm-4" th:each="plsdemand:${proLearnStudyDemandList}">
+						<a th:href="@{/portal/technologyTrading/demandDetail(id=${plsdemand.id},type=${plsdemand.dataCategory})}">
 						<div class="imgLeft">
 							<img th:if="${plsdemand.pictureUrl}==null" th:src="${portalHost+'/img/newMenu/demand-17.jpg'}" alt="">
 							<img th:if="${plsdemand.pictureUrl}!=null" th:src="${avatarUploadHost+plsdemand.pictureUrl}" alt="">
@@ -431,6 +442,7 @@
 							<span th:text="${plsdemand.industryCategory1}"></span>
 							 <span  th:text="${plsdemand.industryCategory2}"></span>
 						</div>
+						</a>
 					</li>
 				
 				</ul>
@@ -452,6 +464,7 @@
 				<ol class="row">
 					
 					<li class="col-sm-3" th:each="fundDemand:${fundDemandList}">
+						<a th:href="@{/portal/technologyTrading/demandDetail(id=${fundDemand.id},type=${fundDemand.dataCategory})}">
 						<div class="capital-administration">
 							<div class="capitalBj">
 								<h4 th:text="${fundDemand.name}"></h4>
@@ -468,6 +481,7 @@
 							</div>
 							<a href="#">立即查看</a>
 						</div>
+						</a>
 					</li>
 				</ol>
 			</div>
@@ -485,6 +499,7 @@
 				<ol class="row">
 				
 					<li class="col-sm-4" th:each="personnelDemand:${personnelDemandList}">
+						<a th:href="@{/portal/technologyTrading/demandDetail(id=${personnelDemand.id},type=${personnelDemand.dataCategory})}">
 						<div>
 							<h4 >
 							<span th:text="${personnelDemand.name}"></span>
@@ -493,6 +508,7 @@
 							<p th:text="${personnelDemand.problemDes}"></p>
 							<span class="float-right">招募中</span>
 						</div>
+						</a>
 					</li>
 				</ol>
 			</div>