浏览代码

Merge remote-tracking branch 'origin/test'

limin 7 年之前
父节点
当前提交
09b20ac256

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

@@ -140,6 +140,9 @@ public class OpenAppHomeController extends BaseApiController{
 		//1 赚钱数据    2首页数据
 		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"));
+		map.put("homeImg", l);
 		result.setData(map);
 		return result;
 	}
@@ -156,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("1","1"));
-		l.add(new HomeImgBo("2","2"));
-		l.add(new HomeImgBo("3","3"));
+		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"));
 		map.put("homeImg", l);
 		result.setData(map);
 		return result;

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

@@ -623,7 +623,7 @@
 	  jtbp.advertisement,
 	  ifnull(dct.dealCount,0) as dealCount,
 	  ifnull(x.count,0) as interestCount,
-	  u.identify_name as companyName,u.id as companyId
+	  u.nickname as companyName,u.id as companyId
   from jt_business_project jtbp
   left join user u on u.id=jtbp.owner_id
   left join (select project_id as id,count(*) as count from project_interest group by project_id)x on jtbp.id=x.id
@@ -696,7 +696,7 @@
   left join jt_business_project_tag x on x.project_id=jtbp.id
   left join jt_tag y on x.tag_id=y.id
   </if>
-  where 1=1
+  where 1=1 
   <if test="tag != null">
   and y.id= #{tag,jdbcType=VARCHAR}
   </if> 
@@ -802,7 +802,7 @@
   </select>
   
    <select id="recommendedApplicationList" resultType="com.goafanti.common.bo.MyCollection">
-  select a.id,a.name,a.introduce as introduction,a.price as textA,
+  select a.id,a.name,a.advertisement as introduction,a.price as textA,
   		c.nickname as ownerName,ifnull(d.count,0) as interestCount
   	from jt_business_project a
   	left join jt_business_category b on  a.category_id=b.id
@@ -832,4 +832,4 @@
   	and b.module = 5 
   	</if>
   </select>
-</mapper>
+</mapper>

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

@@ -1318,7 +1318,7 @@ from
 	left join( select count(*) as count, to_uid from user_interest group by to_uid) a 
 	on u.id = a.to_uid left join( select to_uid from user_interest where from_uid ='1' ) b
 	on u.id = b.to_uid 
-	where u.status = 0 and u.source = 1 
+	where u.status = 0 and u.source = 0 
 	and ui.expert = 2 and ui.audit_status=2
 	<if test="consultantType != null">
 	and ui.consultant_type=#{consultantType,jdbcType=INTEGER}
@@ -1349,7 +1349,7 @@ from
 	select count(*)
 from
 	`user` u left join user_identity ui on ui.uid = u.id 
-	where u.status = 0 and u.source = 1 
+	where u.status = 0 and u.source = 0
 	and ui.expert = 2 and ui.audit_status=2
 	<if test="consultantType != null">
 	and ui.consultant_type=#{consultantType,jdbcType=INTEGER}