Browse Source

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

wanghui 8 years ago
parent
commit
b38edc2bcc

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

@@ -13,9 +13,9 @@ public class HomeImages {
 	private List<HomeImgBo> imagers=new ArrayList<>();
 	
 	public  List<HomeImgBo> getImagers() {
-		imagers.add(new HomeImgBo("065de736-9b40-4678-93bc-e95f5e8c529b",img1));
-		imagers.add(new HomeImgBo("739aed36-6ee6-406f-b03e-97d719b484b9",img1));
-		imagers.add(new HomeImgBo("af430be8-7752-43ac-ad82-27f02be317e6",img1));
+		imagers.add(new HomeImgBo("065de736-9b40-4678-93bc-e95f5e8c529b",img1,"成果"));
+		imagers.add(new HomeImgBo("739aed36-6ee6-406f-b03e-97d719b484b9",img1,"需求"));
+		imagers.add(new HomeImgBo("af430be8-7752-43ac-ad82-27f02be317e6",img1,"专家"));
 		return imagers;
 	}
 	

+ 10 - 1
src/main/java/com/goafanti/app/bo/HomeImgBo.java

@@ -5,10 +5,13 @@ public class HomeImgBo {
 	private String id;
 	/**轮播图片*/
 	private String imgUrl;
+	/**类型*/
+	private String type;
 	
-	HomeImgBo(String id,String imgUrl){
+	HomeImgBo(String id,String imgUrl,String type){
 		this.id = id;
 		this.imgUrl = imgUrl;
+		this.type = type;
 	}
 	public String getId() {
 		return id;
@@ -22,5 +25,11 @@ public class HomeImgBo {
 	public void setImgUrl(String imgUrl) {
 		this.imgUrl = imgUrl;
 	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
 	
 	}

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

@@ -2152,7 +2152,7 @@
 	left join field_glossory f2 on a.field_b=f2.id
 where
 	ap.publish_client = '1'
-	and ap.publish_page = 'W03'
+	and ap.publish_page = 'W01'
 order by
 	ap.if_top,
 	ap.top_number,

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

@@ -372,6 +372,8 @@ left join achievement a on ap.achievement_id=a.id
 left join admin ad on ap.publisher=ad.id
 left join branch_information bi on ap.publish_platform=bi.id
 where 1=1
+	and ap.publish_client = '1'
+	and ap.publish_page = 'W01'
 	<if test="name != null">
   	and a.name like "%"#{name,jdbcType=VARCHAR}"%"
   	</if>

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

@@ -2086,7 +2086,7 @@
 	</if>
   </select>
   <select id="getAppHomeRecommended" resultType="com.goafanti.demand.bo.DemandRecommended">
-	  	select dp.demand_id as id,d.name,d.problem_des as introduction,d.picture_url as pictureUrl,
+	  		select dp.demand_id as id,d.name,d.demand_type as demandType,d.problem_des as introduction,d.picture_url as pictureUrl,
 		d.urgent_days as urgentDays,d.urgent_money as urgentMoney,d.industry_category_a as industryCategoryA,
 		d.industry_category_b as industryCategoryB,f1.name as fieldA,f2.name as fieldB,d.boutique
 		from demand_publish dp 

+ 8 - 1
src/main/java/com/goafanti/demand/bo/DemandRecommended.java

@@ -19,7 +19,8 @@ public class DemandRecommended {
 	private String fieldB;
 	/**是否精品*/
 	private String boutique;
-	
+	/**是否精品*/
+	private String demandType;
 	
 	public String getId() {
 		return id;
@@ -75,5 +76,11 @@ public class DemandRecommended {
 	public void setBoutique(String boutique) {
 		this.boutique = boutique;
 	}
+	public String getDemandType() {
+		return demandType;
+	}
+	public void setDemandType(String demandType) {
+		this.demandType = demandType;
+	}
 	
 }

+ 16 - 12
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -349,19 +349,23 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 				"findUserIdentityCount", params, pNo, pSize);
 		List<UserIdentityBo> l=(List<UserIdentityBo>) p.getList();
 		for (UserIdentityBo u : l) {
-			if (null!=u.getProvince()) {
-				u.setProvince0(districtGlossoryMapper.selectByPrimaryKey(u.getProvince()).getName());
-			}
-			if (null!=u.getCity()) {
-				u.setCity0(String.valueOf(districtGlossoryMapper.selectByPrimaryKey(u.getCity()).getName()));
-			}
-			if (null!=u.getArea()) {
-				u.setArea0(String.valueOf(districtGlossoryMapper.selectByPrimaryKey(u.getArea()).getName()));
-			}
-			if (null!=u.getIndustry()) {
-				u.setIndustry0(String.valueOf(industryCategoryMapper.selectByPrimaryKey(u.getIndustry()).getName()));
+			if (u.getProvince()!=0) {
+				if (null!=u.getProvince()) {
+					System.out.println(u.getProvince());
+					u.setProvince0(districtGlossoryMapper.selectByPrimaryKey(u.getProvince()).getName());
+				}
+				if (null!=u.getCity()) {
+					u.setCity0(String.valueOf(districtGlossoryMapper.selectByPrimaryKey(u.getCity()).getName()));
+				}
+				if (null!=u.getArea()) {
+					u.setArea0(String.valueOf(districtGlossoryMapper.selectByPrimaryKey(u.getArea()).getName()));
+				}
+				if (null!=u.getIndustry()) {
+					u.setIndustry0(String.valueOf(industryCategoryMapper.selectByPrimaryKey(u.getIndustry()).getName()));
+				}
+			
 			}
-			u.setCountInterest(String.valueOf(userInterestMapper.countInterest(u.getUid())));
+				u.setCountInterest(String.valueOf(userInterestMapper.countInterest(u.getUid())));
 			
 		}