Browse Source

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

Michael 8 years ago
parent
commit
0321d6cf5e

+ 7 - 0
src/main/java/com/goafanti/app/bo/ProjectDetailBo.java

@@ -7,6 +7,7 @@ public class ProjectDetailBo {
 	private String valueEffect;
 	private String clientSize;
 	private String interest;
+	private String maxLogo;
 	public String getId() {
 		return id;
 	}
@@ -43,4 +44,10 @@ public class ProjectDetailBo {
 	public void setInterest(String interest) {
 		this.interest = interest;
 	}
+	public String getMaxLogo() {
+		return maxLogo;
+	}
+	public void setMaxLogo(String maxLogo) {
+		this.maxLogo = maxLogo;
+	}
 }

+ 3 - 3
src/main/java/com/goafanti/app/bo/ServiceImages.java

@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ServiceImages {
-	public String imager1="/tmp/1.jpg";
+	public String imager1="/tmp/1.png";
 	
-	public String imager2="/tmp/2.jpg";
+	public String imager2="/tmp/2.png";
 	
-	public String imager3="/tmp/3.jpg";
+	public String imager3="/tmp/3.png";
 	
 	private List<String> imagers=new ArrayList<>();
 	

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

@@ -718,7 +718,7 @@
   </select>
   
   <select id="selectAppProjectDetail" resultType="com.goafanti.app.bo.ProjectDetailBo">
-  	select p.id,p.bname as name,p.introduce ,p.Value_effect as valueEffect ,p.client_size as clientSize
+  	select p.id,p.bname as name,p.introduce ,p.Value_effect as valueEffect ,p.client_size as clientSize,p.max_logo as maxLogo
 from business_project p 
 where id=#{id,jdbcType=VARCHAR}
   </select>

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

@@ -1031,13 +1031,14 @@
 	 </select>
 	 
 	 <select id="findUserIdentityListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserIdentityBo">
-  	select 	t.id ,t.uid,t.username,t.work_unit as workUnit,t.province,t.area,t.professional_title as professionalTitle,t.industry,t.city,
+  	select 	t.id ,t.uid,u.nickname as username,t.work_unit as workUnit,t.province,t.area,t.professional_title as professionalTitle,t.industry,t.city,
 			u.introduction,u.head_portrait_url as headPortraitUrl,ifnull(o.x,0) as reservationCount
 	from user_identity t left JOIN user u on t.uid = u.id
 	left join (select count(0) as x,seller_id from t_order
 				where order_status != 4
 				group by  seller_id ) o on t.uid=o.seller_id
 	where expert=1
+	and u.status !=1
 	<if test="industry != null">
         and t.industry = #{industry,jdbcType=VARCHAR}
     </if>
@@ -1063,7 +1064,7 @@
   </select>
   
   <select id= "findConsultantListByPage"  resultType="com.goafanti.app.bo.consultantListBo" >
-  select t.uid as id,t.username ,u.head_portrait_url as headPortraitUrl,u.introduction ,t.consultant
+  select t.uid as id,u.nickname as username ,u.head_portrait_url as headPortraitUrl,u.introduction ,t.consultant
   from user_identity t
   left join `user` u on t.uid=u.id
   where t.consultant=1
@@ -1082,7 +1083,7 @@
   
   <select id="selectconsultantByUid" parameterType="java.lang.String" resultType="com.goafanti.app.bo.consultantListBo">
   	select 
-  		t.uid as id ,t.username ,t.consultant,u.head_portrait_url as headPortraitUrl,u.introduction,ifnull(o.x,0) as reservationCount,j.easemob_name as easemobName
+  		t.uid as id ,u.nickname as username ,t.consultant,u.head_portrait_url as headPortraitUrl,u.introduction,ifnull(o.x,0) as reservationCount,j.easemob_name as easemobName
   	from  user_identity t 
   	left join user u on t.uid =u.id
   	 left join jpush_easemob_account j on t.uid=j.uid