Browse Source

Merge remote-tracking branch 'origin/patch' into test

Michael 8 years ago
parent
commit
f700d11308

+ 25 - 25
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -808,33 +808,33 @@ public class PortalController extends BaseController {
 		;
 
 		// 判断登录没登录. 登录了.查找用户喜欢的. 没登录就随机查四个.
-		boolean isLogin = TokenManager.isLogin();
-		List<DemandListBo> demandlist = demandService.selectDemandList(0);// 查询所有专利
-		List<DemandListBo> redemandlist = new ArrayList<DemandListBo>();
-
-		if (demandlist.size() >= 5) {
-			int idx = new Random().nextInt(demandlist.size() - 4);
-			redemandlist.add(demandlist.get(idx));
-			redemandlist.add(demandlist.get(idx + 1));
-			redemandlist.add(demandlist.get(idx + 2));
-			redemandlist.add(demandlist.get(idx + 3));
-		} else {
-			redemandlist.addAll(demandlist);
-		}
+				boolean isLogin = TokenManager.isLogin();
+				List<DemandListBo> demandlist = demandService.selectDemandList(0);// 查询所有专利
+				List<DemandListBo> redemandlist = new ArrayList<DemandListBo>();
+
+				if (demandlist.size() >= 5) {
+					int idx = new Random().nextInt(demandlist.size() - 4);
+					redemandlist.add(demandlist.get(idx));
+					redemandlist.add(demandlist.get(idx + 1));
+					redemandlist.add(demandlist.get(idx + 2));
+					redemandlist.add(demandlist.get(idx + 3));
+				} else {
+					redemandlist.addAll(demandlist);
+				}
 
-		if (isLogin) {
-			List<DemandListBo> customerlikelist = demandService.selectCsutomerLike();// 猜你喜欢专利
-			int size;
-			if (customerlikelist.size() < redemandlist.size()) {
-				size = customerlikelist.size();
-			} else {
-				size = redemandlist.size();
-			}
+				if (isLogin) {
+					List<DemandListBo> customerlikelist = demandService.selectCsutomerLike();// 猜你喜欢专利
+					int size;
+					if (customerlikelist.size() < redemandlist.size()) {
+						size = customerlikelist.size();
+					} else {
+						size = redemandlist.size();
+					}
 
-			for (int i = 0; i < size; i++) {
-				redemandlist.set(i, customerlikelist.get(i));
-			}
-		}
+					for (int i = 0; i < size; i++) {
+						redemandlist.set(i, customerlikelist.get(i));
+					}
+				}
 
 		for (int i = 0; i < redemandlist.size(); i++) {
 			Integer demandType = redemandlist.get(i).getDemandType();

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

@@ -1166,7 +1166,7 @@
   		a.field_b as fieldB,
   		a.transfer_price as transferPrice,
   		a.maturity,
-  		a.introduction,
+  		a.introduction,a.boutique,
   		a.transfer_mode as transferMode,
   		a.technical_picture_url as technicalPictureUrl,
   		b.name as fieldAs

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

@@ -863,14 +863,14 @@
   		d.picture_url as pictureUrl, d.text_file_url as textFileUrl, d.video_url as videoUrl,
   		d.budget_cost as budgetCost, d.fixed_cycle as fixedCycle, d.people_number as peopleNumber,
   		d.fixed_scheme as fixedScheme, d.cost_escrow as costEscrow, d.employer_id as employerId,
-  		info.postal_address as address, u.email as mailbox,  u.mobile as mobile, d.audit_status as auditStatus,
+  		u.postal_address as address, u.email as mailbox,  u.mobile as mobile, d.audit_status as auditStatus,
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
   		d.tech_broker_id as techBrokerId,  u.mobile as contactsName,
   		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg
   	from demand d 
   	left join user_identity ui on ui.uid = d.employer_id
-  	left join user_info info on info.uid = d.employer_id
+  	<!-- left join user_info info on info.uid = d.employer_id -->
   	left join user u on u.id = d.employer_id
   	left join marketing_management mm on d.id = mm.product_id
   	where d.data_category = 0 and d.id = #{id,jdbcType=VARCHAR}
@@ -1026,7 +1026,7 @@
 	  		d.id, d.name, d.keyword,d.data_category as dataCategory,d.picture_url as pictureUrl,
 	  		d.serial_number as serialNumber, d.data_category as dataCategory, d.industry_category_a as industryCategoryA,
 	  		d.industry_category_b as industryCategoryB, d.demand_type as demandType, d.budget_cost as budgetCost,
-	  		d.problem_des as problemDes, d.release_date as releaseDate, d.employer_name as employerName,
+	  		d.problem_des as problemDes, d.release_date as releaseDate, d.employer_name as employerName,d.boutique,
 	  	 u.lvl as level
   		from demand d
   		left join user u on u.id = d.employer_id
@@ -1392,7 +1392,7 @@
 		LEFT JOIN field_glossory fgg on fgg.id = d.industry_category_b 
 		LEFT JOIN demand_interest interest on interest.demand_id = d.id 
 		where
-		interest.uid = #{_parameter,jdbcType=INTEGER}
+		interest.uid = #{uid,jdbcType=INTEGER}
 		limit 0,4
 	</select>
 	

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

@@ -118,13 +118,13 @@
   		uc.professional_title as professionalTitle,
   		uc.work_unit as workUnit,
   		adc.achievement_count as achievementNum,
-  		info.person_portrait_url as personPortraitUrl
+  		u.head_portrait_url as personPortraitUrl
   	from star s
   	left join user u on u.id = s.uid
   	left join user_identity ui on ui.uid = s.uid
   	left join user_career uc on uc.uid = s.uid
   	left join achievement_demand_count adc on adc.uid = s.uid 
-  	left join user_info info on info.uid = s.uid
+  	<!-- left join user_info info on info.uid = s.uid -->
   	left join user_interest interest on interest.to_uid = s.uid and interest.from_uid = #{uid,jdbcType=VARCHAR}
   	where s.star = 1 and ui.celebrity = 1
   	order by adc.achievement_count desc
@@ -154,7 +154,7 @@
   		uc.professional_title as professionalTitle,
   		uc.work_unit as workUnit,
   		adc.achievement_count as achievementNum,
-  		info.person_portrait_url as personPortraitUrl,
+  		u.head_portrait_url as personPortraitUrl,
   		interest.id as interestId
   	from star s
   	left join user u on u.id = s.uid

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

@@ -903,7 +903,7 @@
 			adc.demand_count as demandNum,
 			uc.engaged_field as engagedField,
 			uc.work_unit as workUnit,
-			uc.position,
+			ui.professional_titleas position,
 			ui.international
 		FROM
 			<![CDATA[ user ]]> u

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

@@ -99,7 +99,7 @@
 			ui.create_time AS createTime,
 			uii.province AS userProvince,
 			oi.licence_province AS orgProvince,
-			uinfo.person_portrait_url AS personPortraitUrl,
+			u.head_portrait_url AS personPortraitUrl,
 			oinfo.logo_url AS logoUrl,
 			adc.achievement_count AS achievementNum,
 			adc.demand_count AS demandNum
@@ -108,7 +108,7 @@
 	LEFT JOIN user_identity uii ON uii.uid = ui.to_uid
 	LEFT JOIN organization_identity oi ON oi.uid = ui.to_uid
 	LEFT JOIN `user` u ON u.id = ui.to_uid
-	LEFT JOIN user_info uinfo ON uinfo.uid = ui.to_uid
+	<!-- LEFT JOIN user_info uinfo ON uinfo.uid = ui.to_uid -->
 	LEFT JOIN organization_info oinfo ON oinfo.uid = ui.to_uid
 	LEFT JOIN achievement_demand_count adc ON adc.uid = ui.to_uid
 	WHERE

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

@@ -1203,13 +1203,13 @@
   
  	<select id="findUserPartnerDetail" parameterType="java.lang.String" resultType="com.goafanti.user.bo.UserPartnerDetailBo">
 		select
-		u.id,i.username,c.work_unit as work_unit,c.position,c.achievement,
+		u.id,i.username,i.work_unit as workUnit,i.professional_title as position,c.achievement,
 		u.head_portrait_url as personPortraitUrl,
 		i.province,
 		u.introduction as personalProfile,
-		ua.ability_label as abilityLabel,c.qualification,
-		e.graduate_school,e.major_category,c.work_unit as workUnit,
-		c.engaged_field as engagedField
+		ua.ability_label as abilityLabel,i.qualification,
+		e.graduate_school,i.major_category,i.work_unit as workUnit,
+		i.industry as engagedField
 		from `user` u
 		left join user_identity i on u.id=i.uid
 		left join

+ 10 - 0
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -107,6 +107,8 @@ public class AchievementSearchListBo {
 	
 	/** 是否国际*/
 	private Integer internationalFlag;
+	/** 是否精品*/
+	private Integer boutique;
 	
 	public Integer getLevel() {
 		return level;
@@ -296,5 +298,13 @@ public class AchievementSearchListBo {
 	public void setInternationalFlag(Integer internationalFlag) {
 		this.internationalFlag = internationalFlag;
 	}
+
+	public Integer getBoutique() {
+		return boutique;
+	}
+
+	public void setBoutique(Integer boutique) {
+		this.boutique = boutique;
+	}
 	
 }

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

@@ -76,6 +76,10 @@ public class DemandSearchListBo {
 	 * 用户等级
 	 */
 	private String		pictureUrl;
+	/**
+	 * 是否精品
+	 */
+	private Integer 	boutique;
 	
 	public String getEmployerName() {
 		return employerName;
@@ -205,5 +209,13 @@ public class DemandSearchListBo {
 		this.pictureUrl = pictureUrl;
 	}
 
+	public Integer getBoutique() {
+		return boutique;
+	}
+
+	public void setBoutique(Integer boutique) {
+		this.boutique = boutique;
+	}
+
 	
 }

+ 3 - 3
src/main/webapp/WEB-INF/views/portal/financial/index.html

@@ -125,21 +125,21 @@
 		<div id="info">
 			<div class="info">
 				<div>
-					<img th:src="${avatarUploadHost + '/default/inverDatails.jpg'}" alt="" />
+					<img th:src="${avatarUploadHost + '/default/inverDatails1.jpg'}" alt="" />
 					<h3>高新创投</h3>
 					<p>湖南高新创业投资集团有限公司(简称:高新创投)成立于2007年9月,系省委、省政府批准设立的全省唯一的省级国有创投机构,
 					是为创新财政投入方式、推进战略新兴产业和高新技术产业发展而打造的政府性投融资平台。</p>
 					<div><a th:href="${basePath + '/portal/financial/investmentDetail.html?organizationId=bc1c9b64-a285-47ca-b783-db7dfdde4b93'}">MORE+</a></div>
 				</div>
 				<div>
-					<img th:src="${avatarUploadHost + '/default/inverDatails.jpg'}" alt="" />
+					<img th:src="${avatarUploadHost + '/default/inverDatails2.jpg'}" alt="" />
 					<h3>北极光</h3>
 					<p>北极光创投基金成立于2004年,资本来源于公益金、基金会、养老基金、联合基金,以及美国、欧洲和亚洲的个体投资人。
 					基金将集中投资于与TMT领域(通讯、新媒体、高科技)相关的、具有中国战略的企业。</p>
 					<div><a th:href="${basePath + '/portal/financial/investmentDetail.html?organizationId=3443f6eb-c077-453e-b542-9215f97b61ea'}">MORE+</a></div>
 				</div>
 				<div>
-					<img th:src="${avatarUploadHost + '/default/inverDatails.jpg'}" alt="" />
+					<img th:src="${avatarUploadHost + '/default/inverDatails3.jpg'}" alt="" />
 					<h3>华兴资本</h3>
 					<p>华兴资本于2004年在北京成立,是中国领先的专注于为快速成长的中国创业型企业家提供顶级财务顾问服务的投资银行。
 					公司关注的行业包括:高科技、媒体、电信、医疗和消费品等行业。</p>

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementOrder.html

@@ -93,6 +93,8 @@
 									交易方式:<span
 										th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
 								</p>
+								<p class="likeId" th:text="${reachievementlist.id}"></p>
+								<p class="likeType" th:text="${reachievementlist.ownerType}"></p>
 								<a href="#">了解详情</a>
 							</div></li>
 					</ul>

+ 28 - 13
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandOrder.html

@@ -74,27 +74,42 @@
 				<div class="line">猜你喜欢</div>
 				<div class="main_introduce">
 					<ul>
-						<li th:each="reachievementlist:${reachievementlist}"><img
-							th:src="${portalHost+'/img/detail_img4.jpg'}" alt="" />
+						<li th:each="redemandlist:${redemandlist}"> 
+							<div th:if="${redemandlist.pictureUrl} == null " >
+								<img th:src="${avatarUploadHost+ '/default/xuqiuimg_null.png'}" alt=""/>
+							</div>
+							<div th:if="${redemandlist.pictureUrl} != null" >
+								<img th:src="${avatarUploadHost+redemandlist.pictureUrl}" alt=""/>
+							</div>
+						 
 							<div class="list_text">
 								<p>
-									行业:<span
-										th:text="${redemandlist.industryCategoryAS}?${redemandlist.industryCategoryAS}:暂无行业分类"></span>
+									行业:<span th:text="${redemandlist.industryCategoryAS}?${redemandlist.industryCategoryAS}:暂无行业分类"></span>
 								</p>
-								<p>
-									名称:<span
-										th:text="${redemandlist.name}?${redemandlist.name}:暂无名称"></span>
+								<p >
+									名称:<span th:text="${redemandlist.name}?${redemandlist.name}:暂无名称"></span>
 								</p>
 								<p>
-									类型:<span
-										th:text="${redemandlist.demandTypeS}?${redemandlist.demandTypeS}:暂无分类"></span>
+									类型:<span th:text="${redemandlist.demandTypeS}?${redemandlist.demandTypeS}:暂无分类"></span>
 								</p>
-								<p>
-									预算:<span
-										th:text="${redemandlist.fixedbudget}?${redemandlist.fixedbudget}:价格面议"></span>
+								<p class="money">
+									预算:<span th:text="${redemandlist.fixedbudget}?${redemandlist.fixedbudget}:价格面议"></span>
 								</p>
+								<p th:text="${redemandlist.id}" class="demandId"></p>
+								<p th:text="${redemandlist.dataCategory}" class="demandTyp"></p>
 								<a href="#">了解详情</a>
-							</div></li>
+							</div>
+							<!-- <div class="star">
+								<p>精品:</p>
+								<ol>
+									<li></li>
+									<li></li>
+									<li></li>
+									<li></li>
+									<li></li>
+								</ol>
+							</div> -->
+							</li>
 					</ul>
 				</div>
 			</div>