Browse Source

技术交易列表查询修改

zou_ht 8 years ago
parent
commit
88af57a28c

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

@@ -1455,7 +1455,7 @@
 	on 
 		a.field_a = b.id 	
 	where 
-		a.boutique = 1  and a.audit_status = 3 and a.field_a = #{industryCategory,jdbcType=INTEGER}
+		a.boutique = 1  and a.audit_status = 3 and a.field_a = #{fieldA,jdbcType=INTEGER}
 	<if test="dataCategory != null and dataCategory != ''">
 		and data_category = #{dataCategory,jdbcType=INTEGER}
 	</if>
@@ -1477,7 +1477,7 @@
 	on 
 		a.field_a = b.id 
 	where 
-		a.boutique = 1  and a.audit_status = 3 and a.field_a = #{industryCategory,jdbcType=INTEGER}
+		a.boutique = 1  and a.audit_status = 3 and a.field_a = #{fieldA,jdbcType=INTEGER}
 	<if test="dataCategory != null and dataCategory != ''">
 		and data_category = #{dataCategory,jdbcType=INTEGER}
 	</if>

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

@@ -1172,7 +1172,7 @@
   	where id = #{id,jdbcType=VARCHAR}
   </update>
   
-  <select id="findBoutiqueListByPage" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.BoutiqueListBo">
+  <select id="findBoutiqueListByPage" parameterType="java.lang.Integer" resultType="com.goafanti.portal.bo.BoutiqueListBo">
    	select 
    		a.id,a.name,
    		b.name as industryCategory,
@@ -1185,16 +1185,15 @@
 		field_glossory b 
 	on 
 		a.industry_category_a = b.id
-	<!-- where 
-		a.boutique = 1 and a.audit_status =3 and a.industry_category_a = #{industryCategory,jdbcType=INTEGER} 
-	-->
+	where
+		a.boutique = 1 and a.audit_status =3 and a.industry_category_a = #{industryCategoryA,jdbcType=INTEGER} 
 	order by 
 		a.create_time desc
 	<if test="page_sql!=null">
 		${page_sql}
 	</if>
   </select>
-  <select id="findBoutiqueCount"  parameterType="java.lang.String" resultType="java.lang.Integer">
+  <select id="findBoutiqueCount"  parameterType="java.lang.Integer" resultType="java.lang.Integer">
   	select 
   		count(1)
   	from 
@@ -1203,8 +1202,7 @@
 		join field_glossory b 
 	on 
 		a.industry_category_a = b.id
-	<!-- where 
-		a.boutique = 1 and a.audit_status =3 and a.industry_category_a = #{industryCategory,jdbcType=INTEGER} 
-	-->
+	where
+		a.boutique = 1 and a.audit_status =3 and a.industry_category_a = #{industryCategoryA,jdbcType=INTEGER} 
   </select>
 </mapper>

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

@@ -143,7 +143,7 @@ public class PortalSearchController extends BaseController {
 	@RequestMapping(value="/boutiqueSearchList",method = RequestMethod.POST)
 	public Result boutiqueSearchList(Integer boutiqueType, Integer industryCatalog,String pageNo, String pageSize){
 		Result res = new Result();
-		if(null == industryCatalog){
+		if(null == boutiqueType){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "精品类型"));
 		}
 		if(null == industryCatalog){

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/news/newsDetail.html

@@ -42,7 +42,7 @@
 				<hr />
 				<h5>推荐文章:</h5>
 				<div th:each="news:${news}">
-				    <span th:text="${news.title}?${news.title}:'暂无更多内容'"></span>
+				    <span ><a th:href="@{/portal/news/newsDetail(id=${news.id})}"  th:text="${news.title}?${news.title}:'暂无更多内容'"></a></span>
 				</div>
 			</div>
 			<div class="contetn_right" >

+ 116 - 8
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -141,19 +141,73 @@
   		<div class="container change_left">
 	  		<ul class="customer_company">
 	  			<li class="thon">
-	  				<img th:src="${portalHost+'/img/service_6.png'}"/>
+	  				<img th:src="${portalHost+'/img/service_1.jpg'}"/>
 	  				<p>法拉利456</p>
 	  			</li>
 	  			<li>
-	  				<img th:src="${portalHost+'/img/service_6.png'}"/>
+	  				<img th:src="${portalHost+'/img/service_2.jpg'}"/>
 	  				<p>法拉利456</p>
 	  			</li>
 	  			<li>
-	  				<img th:src="${portalHost+'/img/service_6.png'}"/>
+	  				<img th:src="${portalHost+'/img/service_3.jpg'}"/>
 	  				<p>法拉利457</p>
 	  			</li>
 	  			<li>
-	  				<img th:src="${portalHost+'/img/service_6.png'}"/>
+	  				<img th:src="${portalHost+'/img/service_4.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  		</ul>
+	  		<ul class="customer_company">
+	  			<li class="thon">
+	  				<img th:src="${portalHost+'/img/service_5.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_6.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_7.jpg'}"/>
+	  				<p>法拉利457</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_8.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  		</ul>
+	  		<ul class="customer_company">
+	  			<li class="thon">
+	  				<img th:src="${portalHost+'/img/service_9.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_10.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_11.jpg'}"/>
+	  				<p>法拉利457</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_12.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  		</ul>
+	  		<ul class="customer_company">
+	  			<li class="thon">
+	  				<img th:src="${portalHost+'/img/service_13.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_14.jpg'}"/>
+	  				<p>法拉利456</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_15.jpg'}"/>
+	  				<p>法拉利457</p>
+	  			</li>
+	  			<li>
+	  				<img th:src="${portalHost+'/img/service_16.jpg'}"/>
 	  				<p>法拉利456</p>
 	  			</li>
 	  		</ul>
@@ -167,19 +221,73 @@
   		<div class="container change_right">
 			<ul class="customer_company">
 				<li class="thon">
-					<img th:src="${portalHost+'/img/service_6.png'}"/>
+					<img th:src="${portalHost+'/img/service_17.jpg'}"/>
 					<p>法拉利123</p>
 				</li>
 				<li>
-					<img th:src="${portalHost+'/img/service_6.png'}"/>
+					<img th:src="${portalHost+'/img/service_18.jpg'}"/>
+					<p>法拉利123</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_19.jpg'}"/>
+					<p>法拉利123</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_20.jpg'}"/>
+					<p>法拉利123</p>
+				</li>
+			</ul>
+			<ul class="customer_company">
+				<li class="thon">
+					<img th:src="${portalHost+'/img/service_21.jpg'}"/>
+					<p>法拉利123</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_22.jpg'}"/>
+					<p>法拉利123</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_23.jpg'}"/>
+					<p>法拉利123</p>
+				</li>
+				<li>
+					<img th:src="${portalHost+'/img/service_24.jpg'}"/>
+					<p>法拉利123</p>
+				</li>
+			</ul>
+			<ul class="customer_company">
+				<li class="thon">
+					<img th:src="${portalHost+'/img/service_25.jpg'}"/>
 					<p>法拉利123</p>
 				</li>
 				<li>
-					<img th:src="${portalHost+'/img/service_6.png'}"/>
+					<img th:src="${portalHost+'/img/service_26.jpg'}"/>
 					<p>法拉利123</p>
 				</li>
 				<li>
-					<img th:src="${portalHost+'/img/service_6.png'}"/>
+					<img th:src="${portalHost+'/img/service_27.jpg'}"/>
+					<p>法拉利123</p>                       
+				</li>                                      
+				<li>                                       
+					<img th:src="${portalHost+'/img/service_28.jpg'}"/>
+					<p>法拉利123</p>                       
+				</li>                                      
+			</ul>                                          
+			<ul class="customer_company">                  
+				<li class="thon">                          
+					<img th:src="${portalHost+'/img/service_29.jpg'}"/>
+					<p>法拉利123</p>                       
+				</li>                                      
+				<li>                                       
+					<img th:src="${portalHost+'/img/service_30.jpg'}"/>
+					<p>法拉利123</p>                        
+				</li>                                       
+				<li>                                        
+					<img th:src="${portalHost+'/img/service_31.jpg'}"/>
+					<p>法拉利123</p>                        
+				</li>                                       
+				<li>                                        
+					<img th:src="${portalHost+'/img/service_32.jpg'}"/>
 					<p>法拉利123</p>
 				</li>
 			</ul>

File diff suppressed because it is too large
+ 137 - 22
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html