Browse Source

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui 8 years ago
parent
commit
3850ee29de

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

@@ -916,7 +916,7 @@
 			u.id as uid, ui.username, u.number,
 			ui.id as identityId, ui.province,
 			u.head_portrait_url as personPortraitUrl,
-			adc.achievement_count as achievementNum,
+			u.introduction as achievementNum,
 			adc.demand_count as demandNum,
 			uc.engaged_field as engagedField,
 			uc.work_unit as workUnit,

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

@@ -1202,13 +1202,13 @@
   
  	<select id="findUserPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
 		select
-		u.id,i.username,i.work_unit as workUnit,i.professional_title as position,c.achievement,
+		u.id,i.username,i.work_unit as workUnit,i.professional_title as position,u.introduction as achievement,
 		u.head_portrait_url as personPortraitUrl,
 		i.province,
 		u.introduction as personalProfile,
 		ua.ability_label as abilityLabel,i.qualification,
-		e.graduate_school,i.major_category,i.work_unit as workUnit,
-		i.industry as engagedField
+		i.graduate_school,i.major_category,i.work_unit as workUnit,
+		ic.name as engagedField
 		from `user` u
 		left join user_identity i on u.id=i.uid
 		left join
@@ -1216,6 +1216,7 @@
 		<!-- left join user_info info on u.id=info.uid -->
 		left join user_ability ua on u.id=ua.uid
 		left join user_edu e on u.id=e.uid
+		left join industry_category ic on i.industry=ic.id
 		WHERE
 		u.type = 0
 		<if test="_parameter!= null">

+ 3 - 3
src/main/java/com/goafanti/portal/bo/UserSubscriberListBo.java

@@ -9,7 +9,7 @@ public class UserSubscriberListBo {
 
 	private String	personPortraitUrl;
 
-	private Integer	achievementNum;
+	private String	achievementNum;
 
 	private Integer	demandNum;
 
@@ -87,11 +87,11 @@ public class UserSubscriberListBo {
 		this.personPortraitUrl = personPortraitUrl;
 	}
 
-	public Integer getAchievementNum() {
+	public String getAchievementNum() {
 		return achievementNum;
 	}
 
-	public void setAchievementNum(Integer achievementNum) {
+	public void setAchievementNum(String achievementNum) {
 		this.achievementNum = achievementNum;
 	}