Browse Source

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

wanghui 8 years ago
parent
commit
da3a871361

+ 5 - 1
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.utils.StringUtils;
 
 public class AchievementListBo {
 
@@ -381,7 +382,7 @@ public class AchievementListBo {
 
 
 	public String getCountInterest() {
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {
@@ -397,6 +398,9 @@ public class AchievementListBo {
 	}
 
 	public String getOwnerPostalAddress() {
+		if (StringUtils.isEmpty(ownerPostalAddress)) {
+			return "湖南长沙";
+		}
 		return ownerPostalAddress;
 	}
 

+ 20 - 3
src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.utils.StringUtils;
 
 public class AchievementPartnerListBo {
 	private String		id;
@@ -97,6 +98,11 @@ public class AchievementPartnerListBo {
 	
 	private String buyIntention;
 	
+	/**
+	 * 所有人地址
+	 */
+	private String 	ownerPostalAddress;
+	
 	public Integer getFieldA() {
 		return fieldA;
 	}
@@ -245,12 +251,12 @@ public class AchievementPartnerListBo {
 	
 
 	public String getCountInterest() {
-	    
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {
-		this.countInterest = countInterest;
+		
+		this.countInterest =countInterest;
 	}
 
 	public Integer getBoutique() {
@@ -268,6 +274,17 @@ public class AchievementPartnerListBo {
 	public void setBuyIntention(String buyIntention) {
 		this.buyIntention = buyIntention;
 	}
+
+	public String getOwnerPostalAddress() {
+		if (StringUtils.isEmpty(ownerPostalAddress)) {
+			return "湖南长沙";
+		}
+		return ownerPostalAddress;
+	}
+
+	public void setOwnerPostalAddress(String ownerPostalAddress) {
+		this.ownerPostalAddress = ownerPostalAddress;
+	}
 	
 	
 	

+ 1 - 1
src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java

@@ -105,7 +105,7 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	}
 
 	public String getCountInterest() {
-		return CountInterest;
+		return String.valueOf(Integer.valueOf(CountInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {

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

@@ -50,7 +50,9 @@ public class ProjectBo {
 	}
 
 	public String getInterestCount() {
-		return interestCount;
+		return String.valueOf(Integer.valueOf(interestCount)+20);
+
+
 	}
 
 	public void setInterestCount(String interestCount) {

+ 0 - 2
src/main/java/com/goafanti/business/controller/AdminVarietiesApiController.java

@@ -172,8 +172,6 @@ public class AdminVarietiesApiController extends CertifyApiController{
 			res.getError().add(buildError("上移失败", "上移失败"));
 			return res;
 		}
-		
-		
 		if (sort>=Integer.valueOf(businessVarietiesMapper.getSortMax())&&flag==0) {
 			res.getError().add(buildError("下移失败", "下移失败"));
 			return res;

+ 2 - 0
src/main/java/com/goafanti/business/service/impl/BusinessVarietiesServiceImpl.java

@@ -37,6 +37,8 @@ public class BusinessVarietiesServiceImpl extends BaseMybatisDao<BusinessVarieti
 			Integer x=Integer.valueOf(businessVarietiesMapper.getSortMax());
 			x+=1;
 			buv.setSort(x);
+		}else {
+			buv.setSort(1);
 		}
 		String str=businessVarietiesMapper.getCidMax(superId);
 		String scid=businessVarietiesMapper.getCid(superId);

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

@@ -517,11 +517,12 @@
   		and b.id= #{superId,jdbcType=VARCHAR}
   	</select>
   	<select id="getVarieties" resultType="com.goafanti.business.bo.VarietiesBo">
-  		select id, cname AS name, varieties_logo as varietiesLogo 
+  		    select id, cname AS name, varieties_logo as varietiesLogo ,sort
 	from business_varieties b
 	where b.delete_sign=0
 	and b.status=0
 	and b.layer=1
+	ORDER BY if(isnull(b.sort),1,0),b.sort
   	</select>
   	
   	<select id="getCidMax" resultType="String">

+ 4 - 0
src/main/java/com/goafanti/common/model/Achievement.java

@@ -492,10 +492,14 @@ public class Achievement {
 	}
 
 	public String getOwnerPostalAddress() {
+		if (StringUtils.isEmpty(ownerPostalAddress)) {
+			return "湖南长沙";
+		}
 		return ownerPostalAddress;
 	}
 
 	public void setOwnerPostalAddress(String ownerPostalAddress) {
+		
 		this.ownerPostalAddress = ownerPostalAddress;
 	}
 

+ 5 - 1
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.utils.StringUtils;
 
 public class DemandListBo {
 
@@ -317,7 +318,7 @@ public class DemandListBo {
 
 
 	public String getCountInterest() {
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {
@@ -341,6 +342,9 @@ public class DemandListBo {
 	}
 
 	public String getEmployerAddress() {
+		if (StringUtils.isEmpty(employerAddress)) {
+			return "湖南长沙";
+		}
 		return employerAddress;
 	}
 

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

@@ -55,7 +55,7 @@ public class ObjectInterestListBo {
 		}
 	}
 	public String getCountInterest() {
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 	public void setCountInterest(String countInterest) {
 		this.countInterest = countInterest;

+ 1 - 0
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -871,6 +871,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (StringUtils.isNotBlank(TokenManager.getUserId())) {
 			params.put("uid", TokenManager.getUserId());
 		}
+		//params.put("uid", "6d71349c-7bb8-4e8a-8c03-0c3f36fc66ae");
 		if (type==InterestType.POLICY.getCode()) {
 			Pagination<ObjectInterestListBo> p=(Pagination<ObjectInterestListBo>) findPage("findAppNewsInterestByPage", "findAppNewsInterestCount", params, pNo, pSize);
 			List<ObjectInterestListBo> l=(List<ObjectInterestListBo>) p.getList();

+ 26 - 0
src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.utils.StringUtils;
 
 public class DemandSearchListBo {
 	private String		id;
@@ -90,6 +91,12 @@ public class DemandSearchListBo {
 	 * 接单数
 	 */
 	private String orderCount;
+	/**
+	 * 关注数量
+	 */
+	private String countInterest;
+	
+	private String  employerAddress;
 	
 	public String getEmployerName() {
 		return employerName;
@@ -259,5 +266,24 @@ public class DemandSearchListBo {
 		this.orderCount = orderCount;
 	}
 
+	public String getCountInterest() {
+		return String.valueOf(Integer.valueOf(countInterest)+20);
+	}
+
+	public void setCountInterest(String countInterest) {
+		this.countInterest = countInterest;
+	}
+
+	public String getEmployerAddress() {
+		if (StringUtils.isEmpty(employerAddress)) {
+			return "湖南长沙";
+		}
+		return employerAddress;
+	}
+
+	public void setEmployerAddress(String employerAddress) {
+		this.employerAddress = employerAddress;
+	}
+
 	
 }

+ 1 - 1
src/main/java/com/goafanti/user/bo/UserIdentityBo.java

@@ -101,7 +101,7 @@ public class UserIdentityBo extends UserIdentity {
 	}
 
 	public String getCountInterest() {
-		return countInterest;
+		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {