Browse Source

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

Merge Request: 合并到生产
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/236
浅川 8 years ago
parent
commit
1fdefbcd1d

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

@@ -129,7 +129,7 @@ public class PortalController extends BaseController {
 		List<DemandListBo> boutiquedemand = demandService.selectDemandList(1);
 		List<DemandListBo> reboutiquedemand = new ArrayList<DemandListBo>();
 		if (boutiquedemand.size() >= 4) {
-			int index = (int) new Random().nextInt(boutiquedemand.size() - 3);
+			int index = new Random().nextInt(boutiquedemand.size() - 3);
 			reboutiquedemand.add(boutiquedemand.get(index));
 			reboutiquedemand.add(boutiquedemand.get(index + 1));
 			reboutiquedemand.add(boutiquedemand.get(index + 2));

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

@@ -549,7 +549,7 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value="/portal/thinkTank/policyList",method = RequestMethod.GET)
 	public ModelAndView policyList(ModelAndView modelview){
 		modelview.setViewName("/portal/thinkTank/policyList");
-		List<NewsPortalList> newsList = (List<NewsPortalList>)newsService.portalNewsList(5, 1, null, 1, null, null).getList();
+		List<NewsPortalList> newsList = (List<NewsPortalList>)newsService.portalNewsList(5, 1, null, null, null, null).getList();
 		modelview.addObject("newsList", newsList);
 		return modelview;
 	}

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

@@ -248,9 +248,11 @@
 		<if test="type != null and type != 0" >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>
+		<!-- 
 		<if test="hot != null">
 			and a.hot = #{hot,jdbcType=INTEGER}
-		</if>
+		</if> 
+		-->
 		<if test="keyword != null">
 			and a.title like concat('%',#{keyword},'%')
 		</if>	
@@ -270,10 +272,12 @@
 		</if>
 		<if test="type != null and type != 0" >
 			and a.type = #{type,jdbcType=INTEGER}
-		</if>	
+		</if>
+		<!-- 	
 		<if test="hot != null">
 			and a.hot = #{hot,jdbcType=INTEGER}
 		</if>
+		-->
 		<if test="keyword != null">
 			and a.title like concat('%',#{keyword},'%')
 		</if>

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

@@ -225,7 +225,7 @@
 	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  -->
+		and 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
@@ -251,8 +251,11 @@
 	where 
 	a.type = 1 and b.id is not null
 	and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
-	<if test="locationProvince != null and locationProvince != ''">
-		and b.location_province = #{locationProvince,jdbcType=VARCHAR}
+	<if 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>
 	order by 
 		a.create_time desc

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

@@ -63,7 +63,12 @@
 					<div class="fine" >
 						<div class="fine_title">精品专利</div>
 						<div th:each="reboutiqueachievement:${reboutiqueachievement}" class="pointer">
-							<img th:src="${avatarUploadHost+reboutiqueachievement.technicalpictureurl}" alt="" />
+							<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>
 							<p th:text="${reboutiqueachievement.name}"></p>
 							<p th:text="${reboutiqueachievement.id}" class="achievementId"></p>
 							<p th:text="${reboutiqueachievement.ownerType}" class="achievementTyp"></p>
@@ -102,7 +107,15 @@
 				<div class="main_introduce" >
 					<ul>
 						<li th:each="reachievementlist:${reachievementlist}">
-							<img th:src="${avatarUploadHost+reachievementlist.technicalpictureurl}" alt="" />
+						<!-- 	<img th:src="${avatarUploadHost+reachievementlist.technicalpictureurl}" alt="" /> -->
+							
+							<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>
+							
 							<div class="list_text">
 								<p>
 									行业:<span th:text="${reachievementlist.fieldAS}?${reachievementlist.fieldAS}:暂无分类信息"></span>

+ 19 - 3
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -31,7 +31,7 @@
 						<h3 th:text="${demand.name}"></h3>
 					</div>
 					<div class="big_img">
-						<img th:src= "${avatarUploadHost+demand.pictureUrl}"alt="" />
+						<img th:src= "${avatarUploadHost+demand.pictureUrl}?${avatarUploadHost+demand.pictureUrl}:${avatarUploadHost+ 'default/xuqiuimg_null.png'}"alt="" />
 					</div>
 					<div class="basic">
 						<div>
@@ -61,7 +61,16 @@
 					<div class="fine">
 						<div class="fine_title">精品需求</div>
 						<div th:each="reboutiquedemand:${reboutiquedemand}" class="pointer">
-							<img th:src="${avatarUploadHost+reboutiquedemand.pictureUrl}" alt="" />
+							
+							<div th:if="${reboutiquedemand.pictureUrl} == null " >
+								<img th:src="${avatarUploadHost+ '/default/xuqiuimg_null.png'}" alt=""/>
+							</div>
+							<div th:if="${reboutiquedemand.pictureUrl} != null" >
+								<img th:src="${avatarUploadHost+reboutiquedemand.pictureUrl}" alt=""/>
+							</div>
+							
+							
+							<img src="${avatarUploadHost+reboutiquedemand.pictureUrl}" />
 							<p th:text="${reboutiquedemand.name}"></p>
 							<p th:text="${reboutiquedemand.id}" class="demandId"></p>
 							<p th:text="${reboutiquedemand.dataCategory}" class="demandTyp"></p>
@@ -79,7 +88,14 @@
 				<div class="line">猜你喜欢</div>
 				<div class="main_introduce">
 					<ul>
-						<li th:each="redemandlist:${redemandlist}"><img th:src="${avatarUploadHost+redemandlist.pictureUrl}" alt="" />
+						<li th:each="redemandlist:${redemandlist}"> 
+							<div th:if="${redemandlist.pictureUrl} == null " >
+								<img th:src="${avatarUploadHost+ '/default/xuqiuimg_null.png'}" alt=""/>
+							</div>
+							<div th:if="${redemandlist.pictureUrl} != null" >
+								<img th:src="${avatarUploadHost+redemandlist.pictureUrl}" alt=""/>
+							</div>
+						 
 							<div class="list_text">
 								<p>
 									行业:<span th:text="${redemandlist.industryCategoryAS}?${redemandlist.industryCategoryAS}:暂无行业分类"></span>

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

@@ -31,7 +31,7 @@
  	<div id="technology">
 		<div class="technolo">
 			<div class="technolo_left">
-				<h3>技术交易政策</h3>
+				<h3>技术交易成功案例</h3>
 				<div>
 					<div class="clear_line"></div>
 					<div class="technolo_text">