Explorar o código

APP端成果、需求开发

anderx %!s(int64=8) %!d(string=hai) anos
pai
achega
6a779c8d62
Modificáronse 32 ficheiros con 922 adicións e 30 borrados
  1. 53 2
      src/main/java/com/goafanti/achievement/bo/AchievementListBo.java
  2. 10 7
      src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java
  3. 42 0
      src/main/java/com/goafanti/achievement/bo/AchievementUserOwnerDetailBo.java
  4. 4 0
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  5. 51 1
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  6. 5 0
      src/main/java/com/goafanti/common/dao/AchievementMapper.java
  7. 5 0
      src/main/java/com/goafanti/common/dao/DemandMapper.java
  8. 3 0
      src/main/java/com/goafanti/common/dao/NewsMapper.java
  9. 2 0
      src/main/java/com/goafanti/common/dao/UserCareerMapper.java
  10. 6 0
      src/main/java/com/goafanti/common/dao/UserIdentityMapper.java
  11. 2 0
      src/main/java/com/goafanti/common/dao/UserInterestMapper.java
  12. 3 0
      src/main/java/com/goafanti/common/dao/UserMapper.java
  13. 23 4
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  14. 110 2
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  15. 7 0
      src/main/java/com/goafanti/common/mapper/NewsMapper.xml
  16. 2 0
      src/main/java/com/goafanti/common/mapper/UserCareerMapper.xml
  17. 40 3
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  18. 8 0
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  19. 19 0
      src/main/java/com/goafanti/common/model/Demand.java
  20. 97 6
      src/main/java/com/goafanti/demand/bo/DemandListBo.java
  21. 7 1
      src/main/java/com/goafanti/demand/service/DemandService.java
  22. 103 2
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  23. 7 0
      src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java
  24. 20 0
      src/main/java/com/goafanti/portal/bo/DemandSearchListBo.java
  25. 73 0
      src/main/java/com/goafanti/portal/bo/UserSubscriberListBo.java
  26. 92 0
      src/main/java/com/goafanti/user/bo/UserIdentityBo.java
  27. 6 0
      src/main/java/com/goafanti/user/service/UserCareerService.java
  28. 4 0
      src/main/java/com/goafanti/user/service/UserIdentityService.java
  29. 6 0
      src/main/java/com/goafanti/user/service/UserInterestService.java
  30. 15 2
      src/main/java/com/goafanti/user/service/impl/UserCareerServiceImpl.java
  31. 65 0
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  32. 32 0
      src/main/java/com/goafanti/user/service/impl/UserInterestServiceImpl.java

+ 53 - 2
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -111,6 +111,10 @@ public class AchievementListBo {
 	
 	
 	private String		field;
 	private String		field;
 	
 	
+	private String		fieldB;
+	
+	private String		fieldC;
+	
 	private String		maturityS;
 	private String		maturityS;
 	
 	
 	private String			transferModeS;
 	private String			transferModeS;
@@ -121,6 +125,16 @@ public class AchievementListBo {
 	 */
 	 */
 	private Integer hot;
 	private Integer hot;
 	
 	
+	private String countInterest;
+	/**
+	 * 简介
+	 */
+	private String introduction;
+	/**
+	 * 所有人地址
+	 */
+	private String 	ownerPostalAddress;
+	
 	public String getOrgId() {
 	public String getOrgId() {
 		return orgId;
 		return orgId;
 	}
 	}
@@ -285,7 +299,7 @@ public class AchievementListBo {
 
 
 	public Integer getMaturity() {
 	public Integer getMaturity() {
 		return maturity;
 		return maturity;
-	}
+	}   
 
 
 	public void setMaturity(Integer maturity) {
 	public void setMaturity(Integer maturity) {
 		this.maturity = maturity;
 		this.maturity = maturity;
@@ -307,6 +321,20 @@ public class AchievementListBo {
 		this.fieldAS = fieldAS;
 		this.fieldAS = fieldAS;
 	}
 	}
 
 
+	public String getFieldB() {
+		return fieldB;
+	}
+
+	public void setFieldB(String fieldB) {
+		this.fieldB = fieldB;
+	}
+	public String getFieldC() {
+		return fieldC;
+	}
+
+	public void setFieldC(String fieldC) {
+		this.fieldC = fieldC;
+	}
 	public String getField() {
 	public String getField() {
 		return field;
 		return field;
 	}
 	}
@@ -314,7 +342,6 @@ public class AchievementListBo {
 	public void setField(String field) {
 	public void setField(String field) {
 		this.field = field;
 		this.field = field;
 	}
 	}
-
 	public String getMaturityS() {
 	public String getMaturityS() {
 		return maturityS;
 		return maturityS;
 	}
 	}
@@ -346,4 +373,28 @@ public class AchievementListBo {
 	public void setHot(Integer hot) {
 	public void setHot(Integer hot) {
 		this.hot = hot;
 		this.hot = hot;
 	}
 	}
+
+	public String getCountInterest() {
+		return countInterest;
+	}
+
+	public void setCountInterest(String countInterest) {
+		this.countInterest = countInterest;
+	}
+
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
+
+	public String getOwnerPostalAddress() {
+		return ownerPostalAddress;
+	}
+
+	public void setOwnerPostalAddress(String ownerPostalAddress) {
+		this.ownerPostalAddress = ownerPostalAddress;
+	}
 }
 }

+ 10 - 7
src/main/java/com/goafanti/achievement/bo/AchievementPartnerListBo.java

@@ -88,6 +88,8 @@ public class AchievementPartnerListBo {
 	 */
 	 */
 	private String maturityS;
 	private String maturityS;
 	
 	
+	private String countInterest;
+	
 	public Integer getFieldA() {
 	public Integer getFieldA() {
 		return fieldA;
 		return fieldA;
 	}
 	}
@@ -233,15 +235,16 @@ public class AchievementPartnerListBo {
 		this.maturityS = maturityS;
 		this.maturityS = maturityS;
 	}
 	}
 
 
-	@Override
-	public String toString() {
-		return "partnerAchievementList [id=" + id + ", serialNumber=" + serialNumber + ", dataCategory="
-				+ dataCategory + ", name=" + name + ", keyword=" + keyword + ", category=" + category + ", ownerType="
-				+ ownerType + ", releaseDate=" + releaseDate + ", fieldA=" + fieldA + ", fieldB=" + fieldB
-				+ ", maturity=" + maturity + ", bargainingMode=" + bargainingMode + ", transferPrice=" + transferPrice
-				+ ", introduction=" + introduction + ", technicalPictureUrl=" + technicalPictureUrl + "]";
+	
+
+	public String getCountInterest() {
+		return countInterest;
 	}
 	}
 
 
+	public void setCountInterest(String countInterest) {
+		this.countInterest = countInterest;
+	}
+	
 	
 	
 	
 	
 }
 }

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

@@ -8,6 +8,38 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 	private Integer city;
 	private Integer city;
 	
 	
 	private Integer area;
 	private Integer area;
+	
+	private Integer CountInterest;
+	
+	private String field1;
+	
+	private String field2;
+	
+	public String getField1() {
+		return field1;
+	}
+
+	public void setField1(String field1) {
+		this.field1 = field1;
+	}
+
+	public String getField2() {
+		return field2;
+	}
+
+	public void setField2(String field2) {
+		this.field2 = field2;
+	}
+
+	public String getField3() {
+		return field3;
+	}
+
+	public void setField3(String field3) {
+		this.field3 = field3;
+	}
+
+	private String field3;
 
 
 	public Integer getProvince() {
 	public Integer getProvince() {
 		return province;
 		return province;
@@ -33,6 +65,16 @@ public class AchievementUserOwnerDetailBo extends AchievementOrgOwnerDetailBo {
 		this.area = area;
 		this.area = area;
 	}
 	}
 
 
+	public Integer getCountInterest() {
+		return CountInterest;
+	}
+
+	public void setCountInterest(Integer countInterest) {
+		CountInterest = countInterest;
+	}
+
+	
+
 
 
 	
 	
 }
 }

+ 4 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -85,4 +85,8 @@ public interface AchievementService {
     
     
     /**查询智者的科技成果**/
     /**查询智者的科技成果**/
     public List<AchievementPartnerListBo> findPartnerAchievementList(String uid);
     public List<AchievementPartnerListBo> findPartnerAchievementList(String uid);
+
+	Pagination<AchievementPartnerListBo> listAppUserAchievement(Integer auditStatus, Integer serialNumber, String name, String keyword,
+			Integer category, Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
+			Integer releaseStatus,String ownerId, Integer pNo, Integer pSize);
 }
 }

+ 51 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -30,6 +30,7 @@ import com.goafanti.common.dao.AchievementDemandMapper;
 import com.goafanti.common.dao.AchievementKeywordMapper;
 import com.goafanti.common.dao.AchievementKeywordMapper;
 import com.goafanti.common.dao.AchievementMapper;
 import com.goafanti.common.dao.AchievementMapper;
 import com.goafanti.common.dao.DemandKeywordMapper;
 import com.goafanti.common.dao.DemandKeywordMapper;
+import com.goafanti.common.dao.FieldGlossoryMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
@@ -85,6 +86,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	private UserIdentityMapper				userIdentityMapper;
 	private UserIdentityMapper				userIdentityMapper;
 	@Autowired
 	@Autowired
 	private OrganizationIdentityMapper		organizationIdentityMapper;
 	private OrganizationIdentityMapper		organizationIdentityMapper;
+	@Autowired
+	private FieldGlossoryMapper 			fieldGlossoryMapper;
 
 
 	private static final Logger				logger	= LoggerFactory.getLogger(AchievementServiceImpl.class);
 	private static final Logger				logger	= LoggerFactory.getLogger(AchievementServiceImpl.class);
 
 
@@ -374,7 +377,19 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 
 	@Override
 	@Override
 	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
 	public AchievementUserOwnerDetailBo selectUserOwnerDetail(String id) {
-		return achievementMapper.selectUserOwnerDetail(id);
+		AchievementUserOwnerDetailBo a=achievementMapper.selectUserOwnerDetail(id);
+		if (null!=a.getFieldA()) {
+			a.setField1(fieldGlossoryMapper.selectByPrimaryKey(a.getFieldA()).getName());
+		}
+		if(null!=a.getFieldB()){
+			a.setField2(fieldGlossoryMapper.selectByPrimaryKey(Integer.valueOf(a.getFieldB())).getName());
+		}
+		if(null!=a.getFieldC()){
+			a.setField3(fieldGlossoryMapper.selectByPrimaryKey(Integer.valueOf(a.getFieldC())).getName());
+		}
+		int i=achievementMapper.countInterest(a.getId());
+		a.setCountInterest(i);
+		return a;
 	}
 	}
 
 
 	@Override
 	@Override
@@ -672,4 +687,39 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.findPartnerAchievementListByPage(uid);
 		return achievementMapper.findPartnerAchievementListByPage(uid);
 	}
 	}
 
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<AchievementPartnerListBo> listAppUserAchievement(Integer auditStatus, Integer serialNumber,
+			String name, String keyword, Integer category, Integer ownerType, Integer status,
+			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus,String ownerId, Integer pNo, Integer pSize) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		
+		Pagination<AchievementPartnerListBo> p=(Pagination<AchievementPartnerListBo>) findPage("findAchievementListByPage", "findAchievementCount",
+				disposeParams(null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
+						status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null,null, null),
+				pNo, pSize);
+		List<AchievementListBo> list=(List<AchievementListBo>) p.getList();
+		System.out.println(list);
+		for (AchievementListBo ap : list) {
+			if (null!=ap.getFieldA()) {
+				ap.setField(fieldGlossoryMapper.selectByPrimaryKey(ap.getFieldA()).getName());
+			}
+			if(StringUtils.isNotBlank(ap.getFieldB())){
+				ap.setFieldB(fieldGlossoryMapper.selectByPrimaryKey(Integer.valueOf(ap.getFieldB())).getName());
+			}
+			if(StringUtils.isNotBlank(ap.getFieldC())){
+				ap.setFieldC(fieldGlossoryMapper.selectByPrimaryKey(Integer.valueOf(ap.getFieldC())).getName());
+			}
+			int i=achievementMapper.countInterest(ap.getId());
+			ap.setCountInterest(String.valueOf(i));
+		}
+		return p;
+	}
+
 }
 }

+ 5 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
+import com.goafanti.achievement.bo.AchievementInterestBo;
 import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
 import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.bo.AchievementPartnerListBo;
@@ -77,4 +78,8 @@ public interface AchievementMapper {
     /**	查询智者的科技成果**/
     /**	查询智者的科技成果**/
 	List<AchievementPartnerListBo>findPartnerAchievementListByPage(String uid);
 	List<AchievementPartnerListBo>findPartnerAchievementListByPage(String uid);
 	
 	
+	Integer countInterest(String achievementId);
+
+	List<AchievementInterestBo> achievementInterest(String uid);
+	
 }
 }

+ 5 - 0
src/main/java/com/goafanti/common/dao/DemandMapper.java

@@ -6,6 +6,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 import com.goafanti.common.model.Demand;
 import com.goafanti.common.model.Demand;
+import com.goafanti.demand.bo.DemandInterestBo;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandManageDetailBo;
 import com.goafanti.demand.bo.DemandManageDetailBo;
 import com.goafanti.portal.bo.DemandPortalDetailBo;
 import com.goafanti.portal.bo.DemandPortalDetailBo;
@@ -51,4 +52,8 @@ public interface DemandMapper {
 	ArrayList<DemandListBo> selectDemandList (Integer boutique);
 	ArrayList<DemandListBo> selectDemandList (Integer boutique);
 	
 	
 	List<DemandListBo> selectCsutomerLike(String uid);
 	List<DemandListBo> selectCsutomerLike(String uid);
+		
+	int countInterest(String demandId);
+
+	List<DemandInterestBo> demandInterest(String uid);
 }
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/NewsMapper.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import com.goafanti.common.model.News;
 import com.goafanti.common.model.News;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.bo.NewsSummary;
 import com.goafanti.news.bo.NewsSummary;
+import com.goafanti.news.bo.newsInterestBo;
 
 
 public interface NewsMapper {
 public interface NewsMapper {
 	int deleteByPrimaryKey(Long id);
 	int deleteByPrimaryKey(Long id);
@@ -37,4 +38,6 @@ public interface NewsMapper {
 	List<NewsPortalList> portalNewsQuestion();
 	List<NewsPortalList> portalNewsQuestion();
 	
 	
 	List<NewsSummary> findIndexNewsLists(Map<String, Object> params);
 	List<NewsSummary> findIndexNewsLists(Map<String, Object> params);
+
+	List<newsInterestBo> newsInterest(String uid);
 }
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/UserCareerMapper.java

@@ -18,4 +18,6 @@ public interface UserCareerMapper {
     
     
 
 
 	UserCareer selectUserCareerByUserId(String userId);
 	UserCareer selectUserCareerByUserId(String userId);
+
+	
 }
 }

+ 6 - 0
src/main/java/com/goafanti/common/dao/UserIdentityMapper.java

@@ -2,7 +2,9 @@ package com.goafanti.common.dao;
 
 
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.common.model.UserIdentityExample;
 import com.goafanti.common.model.UserIdentityExample;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
+import com.goafanti.user.bo.UserCareerBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserNames;
 
 
@@ -89,5 +91,9 @@ public interface UserIdentityMapper {
     List<UserNames> selectManagerAchievementUserOwner(@Param("aid")String aid, @Param("name")String name);
     List<UserNames> selectManagerAchievementUserOwner(@Param("aid")String aid, @Param("name")String name);
 
 
 	List<UserNames> selectAchievementUserOwner(@Param("aid")String aid, @Param("name")String name);
 	List<UserNames> selectAchievementUserOwner(@Param("aid")String aid, @Param("name")String name);
+
+	Pagination<UserIdentityBo> expertsList(String industry, Integer pNo, Integer pSize);
+
+	UserIdentityBo selectUserIdentityByUid(String uid);
     
     
 }
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/UserInterestMapper.java

@@ -20,4 +20,6 @@ public interface UserInterestMapper {
 	UserInterest findByFromUidAndToUid(@Param("fromUid")String fromUid, @Param("toUid")String toUid);
 	UserInterest findByFromUidAndToUid(@Param("fromUid")String fromUid, @Param("toUid")String toUid);
 
 
 	Integer countByToUid(String toUid);
 	Integer countByToUid(String toUid);
+
+	
 }
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -10,6 +10,7 @@ import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserBusiness;
 import com.goafanti.common.model.UserBusiness;
 import com.goafanti.user.bo.OrgPartnerDetailBo;
 import com.goafanti.user.bo.OrgPartnerDetailBo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserDownLoadBo;
+import com.goafanti.user.bo.UserInterestBo;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
 import com.goafanti.common.model.UserExample;
 import com.goafanti.common.model.UserExample;
@@ -178,4 +179,6 @@ public interface UserMapper {
 	 */
 	 */
 	List<User> checkUser(@Param("id")String id,@Param("identifyName")String identifyName, @Param("mobile")String mobile,@Param("type")Integer type);
 	List<User> checkUser(@Param("id")String id,@Param("identifyName")String identifyName, @Param("mobile")String mobile,@Param("type")Integer type);
 
 
+	List<UserInterestBo> userInterest(String uid);
+
 }
 }

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

@@ -1000,11 +1000,14 @@
    <select id="findAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
    <select id="findAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
   	select 
   	select 
   		id, serial_number as serialNumber, data_category as dataCategory, 
   		id, serial_number as serialNumber, data_category as dataCategory, 
-  		name, keyword, category, 
-  		owner_name as ownerName, owner_type as ownerType, owner_mobile as ownerMobile,
+  		name, keyword, category, introduction,owner_postal_address as ownerPostalAddress,
+  		owner_name as ownerName, owner_type as ownerType, owner_mobile as ownerMobile,field_a as fieldA,field_b as fieldB,field_c as fieldC,
   		status, release_date as releaseDate, audit_status as auditStatus
   		status, release_date as releaseDate, audit_status as auditStatus
   	from achievement
   	from achievement
-  	where deleted_sign = 0 and owner_id = #{ownerId,jdbcType=VARCHAR}
+  	where deleted_sign = 0 
+  	<if test="ownerId != null">
+  	and owner_id = #{ownerId,jdbcType=VARCHAR}
+  	</if>
   	<if test="serialNumber != null">
   	<if test="serialNumber != null">
 		and  serial_number = #{serialNumber,jdbcType=INTEGER}
 		and  serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -1046,7 +1049,10 @@
   	select 
   	select 
   		count(1)
   		count(1)
   	from achievement
   	from achievement
-  	where deleted_sign = 0 and owner_id = #{ownerId,jdbcType=VARCHAR}
+  	where deleted_sign = 0 
+  	  	<if test="ownerId != null">
+  	and owner_id = #{ownerId,jdbcType=VARCHAR}
+  	</if>
   	<if test="serialNumber != null">
   	<if test="serialNumber != null">
 		and  serial_number = #{serialNumber,jdbcType=INTEGER}
 		and  serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -1638,4 +1644,17 @@
   	    order by a.release_date desc limit 0,4
   	    order by a.release_date desc limit 0,4
   </select>
   </select>
   
   
+  <select id="countInterest" resultType="Integer">
+  	select count(0)
+  	from achievement_interest 
+  	where achievement_id=#{achievementId,jdbcType=VARCHAR}
+  	</select>
+  	
+  	<select id="achievementInterest" resultType="com.goafanti.achievement.bo.AchievementInterestBo">
+  	select
+		a.id,a.name,a.create_time as createTime
+	from achievement_interest ai
+	LEFT  join achievement a on ai.achievement_id=a.id
+	where uid=#{uid,jdbcType=VARCHAR}
+  	</select>
 </mapper>
 </mapper>

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

@@ -41,6 +41,8 @@
     <result column="tech_broker_id" property="techBrokerId" jdbcType="VARCHAR" />
     <result column="tech_broker_id" property="techBrokerId" jdbcType="VARCHAR" />
     <result column="boutique" property="boutique" jdbcType="INTEGER" />
     <result column="boutique" property="boutique" jdbcType="INTEGER" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
     <result column="uid" property="uid" jdbcType="VARCHAR" />
+    <result column="urgent_days" property="urgentDays" jdbcType="INTEGER" />
+    <result column="urgent_money" property="urgentMoney" jdbcType="DECIMAL" />
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List" >
   <sql id="Base_Column_List" >
     id, serial_number, data_category, name, keyword, info_sources, industry_category_a, 
     id, serial_number, data_category, name, keyword, info_sources, industry_category_a, 
@@ -49,13 +51,14 @@
     fixed_scheme, cost_escrow, budget_cost, validity_period, employer_id, employer_name, 
     fixed_scheme, cost_escrow, budget_cost, validity_period, employer_id, employer_name, 
     employer_address, employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, 
     employer_address, employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, 
     contacts, status, release_status, release_date, create_time, principal_id, deleted_sign,
     contacts, status, release_status, release_date, create_time, principal_id, deleted_sign,
-    audit_status, tech_broker_id,boutique
+    audit_status, tech_broker_id,boutique,urgent_money,urgent_days
   </sql>
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from demand
     from demand
     where id = #{id,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
+    
   </select>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from demand
     delete from demand
@@ -1395,5 +1398,110 @@
 		interest.uid = #{uid,jdbcType=INTEGER}
 		interest.uid = #{uid,jdbcType=INTEGER}
 		limit 0,4
 		limit 0,4
 	</select>
 	</select>
-	
+	<select id="countInterest" resultType="Integer">
+	select count(0)
+	from demand_interest
+	where demand_id = #{demandId,jdbcType=VARCHAR}
+	</select> 
+	<select id="findAppDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
+  		select 
+	  d.id, d.serial_number as serialNumber, d.data_category as dataCategory, 
+	  d.name, d.keyword, d.demand_type as demandType, d.industry_category_a as industryCategoryA, d.industry_category_b as industryCategoryB, d.industry_category_c as industryCategoryC,
+	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus, 
+	  d.release_date as releaseDate, d.employer_id as employerId, d.audit_status as auditStatus,
+	  d.urgent_money as urgentMoney,d.urgent_days as  urgentDays,d.employer_address as employerAddress,d.problem_des as problemDes
+	from  demand d 
+	where d.deleted_sign = 0 
+	<if test="employerId != null">
+	and d.employer_id = #{employerId, jdbcType=VARCHAR}
+	</if>
+	<if test="serialNumber != null">
+		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}
+	</if>
+	<if test="auditStatus != null">
+		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
+	</if>
+	<if test="name != null">
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="keyword != null">
+		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
+	</if>
+	<if test="demandType != null">
+		and  d.demand_type = #{demandType,jdbcType=INTEGER}
+	</if>
+	<if test="status != null">
+		and  d.status = #{status,jdbcType=VARCHAR}
+	</if>
+	<if test="releaseStatus != null">
+		and  d.release_status = #{releaseStatus,jdbcType=VARCHAR}
+	</if>
+	<if test="vStart != null">
+	   and d.validity_period <![CDATA[ >= ]]> #{vStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="vEnd != null">
+	   and d.validity_period <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test="rStart != null">
+       and	d.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="rEnd != null">
+	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
+	</if>
+  	order by d.serial_number desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findAppDemandCount" parameterType="String" resultType="java.lang.Integer">
+  		select count(1)
+	from  demand d 
+	where d.deleted_sign = 0 
+	<if test="employerId != null">
+	and d.employer_id = #{employerId, jdbcType=VARCHAR}
+	</if>
+	<if test="serialNumber != null">
+		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}
+	</if>
+	<if test="auditStatus != null">
+		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
+	</if>
+	<if test="name != null">
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="keyword != null">
+		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
+	</if>
+	<if test="demandType != null">
+		and  d.demand_type = #{demandType,jdbcType=INTEGER}
+	</if>
+	<if test="status != null">
+		and  d.status = #{status,jdbcType=VARCHAR}
+	</if>
+	<if test="releaseStatus != null">
+		and  d.release_status = #{releaseStatus,jdbcType=VARCHAR}
+	</if>
+	<if test="vStart != null">
+	   and d.validity_period <![CDATA[ >= ]]> #{vStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="vEnd != null">
+	   and d.validity_period <![CDATA[ < ]]> #{vEnd,jdbcType=TIMESTAMP}
+	</if>
+	<if test="rStart != null">
+       and	d.release_date <![CDATA[ >= ]]> #{rStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="rEnd != null">
+	   and  d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
+	</if>
+  </select>
+  
+  <select id="demandInterest" resultType="com.goafanti.demand.bo.DemandInterestBo">
+  	select
+		d.id,d.name,di.create_time as createTime
+	from demand_interest di
+	LEFT  join demand d on di.demand_id=d.id
+	where uid=#{uid,jdbcType=VARCHAR}
+  </select>
+  
 </mapper>
 </mapper>

+ 7 - 0
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -316,5 +316,12 @@
 		a.type =2
 		a.type =2
 		order by create_time desc
 		order by create_time desc
 	</select>
 	</select>
+	<select id="newsInterest" resultType="com.goafanti.news.bo.newsInterestBo">
+		select
+		n.id,n.title ,n.create_time as createTime
+	from news_interest ni
+	LEFT  join news n on ni.new_id=n.id
+	where uid=#{uid,jdbcType=VARCHAR}
+	</select>
 	
 	
 </mapper>
 </mapper>

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

@@ -206,4 +206,6 @@
     from user_career
     from user_career
     where uid = #{uid,jdbcType=VARCHAR}
     where uid = #{uid,jdbcType=VARCHAR}
   </select>
   </select>
+  
+  
 </mapper>
 </mapper>

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

@@ -834,8 +834,10 @@
   	select 
   	select 
   		   t.id, t.uid, t.username, t.sex, t.date_of_birth_year as dateOfBirthYear,
   		   t.id, t.uid, t.username, t.sex, t.date_of_birth_year as dateOfBirthYear,
   		   t.date_of_birth_month as dateOfBirthMonth, t.id_number as idNumber, t.audit_status as auditStatus,
   		   t.date_of_birth_month as dateOfBirthMonth, t.id_number as idNumber, t.audit_status as auditStatus,
-		   u.mobile, u.number from user u left JOIN user_identity t
-	on t.uid = u.id where t.uid=#{uid,jdbcType=VARCHAR}
+		   u.mobile, u.number 
+		   from user u left JOIN user_identity t
+	on t.uid = u.id 
+	where t.uid=#{uid,jdbcType=VARCHAR}
   </select>
   </select>
   
   
   <select id="selectAuditorUserIdentityByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.AuditorUserIdentityDetailBo">
   <select id="selectAuditorUserIdentityByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.AuditorUserIdentityDetailBo">
@@ -1015,6 +1017,41 @@
 		<!-- and b.international_flag and b.audit_status = 5 and b.expert = 1 -->
 		<!-- and b.international_flag and b.audit_status = 5 and b.expert = 1 -->
 		order by 
 		order by 
 			a.create_time desc 
 			a.create_time desc 
-		limit 0,6	 
+		limit 0,6	
+	</select> 
+	 <select id="selectUserIdentityByUid" 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,u.introduction,u.head_portrait_url as headPortraitUrl
+	from user_identity t left JOIN user u
+	on t.uid = u.id
+	where t.uid=#{uid,jdbcType=VARCHAR}
 	 </select>
 	 </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,u.introduction,u.head_portrait_url as headPortraitUrl
+	from user_identity t left JOIN user u
+	on t.uid = u.id
+	where 1=1
+    <if test="industry != null">
+        and t.industry = #{industry,jdbcType=VARCHAR}
+    </if>
+    <if test="page_sql!=null">
+        ${page_sql}
+    </if>
+  </select>
+  
+  <select id="findUserIdentityCount" parameterType="String" resultType="java.lang.Integer">
+  	select count(0) 
+   from user u left JOIN user_identity t
+	on t.uid = u.id
+	where 1=1
+    <if test="industry != null">
+        and t.industry = #{industry,jdbcType=VARCHAR}
+    </if>
+  </select>
+  
+  <select id="countInterest"  resultType="java.lang.Integer">
+  select count(0)
+  	from user_interest 
+  	where to_uid=#{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>
 </mapper>

+ 8 - 0
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1410,4 +1410,12 @@
 			and type = #{type,jdbcType=INTEGER}
 			and type = #{type,jdbcType=INTEGER}
 		</if>
 		</if>
 	</select>
 	</select>
+	<select id="userInterest" resultType="com.goafanti.user.bo.UserInterestBo">
+		select
+		uid.uid as id,uid.username as name,uc.work_unit as workUnit,uc.position ,ui.create_time as createTime
+		from user_interest ui
+		LEFT  join user_identity uid on ui.to_uid=uid.uid
+		LEFT  join user_career uc on ui.to_uid=uc.uid
+		where from_uid=#{uid,jdbcType=VARCHAR}
+	</select>
 </mapper>
 </mapper>

+ 19 - 0
src/main/java/com/goafanti/common/model/Demand.java

@@ -204,6 +204,9 @@ public class Demand {
      * 备注
      * 备注
      */
      */
     private String remark;
     private String remark;
+    
+    private Integer  urgentDays;
+	private Integer urgentMoney;
 
 
     public String getRemark() {
     public String getRemark() {
 		return remark;
 		return remark;
@@ -560,4 +563,20 @@ public class Demand {
 	public void setTextFileUrlDownloadFileName(String textFileDownloadFileName) {
 	public void setTextFileUrlDownloadFileName(String textFileDownloadFileName) {
 
 
 	}
 	}
+
+	public Integer getUrgentDays() {
+		return urgentDays;
+	}
+
+	public void setUrgentDays(Integer urgentDays) {
+		this.urgentDays = urgentDays;
+	}
+
+	public Integer getUrgentMoney() {
+		return urgentMoney;
+	}
+
+	public void setUrgentMoney(Integer urgentMoney) {
+		this.urgentMoney = urgentMoney;
+	}
 }
 }

+ 97 - 6
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -51,9 +51,42 @@ public class DemandListBo {
 	
 	
 	private Integer		industryCategoryA;
 	private Integer		industryCategoryA;
 
 
-	private String		industryCategoryAS;
+	private Integer		industryCategoryB;
+	
+	private Integer		industryCategoryC;
+	
+	private String      problemDes;
 
 
 	private String		pictureUrl;
 	private String		pictureUrl;
+	private String		IndustryCategory1;
+	
+	private String		IndustryCategory2;
+	
+	public String getIndustryCategory1() {
+		return IndustryCategory1;
+	}
+
+	public void setIndustryCategory1(String industryCategory1) {
+		IndustryCategory1 = industryCategory1;
+	}
+
+	public String getIndustryCategory2() {
+		return IndustryCategory2;
+	}
+
+	public void setIndustryCategory2(String industryCategory2) {
+		IndustryCategory2 = industryCategory2;
+	}
+
+	public String getIndustryCategory3() {
+		return IndustryCategory3;
+	}
+
+	public void setIndustryCategory3(String industryCategory3) {
+		IndustryCategory3 = industryCategory3;
+	}
+
+	private String		IndustryCategory3;
 	
 	
 	/**
 	/**
 	 * 是否发布(0-未发布,1-发布)
 	 * 是否发布(0-未发布,1-发布)
@@ -61,12 +94,22 @@ public class DemandListBo {
 	private Integer	releaseStatus;
 	private Integer	releaseStatus;
 
 
 	private String	employerId;
 	private String	employerId;
+	
+	private String  employerAddress;
 
 
 	/**
 	/**
 	 * 审核状态
 	 * 审核状态
 	 */
 	 */
 	private Integer	auditStatus;
 	private Integer	auditStatus;
-
+	/**
+	 * 关注数量
+	 */
+	private String countInterest;
+	/**
+	 *  
+	 */
+	private Integer  urgentDays;
+	private Integer urgentMoney;
 	@JsonFormat(shape = Shape.STRING)
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 	public Integer getAuditStatus() {
 		return auditStatus;
 		return auditStatus;
@@ -207,12 +250,12 @@ public class DemandListBo {
 		this.industryCategoryA = industryCategoryA;
 		this.industryCategoryA = industryCategoryA;
 	}
 	}
 
 
-	public String getIndustryCategoryAS() {
-		return industryCategoryAS;
+	public Integer getIndustryCategoryB() {
+		return industryCategoryB;
 	}
 	}
 
 
-	public void setIndustryCategoryAS(String industryCategoryAS) {
-		this.industryCategoryAS = industryCategoryAS;
+	public void setIndustryCategoryB(Integer industryCategoryB) {
+		this.industryCategoryB = industryCategoryB;
 	}
 	}
 
 
 	public String getPictureUrl() {
 	public String getPictureUrl() {
@@ -231,6 +274,54 @@ public class DemandListBo {
 		this.demandTypeS = demandTypeS;
 		this.demandTypeS = demandTypeS;
 	}
 	}
 
 
+	public String getCountInterest() {
+		return countInterest;
+	}
+
+	public void setCountInterest(String countInterest) {
+		this.countInterest = countInterest;
+	}
+
+	public Integer getUrgentDays() {
+		return urgentDays;
+	}
+
+	public void setUrgentDays(Integer urgentDays) {
+		this.urgentDays = urgentDays;
+	}
+
+	public Integer getUrgentMoney() {
+		return urgentMoney;
+	}
+
+	public void setUrgentMoney(Integer urgentMoney) {
+		this.urgentMoney = urgentMoney;
+	}
+
+	public String getEmployerAddress() {
+		return employerAddress;
+	}
+
+	public void setEmployerAddress(String employerAddress) {
+		this.employerAddress = employerAddress;
+	}
+
+	public String getProblemDes() {
+		return problemDes;
+	}
+
+	public void setProblemDes(String problemDes) {
+		this.problemDes = problemDes;
+	}
+
+	public Integer getIndustryCategoryC() {
+		return industryCategoryC;
+	}
+
+	public void setIndustryCategoryC(Integer industryCategoryC) {
+		this.industryCategoryC = industryCategoryC;
+	}
+
 	
 	
 	
 	
 	
 	

+ 7 - 1
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -74,7 +74,7 @@ public interface DemandService {
 
 
 	int updateByPrimaryKeySelective(Demand d);
 	int updateByPrimaryKeySelective(Demand d);
 
 
-	Demand selectDemandDetail(String id);
+	DemandListBo selectDemandDetail(String id);
 
 
 	/** 精品需求 **/
 	/** 精品需求 **/
 	Pagination<BoutiqueListBo> boutiqueSearchList(Integer industryCategoryA,Integer pNo, Integer pSize);
 	Pagination<BoutiqueListBo> boutiqueSearchList(Integer industryCategoryA,Integer pNo, Integer pSize);
@@ -84,4 +84,10 @@ public interface DemandService {
 	
 	
 	/**猜你喜欢**/
 	/**猜你喜欢**/
 	List<DemandListBo> selectCsutomerLike();
 	List<DemandListBo> selectCsutomerLike();
+
+	Pagination<DemandSearchListBo> listAppDemand(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,
+			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
+			String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);
+
+	List<?> selectinterest(String uid,Integer type);
 }
 }

+ 103 - 2
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -16,12 +17,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import com.goafanti.achievement.bo.AchievementDemandListBo;
 import com.goafanti.achievement.bo.AchievementDemandListBo;
+import com.goafanti.achievement.bo.AchievementInterestBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AchievementDemandCountMapper;
 import com.goafanti.common.dao.AchievementDemandCountMapper;
 import com.goafanti.common.dao.AchievementDemandMapper;
 import com.goafanti.common.dao.AchievementDemandMapper;
 import com.goafanti.common.dao.AchievementKeywordMapper;
 import com.goafanti.common.dao.AchievementKeywordMapper;
+import com.goafanti.common.dao.AchievementMapper;
 import com.goafanti.common.dao.DemandKeywordMapper;
 import com.goafanti.common.dao.DemandKeywordMapper;
 import com.goafanti.common.dao.DemandMapper;
 import com.goafanti.common.dao.DemandMapper;
+import com.goafanti.common.dao.FieldGlossoryMapper;
+import com.goafanti.common.dao.IndustryCategoryMapper;
+import com.goafanti.common.dao.NewsMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
@@ -34,6 +40,7 @@ import com.goafanti.common.enums.DemandPortalSearchSignType;
 import com.goafanti.common.enums.DemandReleaseStatus;
 import com.goafanti.common.enums.DemandReleaseStatus;
 import com.goafanti.common.enums.DemandStatus;
 import com.goafanti.common.enums.DemandStatus;
 import com.goafanti.common.enums.DemandSwitchSign;
 import com.goafanti.common.enums.DemandSwitchSign;
+import com.goafanti.common.enums.InterestType;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeReadStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.enums.UserType;
@@ -50,16 +57,19 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandImportBo;
 import com.goafanti.demand.bo.DemandImportBo;
+import com.goafanti.demand.bo.DemandInterestBo;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandManageDetailBo;
 import com.goafanti.demand.bo.DemandManageDetailBo;
 import com.goafanti.demand.bo.DemandManageListBo;
 import com.goafanti.demand.bo.DemandManageListBo;
 import com.goafanti.demand.bo.DemandPartnerListBo;
 import com.goafanti.demand.bo.DemandPartnerListBo;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.demand.service.DemandService;
+import com.goafanti.news.bo.newsInterestBo;
 import com.goafanti.portal.bo.BoutiqueListBo;
 import com.goafanti.portal.bo.BoutiqueListBo;
 import com.goafanti.portal.bo.DemandPortalDetailBo;
 import com.goafanti.portal.bo.DemandPortalDetailBo;
 import com.goafanti.portal.bo.DemandPortalSimilarListBo;
 import com.goafanti.portal.bo.DemandPortalSimilarListBo;
 import com.goafanti.portal.bo.DemandSearchDetailBo;
 import com.goafanti.portal.bo.DemandSearchDetailBo;
 import com.goafanti.portal.bo.DemandSearchListBo;
 import com.goafanti.portal.bo.DemandSearchListBo;
+import com.goafanti.user.bo.UserInterestBo;
 
 
 @Service
 @Service
 public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements DemandService {
 public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements DemandService {
@@ -68,6 +78,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Autowired
 	@Autowired
 	private UserMapper						userMapper;
 	private UserMapper						userMapper;
 	@Autowired
 	@Autowired
+	private NewsMapper 						newsMapper;
+	@Autowired
 	private UserRoleMapper					userRoleMapper;
 	private UserRoleMapper					userRoleMapper;
 	@Autowired
 	@Autowired
 	private NoticeMapper					noticeMapper;
 	private NoticeMapper					noticeMapper;
@@ -83,6 +95,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	private UserIdentityMapper				userIdentityMapper;
 	private UserIdentityMapper				userIdentityMapper;
 	@Autowired
 	@Autowired
 	private OrganizationIdentityMapper		organizationIdentityMapper;
 	private OrganizationIdentityMapper		organizationIdentityMapper;
+	@Autowired
+	AchievementMapper					 	achievementMapper;
+	@Autowired
+	FieldGlossoryMapper 					fieldGlossoryMapper;
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
@@ -736,8 +752,20 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	}
 	}
 
 
 	@Override
 	@Override
-	public Demand selectDemandDetail(String id) {
-		return demandMapper.selectByPrimaryKey(id);
+	public DemandListBo selectDemandDetail(String id) {
+		Demand d1=demandMapper.selectByPrimaryKey(id);
+		DemandListBo d=new DemandListBo();
+		BeanUtils.copyProperties(d1, d);
+		if (null!=d.getIndustryCategoryA()) {
+			d.setIndustryCategory1(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryA()).getName());
+		}
+		if (null!=d.getIndustryCategoryB()) {
+			d.setIndustryCategory2(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
+		}
+		if (null!=d.getIndustryCategoryC()) {
+			d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
+		}
+		return d;
 	}
 	}
 
 
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
@@ -759,4 +787,77 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.selectCsutomerLike(TokenManager.getUserId());
 		return demandMapper.selectCsutomerLike(TokenManager.getUserId());
 	}
 	}
 
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<DemandSearchListBo> listAppDemand(Integer auditStatus, Integer serialNumber, String name,
+			String keyword, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
+			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
+			Integer pSize) {
+		Map<String, Object> params = disposeParams(auditStatus, null, serialNumber, name, keyword, null, demandType,
+				validityPeriodStartDate, validityPeriodEndDate, null, status, releaseStatus, releaseDateStartDate,
+				releaseDateEndDate, null, null);
+
+		params.put("employerId", TokenManager.getUserId());
+
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0) {
+			pSize = 10;
+			
+		}
+		Pagination<DemandSearchListBo> p=(Pagination<DemandSearchListBo>) findPage("findAppDemandListByPage", "findAppDemandCount", params, pNo, pSize);
+			List<DemandListBo> list=(List<DemandListBo>) p.getList();
+			for (DemandListBo d : list) {
+				if (null!=d.getIndustryCategoryA()) {
+					d.setIndustryCategory1(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryA()).getName());
+				}
+				if (null!=d.getIndustryCategoryB()) {
+					d.setIndustryCategory2(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
+				}
+				if (null!=d.getIndustryCategoryC()) {
+					d.setIndustryCategory3(String.valueOf(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryB()).getName()));
+				}
+				int i=demandMapper.countInterest(d.getId());
+				d.setCountInterest(String.valueOf(i));
+			}
+		return p;
+	}
+
+	@Override
+	public List<Object> selectinterest(String uid,Integer type) {
+		List<Object> list=new ArrayList<>();
+		if (null==type||type==InterestType.POLICY.getCode()) {
+			List<newsInterestBo>nm=newsMapper.newsInterest(uid);
+			for (newsInterestBo n : nm) {
+				n.setType(InterestType.POLICY.getCode());
+				list.add(n);
+			}
+		}
+		if (null==type||type==InterestType.EXPERTS.getCode()) {
+			List<UserInterestBo>um=userMapper.userInterest(uid);
+			for (UserInterestBo u : um) {
+				u.setType(InterestType.EXPERTS.getCode());
+				list.add(u);
+			}
+		}
+		if (null==type||type==InterestType.DEMAND.getCode()) {
+			List<DemandInterestBo> dm=demandMapper.demandInterest(uid);
+			for (DemandInterestBo d : dm) {
+				d.setType(InterestType.DEMAND.getCode());
+				list.add(d);
+			}
+		}
+		if (null==type||type==InterestType.ACHIEVEMENT.getCode()) {
+			List<AchievementInterestBo> am=achievementMapper.achievementInterest(uid);
+			for (AchievementInterestBo a : am) {
+				a.setType(InterestType.ACHIEVEMENT.getCode());
+				list.add(a);
+			}
+		}
+		return list; 
+	}
+		
+	
 }
 }

+ 7 - 0
src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java

@@ -14,6 +14,7 @@ public class BoutiqueListBo {
 	private String pictureUrl;
 	private String pictureUrl;
 	private String technicalpictureurl;
 	private String technicalpictureurl;
 	private Integer boutiqueFlag;
 	private Integer boutiqueFlag;
+	private String employerAddress;
 	/** 拥有者类别 0 - 个人, 1 - 组织 **/
 	/** 拥有者类别 0 - 个人, 1 - 组织 **/
 	private Integer ownerType;
 	private Integer ownerType;
 	
 	
@@ -83,5 +84,11 @@ public class BoutiqueListBo {
 	public void setBoutiqueFlag(Integer boutiqueFlag) {
 	public void setBoutiqueFlag(Integer boutiqueFlag) {
 		this.boutiqueFlag = boutiqueFlag;
 		this.boutiqueFlag = boutiqueFlag;
 	}
 	}
+	public String getEmployerAddress() {
+		return employerAddress;
+	}
+	public void setEmployerAddress(String employerAddress) {
+		this.employerAddress = employerAddress;
+	}
 
 
 }
 }

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

@@ -81,6 +81,10 @@ public class DemandSearchListBo {
 	 */
 	 */
 	private Integer 	boutique;
 	private Integer 	boutique;
 	
 	
+	private Integer  urgentDays;
+	
+	private Integer urgentMoney;
+	
 	public String getEmployerName() {
 	public String getEmployerName() {
 		return employerName;
 		return employerName;
 	}
 	}
@@ -217,5 +221,21 @@ public class DemandSearchListBo {
 		this.boutique = boutique;
 		this.boutique = boutique;
 	}
 	}
 
 
+	public Integer getUrgentDays() {
+		return urgentDays;
+	}
+
+	public void setUrgentDays(Integer urgentDays) {
+		this.urgentDays = urgentDays;
+	}
+
+	public Integer getUrgentMoney() {
+		return urgentMoney;
+	}
+
+	public void setUrgentMoney(Integer urgentMoney) {
+		this.urgentMoney = urgentMoney;
+	}
+
 	
 	
 }
 }

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

@@ -22,6 +22,71 @@ public class UserSubscriberListBo {
 	private String	position;
 	private String	position;
 	/**国际化*/
 	/**国际化*/
 	private String	international;
 	private String	international;
+	
+	private String  professionalTitle;
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
+
+	public String getHeadPortraitUrl() {
+		return headPortraitUrl;
+	}
+
+	public void setHeadPortraitUrl(String headPortraitUrl) {
+		this.headPortraitUrl = headPortraitUrl;
+	}
+
+	public String getProvince0() {
+		return province0;
+	}
+
+	public void setProvince0(String province0) {
+		this.province0 = province0;
+	}
+
+	public String getCity0() {
+		return city0;
+	}
+
+	public void setCity0(String city0) {
+		this.city0 = city0;
+	}
+
+	public String getArea0() {
+		return area0;
+	}
+
+	public void setArea0(String area0) {
+		this.area0 = area0;
+	}
+
+	public String getIndustry0() {
+		return industry0;
+	}
+
+	public void setIndustry0(String industry0) {
+		this.industry0 = industry0;
+	}
+
+	public String getCountInterest() {
+		return countInterest;
+	}
+
+	public void setCountInterest(String countInterest) {
+		this.countInterest = countInterest;
+	}
+
+	private String introduction;
+	private String headPortraitUrl;
+	private String province0;
+	private String city0;
+	private String area0;
+	private String industry0;
+	private String countInterest;
 
 
 	public String getInternational() {
 	public String getInternational() {
 		return international;
 		return international;
@@ -111,4 +176,12 @@ public class UserSubscriberListBo {
 		this.province = province;
 		this.province = province;
 	}
 	}
 
 
+	public String getProfessionalTitle() {
+		return professionalTitle;
+	}
+
+	public void setProfessionalTitle(String professionalTitle) {
+		this.professionalTitle = professionalTitle;
+	}
+
 }
 }

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

@@ -5,6 +5,73 @@ import com.goafanti.common.model.UserIdentity;
 public class UserIdentityBo extends UserIdentity {
 public class UserIdentityBo extends UserIdentity {
 	private Long	number;
 	private Long	number;
 	private String	mobile;
 	private String	mobile;
+	private String  workUnit;
+	private String  professionalTitle;
+	private String introduction;
+	private String headPortraitUrl;
+	private String province0;
+	private String city0;
+	private String area0;
+	private String industry0;
+	private String countInterest;
+	public String getProvince0() {
+		return province0;
+	}
+
+	public void setProvince0(String province0) {
+		this.province0 = province0;
+	}
+
+	public String getCity0() {
+		return city0;
+	}
+
+	public void setCity0(String city0) {
+		this.city0 = city0;
+	}
+
+	public String getArea0() {
+		return area0;
+	}
+
+	public void setArea0(String area0) {
+		this.area0 = area0;
+	}
+
+	public String getIndustry0() {
+		return industry0;
+	}
+
+	public void setIndustry0(String industry0) {
+		this.industry0 = industry0;
+	}
+
+	public String getWorkUnit() {
+		return workUnit;
+	}
+
+	public void setWorkUnit(String workUnit) {
+		this.workUnit = workUnit;
+	}
+
+	public String getProfessionalTitle() {
+		return professionalTitle;
+	}
+
+	public void setProfessionalTitle(String professionalTitle) {
+		this.professionalTitle = professionalTitle;
+	}
+
+	
+
+	
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
 
 
 	public Long getNumber() {
 	public Long getNumber() {
 		return number;
 		return number;
@@ -22,4 +89,29 @@ public class UserIdentityBo extends UserIdentity {
 		this.mobile = mobile;
 		this.mobile = mobile;
 	}
 	}
 
 
+	public String getHeadPortraitUrl() {
+		return headPortraitUrl;
+	}
+
+	public void setHeadPortraitUrl(String headPortraitUrl) {
+		this.headPortraitUrl = headPortraitUrl;
+	}
+
+	public String getCountInterest() {
+		return countInterest;
+	}
+
+	public void setCountInterest(String countInterest) {
+		this.countInterest = countInterest;
+	}
+
+	@Override
+	public String toString() {
+		return "UserIdentityBo [number=" + number + ", mobile=" + mobile + ", workUnit=" + workUnit
+				+ ", professionalTitle=" + professionalTitle + ", introduction=" + introduction + ", headPortraitUrl="
+				+ headPortraitUrl + ", province0=" + province0 + ", city0=" + city0 + ", area0=" + area0
+				+ ", industry0=" + industry0 + ", countInterest=" + countInterest + "]";
+	}
+	
+
 }
 }

+ 6 - 0
src/main/java/com/goafanti/user/service/UserCareerService.java

@@ -1,6 +1,8 @@
 package com.goafanti.user.service;
 package com.goafanti.user.service;
 
 
 import com.goafanti.common.model.UserCareer;
 import com.goafanti.common.model.UserCareer;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.user.bo.UserCareerBo;
 
 
 public interface UserCareerService {
 public interface UserCareerService {
 
 
@@ -10,4 +12,8 @@ public interface UserCareerService {
 
 
 	int updateByPrimaryKeySelective(UserCareer userCareer);
 	int updateByPrimaryKeySelective(UserCareer userCareer);
 
 
+	
+
+	
+
 }
 }

+ 4 - 0
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -37,4 +37,8 @@ public interface UserIdentityService {
 			Integer area,Integer international, Integer pNo, Integer pSize);
 			Integer area,Integer international, Integer pNo, Integer pSize);
 
 
 	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);
 	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);
+	
+	UserIdentityBo expertsDetail(String id);
+
+	Pagination<UserIdentityBo> expertsList(String industry, Integer pNo, Integer pSize);
 }
 }

+ 6 - 0
src/main/java/com/goafanti/user/service/UserInterestService.java

@@ -3,6 +3,9 @@ package com.goafanti.user.service;
 import com.goafanti.common.model.UserInterest;
 import com.goafanti.common.model.UserInterest;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.InterestUserListBo;
 import com.goafanti.user.bo.InterestUserListBo;
+import com.goafanti.user.bo.UserCareerBo;
+import com.goafanti.user.bo.UserIdentityBo;
+
 
 
 public interface UserInterestService {
 public interface UserInterestService {
 
 
@@ -17,5 +20,8 @@ public interface UserInterestService {
 	Pagination<InterestUserListBo> listInterestUser(Integer pNo, Integer pSize, Integer userType);
 	Pagination<InterestUserListBo> listInterestUser(Integer pNo, Integer pSize, Integer userType);
 
 
 	Integer countByToUid(String uid);
 	Integer countByToUid(String uid);
+	
+	Pagination<UserIdentityBo> expertsList(String industry, Integer pNo, Integer pSize);
+	
 
 
 }
 }

+ 15 - 2
src/main/java/com/goafanti/user/service/impl/UserCareerServiceImpl.java

@@ -1,13 +1,21 @@
 package com.goafanti.user.service.impl;
 package com.goafanti.user.service.impl;
 
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-
 import com.goafanti.common.dao.UserCareerMapper;
 import com.goafanti.common.dao.UserCareerMapper;
 import com.goafanti.common.model.UserCareer;
 import com.goafanti.common.model.UserCareer;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.demand.bo.DemandListBo;
+import com.goafanti.user.bo.UserCareerBo;
 import com.goafanti.user.service.UserCareerService;
 import com.goafanti.user.service.UserCareerService;
 @Service
 @Service
-public class UserCareerServiceImpl implements UserCareerService{
+public class UserCareerServiceImpl extends BaseMybatisDao<UserCareerMapper> implements UserCareerService{
     @Autowired
     @Autowired
     UserCareerMapper userCareerMapper;
     UserCareerMapper userCareerMapper;
     
     
@@ -27,4 +35,9 @@ public class UserCareerServiceImpl implements UserCareerService{
 		return userCareerMapper.updateByPrimaryKeySelective(userCareer);
 		return userCareerMapper.updateByPrimaryKeySelective(userCareer);
 	}
 	}
 
 
+	
+
+	
+
+	
 }
 }

+ 65 - 0
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -17,8 +17,11 @@ import org.springframework.stereotype.Service;
 
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.DistrictGlossoryMapper;
+import com.goafanti.common.dao.IndustryCategoryMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
+import com.goafanti.common.dao.UserInterestMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.enums.CertifySubmitType;
 import com.goafanti.common.enums.CertifySubmitType;
@@ -49,6 +52,12 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	private UserRoleMapper		userRoleMapper;
 	private UserRoleMapper		userRoleMapper;
 	@Autowired
 	@Autowired
 	private NoticeMapper		noticeMapper;
 	private NoticeMapper		noticeMapper;
+	@Autowired
+	DistrictGlossoryMapper districtGlossoryMapper;
+	@Autowired
+	IndustryCategoryMapper industryCategoryMapper;
+	@Autowired
+	UserInterestMapper	userInterestMapper;
 
 
 	private static final Logger	logger	= LoggerFactory.getLogger(UserIdentityServiceImpl.class);
 	private static final Logger	logger	= LoggerFactory.getLogger(UserIdentityServiceImpl.class);
 
 
@@ -290,4 +299,60 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		LoggerUtils.debug(logger, "清除国际专家列表");
 		LoggerUtils.debug(logger, "清除国际专家列表");
 	}
 	}
 
 
+	@Override
+	public UserIdentityBo expertsDetail(String uid) {
+		UserIdentityBo u=userIdentityMapper.selectUserIdentityByUid(uid);
+		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 (null!=u.getUid()) {
+			u.setCountInterest(String.valueOf(userInterestMapper.countByToUid(u.getUid())));
+		}
+		return u;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<UserIdentityBo> expertsList(String industry, Integer pNo, Integer pSize) {
+		Map<String, Object> params = new HashMap<>();
+		if (StringUtils.isNotBlank(industry)) {
+			params.put("industry", industry);
+		}
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 12) {
+			pSize = 10;
+		}
+		Pagination<UserIdentityBo> p=(Pagination<UserIdentityBo>) findPage("findUserIdentityListByPage",
+				"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()));
+			}
+		}
+		
+		return p;
+	}
+
 }
 }

+ 32 - 0
src/main/java/com/goafanti/user/service/impl/UserInterestServiceImpl.java

@@ -2,9 +2,11 @@ package com.goafanti.user.service.impl;
 
 
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.UUID;
 import java.util.UUID;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -14,6 +16,8 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.bo.InterestUserListBo;
 import com.goafanti.user.bo.InterestUserListBo;
+import com.goafanti.user.bo.UserCareerBo;
+import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.service.UserInterestService;
 import com.goafanti.user.service.UserInterestService;
 
 
 @Service
 @Service
@@ -74,4 +78,32 @@ public class UserInterestServiceImpl extends BaseMybatisDao<UserInterestMapper>
 	public Integer countByToUid(String toUid) {
 	public Integer countByToUid(String toUid) {
 		return userInterestMapper.countByToUid(toUid);
 		return userInterestMapper.countByToUid(toUid);
 	}
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<UserIdentityBo> expertsList(String industry, Integer pNo, Integer pSize) {
+		System.out.println(industry);
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		Map<String, Object> params =new HashMap<String, Object>();
+		if (StringUtils.isNotBlank( industry)) {
+			params.put("industry",industry); 
+		}
+		Pagination<UserIdentityBo> p=(Pagination<UserIdentityBo>) findPage("findUserCareerListByPage",
+				"findUserCareerCount",params,
+				pNo, pSize);
+		List<UserIdentityBo> list=(List<UserIdentityBo>) p.getList();
+		for (UserIdentityBo d : list) {
+			int i=userInterestMapper.countByToUid(d.getUid());
+			d.setCountInterest(String.valueOf(i));
+		}
+		return p;
+	}
+
+	
 }
 }