Explorar o código

Accept Merge Request #241 更新科技金融 : (test -> prod)

Merge Request: 更新科技金融
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/241
浅川 %!s(int64=8) %!d(string=hai) anos
pai
achega
ffd9b47955

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

@@ -124,6 +124,17 @@ public class PortalController extends BaseController {
 			demand.setLocation((StringUtils.isBlank(demand.getProvince()) ? "" : demand.getProvince())
 					+ (StringUtils.isBlank(demand.getCity()) ? "" : demand.getCity()));
 		}
+		
+		
+			String demandpic=demand.getPictureUrl();//在存在多张图片的情况下,暂时先取第一张
+			if(null!= demandpic) {
+				boolean hascomma = demandpic.contains(",");
+				if(hascomma) {
+					String[] picurl = demandpic.split(",");
+					demand.setPictureUrl(picurl[0]);
+				}
+			}
+		
 
 		/*--------------查询精品需求---------------*/
 		List<DemandListBo> boutiquedemand = demandService.selectDemandList(1);
@@ -135,8 +146,19 @@ public class PortalController extends BaseController {
 			reboutiquedemand.add(boutiquedemand.get(index + 2));
 		} else {
 			reboutiquedemand.addAll(boutiquedemand);
-		}
-		;
+		};
+		
+		for (int i = 0; i < reboutiquedemand.size(); i++) {
+			String pic=reboutiquedemand.get(i).getPictureUrl();//在存在多张图片的情况下,暂时先取第一张
+			if(null!= pic) {
+				boolean hascomma = pic.contains(",");
+				if(hascomma) {
+					String[] picurl = pic.split(",");
+					reboutiquedemand.get(i).setPictureUrl(picurl[0]);
+				}
+			}
+		};
+		
 
 		// 判断登录没登录. 登录了.查找用户喜欢的. 没登录就随机查四个.
 		boolean isLogin = TokenManager.isLogin();
@@ -182,7 +204,18 @@ public class PortalController extends BaseController {
 					redemandlist.get(i).setDemandTypeS("技术人才型需求");
 				}
 			}
-		}
+		};
+		
+		for (int i = 0; i < redemandlist.size(); i++) {
+			String pic=redemandlist.get(i).getPictureUrl();//在存在多张图片的情况下,暂时先取第一张
+			if(null!= pic) {
+				boolean hascomma = pic.contains(",");
+				if(hascomma) {
+					String[] picurl = pic.split(",");
+					redemandlist.get(i).setPictureUrl(picurl[0]);
+				}
+			}
+		};
 
 		mv.setViewName("/portal/technologyTrading/demandDetail");
 		mv.addObject("demand", demand);
@@ -308,6 +341,17 @@ public class PortalController extends BaseController {
 					achievementdetail.setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
 				}
 			}
+			
+			String pic=achievementdetail.getTechnicalPictureUrl();//在存在多张图片的情况下,暂时先取第一张
+			if(null!= pic) {
+				boolean hascomma = pic.contains(",");
+				if(hascomma) {
+					String[] picurl = pic.split(",");
+					achievementdetail.setTechnicalPictureUrl(picurl[0]);
+				}
+			}
+			
+			
 			String location = "";
 			String province = achievementdetail.getProvince();
 			String city = achievementdetail.getCity();
@@ -338,8 +382,20 @@ public class PortalController extends BaseController {
 			reboutiqueachievement.add(boutiqueachievement.get(index + 2));
 		} else {
 			reboutiqueachievement.addAll(boutiqueachievement);
-		}
-		;
+		};
+		
+		for (int i = 0; i < boutiqueachievement.size(); i++) {
+			String pic=boutiqueachievement.get(i).getTechnicalpictureurl();//在存在多张图片的情况下,暂时先取第一张
+			if(null!= pic) {
+				boolean hascomma = pic.contains(",");
+				if(hascomma) {
+					String[] picurl = pic.split(",");
+					boutiqueachievement.get(i).setTechnicalpictureurl(picurl[0]);
+				}
+			}
+		};
+		
+		
 
 		// 判断登录没登录. 登录了.查找用户喜欢的. 没登录就随机查四个.
 		boolean isLogin = TokenManager.isLogin();
@@ -445,7 +501,17 @@ public class PortalController extends BaseController {
 				} else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)) {
 					reachievementlist.get(i).setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
 				}
+			};
+			
+			String pic=reachievementlist.get(i).getTechnicalpictureurl();//在存在多张图片的情况下,暂时先取第一张
+			if(null!= pic) {
+				boolean hascomma = pic.contains(",");
+				if(hascomma) {
+					String[] picurl = pic.split(",");
+					reachievementlist.get(i).setTechnicalpictureurl(picurl[0]);
+				}
 			}
+			
 
 		}
 

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

@@ -1462,8 +1462,8 @@
 	on 
 		a.field_a = b.id 	
 	where 
-		a.boutique = 1  and a.audit_status = 3 
-	<if test="dataCategory != null and dataCategory != ''">
+		a.boutique = 1  and a.audit_status = 3 and a.deleted_sign=0
+	<if test="fieldA != null and fieldA != ''">
 		and a.field_a = #{fieldA,jdbcType=INTEGER}
 	</if>
 	<if test="dataCategory != null and dataCategory != ''">
@@ -1487,8 +1487,8 @@
 	on 
 		a.field_a = b.id 
 	where 
-		a.boutique = 1  and a.audit_status = 3 
-	<if test="dataCategory != null and dataCategory != ''">
+		a.boutique = 1  and a.audit_status = 3 and a.deleted_sign=0
+	<if test="fieldA != null and fieldA != ''">
 		and a.field_a = #{fieldA,jdbcType=INTEGER}
 	</if>
 	<if test="dataCategory != null and dataCategory != ''">

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

@@ -1191,7 +1191,10 @@
 	on 
 		a.industry_category_a = b.id
 	where
-		a.boutique = 1 and a.audit_status =3 and a.industry_category_a = #{industryCategoryA,jdbcType=INTEGER} 
+		a.boutique = 1 and a.audit_status =3 and a.deleted_sign=0
+	<if test="industryCategoryA != null and industryCategoryA != ''">
+		and a.industry_category_a = #{industryCategoryA,jdbcType=INTEGER} 
+	</if>	
 	order by 
 		a.create_time desc
 	<if test="page_sql!=null">
@@ -1208,7 +1211,10 @@
 	on 
 		a.industry_category_a = b.id
 	where
-		a.boutique = 1 and a.audit_status =3 and a.industry_category_a = #{industryCategoryA,jdbcType=INTEGER} 
+		a.boutique = 1 and a.audit_status =3 and a.deleted_sign=0
+	<if test="industryCategoryA != null and industryCategoryA != ''">
+		and a.industry_category_a = #{industryCategoryA,jdbcType=INTEGER} 
+	</if>
   </select>
   
   <!-- 查询需求列表 -->

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

@@ -120,22 +120,25 @@
 		<div id="info">
 			<div class="info">
 				<div>
-					<img th:src="${portalHost + '/img/info_img.png'}" alt="" />
-					<h3>投资机构信息</h3>
-					<p>的发货未发货我发东北师范</p>
-					<div>MORE+</div>
+					<img th:src="${avatarUploadHost + '/default/inverDatails.jpg'}" alt="" />
+					<h3>高新创投</h3>
+					<p>湖南高新创业投资集团有限公司(简称:高新创投)成立于2007年9月,系省委、省政府批准设立的全省唯一的省级国有创投机构,
+					是为创新财政投入方式、推进战略新兴产业和高新技术产业发展而打造的政府性投融资平台。</p>
+					<div><a th:href="${basePaht + '/portal/financial/investmentDetail.html?organizationId=bc1c9b64-a285-47ca-b783-db7dfdde4b93'}">MORE+</a></div>
 				</div>
 				<div>
-					<img th:src="${portalHost + '/img/info_img.png'}" alt="" />
-					<h3>投资机构信息</h3>
-					<p>的发货未发货我发东北师范</p>
-					<div>MORE+</div>
+					<img th:src="${avatarUploadHost + '/default/inverDatails.jpg'}" alt="" />
+					<h3>北极光</h3>
+					<p>北极光创投基金成立于2004年,资本来源于公益金、基金会、养老基金、联合基金,以及美国、欧洲和亚洲的个体投资人。
+					基金将集中投资于与TMT领域(通讯、新媒体、高科技)相关的、具有中国战略的企业。</p>
+					<div><a th:href="${basePaht + '/portal/financial/investmentDetail.html?organizationId=3443f6eb-c077-453e-b542-9215f97b61ea'}">MORE+</a></div>
 				</div>
 				<div>
-					<img th:src="${portalHost + '/img/info_img.png'}" alt="" />
-					<h3>投资机构信息</h3>
-					<p>的发货未发货我发东北师范</p>
-					<div>MORE+</div>
+					<img th:src="${avatarUploadHost + '/default/inverDatails.jpg'}" alt="" />
+					<h3>华兴资本</h3>
+					<p>华兴资本于2004年在北京成立,是中国领先的专注于为快速成长的中国创业型企业家提供顶级财务顾问服务的投资银行。
+					公司关注的行业包括:高科技、媒体、电信、医疗和消费品等行业。</p>
+					<div><a th:href="${basePaht + '/portal/financial/investmentDetail.html?organizationId=281b7ba4-299a-4a22-b18b-5b97bcc5d04a'}">MORE+</a></div>
 				</div>
 			</div>
 		</div>
@@ -242,27 +245,7 @@
 		<div class="allproduct_bottom">
 			<div class="allproduct_cont">
 				<ul id="demandList_patent">
-					<!-- <li><img src="../img/allproduct_img.png" alt="" />
-						<div class="details_text">
-							<p>
-								融资金额: <span>10000</span>
-							</p>
-							<p>
-								所属行业: <span>航海航空</span>
-							</p>
-							<p>
-								所 有 人 : <span>海泽王</span>
-							</p>
-							<p>
-								项目简介: <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b>
-							</p>
-							<a href="#">会谈</a>
-						</div>
-						<div class="details_fix">
-							<p>
-								项目名 <span> 医疗四分局王死哦风景</span>
-							</p>
-						</div></li> -->
+					
 				</ul>
 			</div>
 			<div class="pagination_box">

+ 4 - 0
src/main/webapp/WEB-INF/views/portal/index.html

@@ -89,6 +89,10 @@
 	<div id="product">
 		<div class="caption">精品成果<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a></div>
 		<div class="content">
+			<div class="con_hover">
+				<img th:href="${basePath + '/img/search_txt.png'}" alt="" />
+				<p>详情</p>
+			</div>
 			<div class="cont cont_top1">
 				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
 					<div class="img">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -54,7 +54,7 @@
 						</div>
 						<div class="basic_right">
 							<h5>交易方式</h5>
-							<p th:text="${achievementdetail.transferModeS}"></p>
+							<p th:text="${achievementdetail.transferModeS}?${achievementdetail.transferModeS}:面议"></p>
 						</div>
 						<!-- <span><img th:src="${portalHost + '/img/detail_img5.png'}"alt="" /> <span  >8</span> </span> -->
 						<div class="detail_btn">我要咨询</div>