瀏覽代碼

Merge remote-tracking branch 'origin/test'

limin 7 年之前
父節點
當前提交
4eae2a3d82

+ 4 - 4
src/main/java/com/goafanti/app/controller/OpenAppHomeController.java

@@ -141,7 +141,7 @@ public class OpenAppHomeController extends BaseApiController{
 		map.put("recommended", jtBusinessService.recommendedApplication(1,pageNo,pageSize));
 		map.put("tag", jtTagService.selectListJtTag(null, 1, 99));
 		List<HomeImgBo> l=new ArrayList<>();
-		l.add(new HomeImgBo("/img/index/index_banner1.png","1"));
+		l.add(new HomeImgBo("/img/index/index_banner1.png","/portal/militaryProjectApp.html"));
 		map.put("homeImg", l);
 		result.setData(map);
 		return result;
@@ -159,9 +159,9 @@ public class OpenAppHomeController extends BaseApiController{
 		//1 赚钱数据    2首页数据
 		map.put("recommended", jtBusinessService.recommendedApplication(1,pageNo,pageSize));
 		List<HomeImgBo> l=new ArrayList<>();
-		l.add(new HomeImgBo("/img/index/index_banner1.png","1"));
-		l.add(new HomeImgBo("/img/index/index_banner2.png","2"));
-		l.add(new HomeImgBo("/img/index/index_banner3.png","3"));
+		l.add(new HomeImgBo("/img/index/index_banner1.png","/portal/continueHighApp.html"));
+		l.add(new HomeImgBo("/img/index/index_banner2.png","/portal/practicalPatentApp.html"));
+		l.add(new HomeImgBo("/img/index/index_banner3.png","/portal/militaryProjectApp.html"));
 		map.put("homeImg", l);
 		result.setData(map);
 		return result;

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

@@ -645,7 +645,7 @@
 	on a.id=c.achievement_id
   	left join field_glossory f on a.field_a=f.id
   	left join field_glossory f2 on a.field_b=f2.id
-  	where a.deleted_sign = 0 and a.audit_status = 2 and a.info_sources=1 and a.release_status=1
+  	where a.deleted_sign = 0 and a.audit_status = 2 and a.info_sources=1 
   	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>
@@ -686,7 +686,7 @@
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	
-	order by a.boutique desc
+	order by a.release_date desc
 	<if test="page_sql!=null">
 			${page_sql}
 	</if>

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

@@ -556,7 +556,7 @@
 	left join (select count(0)  as countInterest ,demand_id from demand_interest 
 				group by demand_id) t on d.id=t.demand_id
 	left join (select demand_id from demand_interest where uid= #{uid,jdbcType=VARCHAR}) y on d.id=y.demand_id		
-	where d.deleted_sign = 0 and d.audit_status=2 and d.info_sources=1 and d.release_status=1
+	where d.deleted_sign = 0 and d.audit_status=2 and d.info_sources=1  
 	<if test="employerId != null">
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	</if>
@@ -596,7 +596,7 @@
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
-  	order by d.boutique desc
+  	order by d.release_date desc
   	<if test="page_sql!=null">
 		${page_sql}
 	</if>

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

@@ -528,8 +528,8 @@ count(0)
   jtod.commodity_name as commodityName,
   jto.seller_id as sellerId,
   jto.buyer_id as buyerId,
-  seller.identify_name as sellerName,
-  buyer.identify_name as buyerName,
+  seller.nickname as sellerName,
+  buyer.nickname as buyerName,
   seller.mobile as sellerMobile,
   jtod.commodity_id as commodityId,
   buyer.mobile as buyerMobile from jt_order jto
@@ -552,8 +552,8 @@ count(0)
   (case when jco.consult_type = 0 then '专家咨询' when jco.consult_type = 1 then '顾问咨询' end) as commodityName,
   jco.seller_id as sellerId,
   jco.buyer_id as buyerId,
-  seller.identify_name as sellerName,
-  buyer.identify_name as buyerName,
+  seller.nickname as sellerName,
+  buyer.nickname as buyerName,
   seller.mobile as sellerMobile,
   jco.seller_id as commodityId,
   buyer.mobile as buyerMobile