Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

Conflicts:
	src/main/webapp/WEB-INF/views/portal/financial/index.html
wanghui 8 years ago
parent
commit
37a98dc3ce

+ 6 - 1
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -35,6 +35,8 @@ import com.goafanti.portal.bo.DemandPortalSimilarListBo;
 @Controller
 public class PortalController extends BaseController {
 	@Resource
+	private  FieldGlossoryService glossoryService;
+	@Resource
 	private AchievementService		achievementService;
 	@Resource
 	private DemandService			demandService;
@@ -321,7 +323,7 @@ public class PortalController extends BaseController {
 					achievementdetail.setTransferPriceS(PRICE_NEGOTIABLE);
 				}
 			}
-
+			
 			achievementdetail.setLocation(location);
 
 		}
@@ -399,6 +401,9 @@ public class PortalController extends BaseController {
 				if (StringUtils.isNotBlank(reachievementlist.get(i).getFieldAS())) {
 					a = Boolean.TRUE;
 				}
+				
+				String fieldAs = glossoryService.getName(fieldA);
+				reachievementlist.get(i).setFieldAS(fieldAs);
 			}
 
 			field += (a ? reachievementlist.get(i).getFieldAS() : "");

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

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

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

@@ -931,7 +931,7 @@
   
   <select id="findSearchDemandListByPage" parameterType="String" resultType="com.goafanti.portal.bo.DemandSearchListBo">
   	select 
-	  		d.id, d.name, d.keyword,
+	  		d.id, d.name, d.keyword,d.data_category as dataCategory,d.picture_url as pictureUrl,
 	  		d.serial_number as serialNumber, d.data_category as dataCategory, d.industry_category_a as industryCategoryA,
 	  		d.industry_category_b as industryCategoryB, d.demand_type as demandType, d.budget_cost as budgetCost,
 	  		d.problem_des as problemDes, d.release_date as releaseDate, d.employer_name as employerName,
@@ -1218,6 +1218,7 @@
 		d.id,
 		d.name,
 		d.keyword,
+		d.data_category as dataCategory,
 		d.fixed_budget as fixedbudget,
 		d.demand_type as demandType,
 		d.picture_url as pictureUrl,

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

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

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

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

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

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

+ 24 - 0
src/main/webapp/WEB-INF/views/portal/financial/index.html

@@ -242,6 +242,30 @@
 		<div class="allproduct_bottom">
 			<div class="allproduct_cont">
 				<ul id="demandList_patent">
+<<<<<<< HEAD
+=======
+					<!-- <li><img src="../img/allproduct_img.png" alt="" />
+						<div class="details_text">
+							<p>
+								融资金额: <span>10000</span>
+							</p>
+							<p>
+								所属行业: <span>航海航空</span>
+							</p>
+							<p>
+								所 有 人 : <span>海泽王</span>
+							</p>
+							<p>
+								项目简介: <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b>
+							</p>
+							<a href="#">会谈</a>
+						</div>
+						<div class="details_fix">
+							<p>
+								项目名 <span> 医疗四分局王死哦风景</span>
+							</p>
+						</div></li> -->
+>>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
 				</ul>
 			</div>
 			<div class="pagination_box">

+ 11 - 7
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -15,16 +15,16 @@
 	<div id="all_achievement">
 		<div class="detail">
 			<div class="detail_top">
-				<div class="detail_topimg">
+<!-- 				<div class="detail_topimg">
 					<a href="#"><img
 						th:src="${portalHost + '/img/detail_facebook.jpg'}" alt="" /></a> <a
 						href="#"><img
 						th:src="${portalHost + '/img/detail_weixin.jpg'}" alt="" /></a> <a
 						href="#"><img th:src="${portalHost + '/img/detail_weibo.jpg'}"
 						alt="" /></a>
-				</div>
+				</div>-->				
 				<div class="detail_toptitle">
-					<a href="#">技术交易</a> <a href="#">技术专利</a> <a href="#"
+					<a href="#">技术交易&nbsp;&nbsp;></a> <a href="#">技术专利&nbsp;&nbsp;></a> <a href="#"
 						class="a_detail">专利详情</a>
 				</div>
 			</div>
@@ -62,9 +62,11 @@
 					</div>
 					<div class="fine" >
 						<div class="fine_title">精品专利</div>
-						<div th:each="reboutiqueachievement:${reboutiqueachievement}">
+						<div th:each="reboutiqueachievement:${reboutiqueachievement}" class="pointer">
 							<img th:src="${avatarUploadHost+reboutiqueachievement.technicalpictureurl}" alt="" />
 							<p th:text="${reboutiqueachievement.name}"></p>
+							<p th:text="${reboutiqueachievement.id}" class="achievementId"></p>
+							<p th:text="${reboutiqueachievement.ownerType}" class="achievementTyp"></p>
 						</div>
 					</div>
 				</div>
@@ -84,7 +86,7 @@
 							<p th:text="${achievementdetail.categoryS}?${achievementdetail.categoryS}:暂无分类信息">发明专利</p>
 						</div>
 						<div>
-							<h5>最近更新</h5>
+							<h5>最近更新:</h5>
 							<p th:text="${achievementdetail.releaseDateS}?${achievementdetail.releaseDateS}:暂无该信息">2017-09-17</p>
 						</div>
 					</div>
@@ -103,17 +105,19 @@
 							<img th:src="${avatarUploadHost+reachievementlist.technicalpictureurl}" alt="" />
 							<div class="list_text">
 								<p>
-									行业:<span th:text="${reachievementlist.field}?${reachievementlist.field}:暂无分类信息"></span>
+									行业:<span th:text="${reachievementlist.fieldAS}?${reachievementlist.fieldAS}:暂无分类信息"></span>
 								</p>
 								<p >
 									名称:<span th:text="${reachievementlist.name}?${reachievementlist.name}:未知"></span>
 								</p>
 							    <p >
-									类型<span th:text="${reachievementlist.ownerTypeS}?${reachievementlist.ownerTypeS}:个人所有"></span>
+									类型:<span th:text="${reachievementlist.ownerTypeS}?${reachievementlist.ownerTypeS}:个人所有"></span>
 								</p> 
 								<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">

+ 8 - 4
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

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

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

@@ -137,7 +137,7 @@
 						</div>
 					</div>
 					<img th:src="${portalHost + '/img/technology_text.png'}" alt=""/>
-					<span>更 多</span>
+					<!-- <span>更 多</span> -->
 				</div>
 			</div>
 			<!-- <div class="technolo_center">
@@ -217,7 +217,7 @@
 						</div>
 					</div>
 					<img th:src="${portalHost + '/img/technology_question.png'}" alt=""/>
-					<span>更 多</span>
+					<!-- <span>更 多</span> -->
 				</div>
 			</div>
 		</div>