zou_ht 8 年 前
コミット
ed9ddd252d

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

@@ -35,21 +35,21 @@ import com.goafanti.portal.bo.DemandPortalSimilarListBo;
 @Controller
 public class PortalController extends BaseController {
 	@Resource
-	private AchievementService achievementService;
+	private AchievementService		achievementService;
 	@Resource
-	private DemandService demandService;
+	private DemandService			demandService;
 	@Resource
-	private FieldGlossoryService fieldGlossoryService;
+	private FieldGlossoryService	fieldGlossoryService;
 
-	private static final String UNIT = "万元";
+	private static final String		UNIT				= "万元";
 
-	private static final int MULTIPLE = 20;
+	private static final int		MULTIPLE			= 20;
 
-	private static final String DELIMITER = "/";
+	private static final String		DELIMITER			= "/";
 
-	private static final String PRICE_NEGOTIABLE = "价格面议";
+	private static final String		PRICE_NEGOTIABLE	= "价格面议";
 
-	private static final String UNCERTIFY = "未认证";
+	private static final String		UNCERTIFY			= "未认证";
 
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
@@ -206,7 +206,6 @@ public class PortalController extends BaseController {
 		if (null != achievementdetail) {
 
 			Integer category = achievementdetail.getCategory();
-			System.out.println("category:" + category);
 			if (null != category) {
 				if (category == 0) {
 					achievementdetail.setCategoryS("专利");
@@ -376,7 +375,7 @@ public class PortalController extends BaseController {
 			Integer fieldA = reachievementlist.get(i).getFieldA();
 			String field = "";
 			boolean a = Boolean.FALSE;
-			if (null != fieldA) {
+			if (null != fieldA && null !=achievementdetail ) {
 				List<AchievementPortalSimilarListBo> similarList = achievementService.findByFieldA(fieldA,
 						achievementdetail.getId(), type);
 				if (!similarList.isEmpty()) {

+ 1 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -142,10 +142,9 @@ public class WebpageController extends BaseController {
 	}
 
 	@RequestMapping(value = "/user/subscriberDetail", method = RequestMethod.GET)
-	public ModelAndView ModelAndView(HttpServletRequest request, ModelAndView modelview, String uid, Integer type) {
+	public ModelAndView subscriberDetail(HttpServletRequest request, ModelAndView modelview, String uid, Integer type) {
 		ModelAndView mv = new ModelAndView();
 		UserPartnerDetailBo rePartnerDetail =new UserPartnerDetailBo();
-		System.out.println("uid=" + uid);
 		/* 查询智者详细信息 */
 
 		if (UserType.PERSONAL.getCode().equals(type)) {

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

@@ -1446,6 +1446,7 @@
 		a.transfer_price as price,
 		a.summary as sketch,
 		a.technical_picture_url as pictureUrl,
+		a.owner_type as ownerType,
 		b.name as industryCatalog,
 		a.owner_name as personName
 	from 

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

@@ -1092,7 +1092,9 @@
 		d.id,
 		d.name,
 		d.keyword,
+		d.validity_period as validityPeriod,
 		d.industry_category_a AS industryCategoryA,
+		d.picture_url as pictureUrl,
 		fg.name AS industryCategoryAS,
 		fgg.name AS industryCategorBS,
 		d.budget_cost AS budgetCost,
@@ -1120,6 +1122,8 @@
 		d.id,
 		d.name,
 		d.keyword,
+		d.picture_url as pictureUrl,
+		d.validity_period as validityPeriod,
 		d.industry_category_a AS industryCategoryA,
 		fg.name AS industryCategoryAS,
 		fgg.name AS industryCategoryBS,
@@ -1178,6 +1182,7 @@
    		b.name as industryCategory,
    		a.picture_url as pictureUrl,
    		a.problem_des as sketch,
+   		a.data_category as ownerType,
    		a.employer_name as personName
 	from 
 		demand a 
@@ -1205,4 +1210,51 @@
 	where
 		a.boutique = 1 and a.audit_status =3 and a.industry_category_a = #{industryCategoryA,jdbcType=INTEGER} 
   </select>
+  
+  <!-- 查询需求列表 -->
+	<select id="selectDemandList" parameterType="java.lang.Integer"
+		resultType="com.goafanti.demand.bo.DemandListBo">
+		SELECT
+		d.id,
+		d.name,
+		d.keyword,
+		d.fixed_budget as fixedbudget,
+		d.demand_type as demandType,
+		d.picture_url as pictureUrl,
+		d.industry_category_a AS industryCategoryA,
+		fg.name AS
+		industryCategoryAS,
+		fgg.name AS industryCategorBS,
+		d.budget_cost AS
+		budgetCost,
+		d.problem_des AS problemDes,
+		dg.name AS
+		province,
+		dgg.name AS
+		city,
+		interest.id as interestId,
+		d.employer_name as
+		employerName,
+		u.lvl as
+		level
+		FROM
+		demand d
+		LEFT JOIN `user` u on u.id = d.employer_id
+		LEFT JOIN
+		user_identity ui on ui.uid = d.employer_id
+		LEFT JOIN district_glossory
+		dg ON dg.id = ui.province
+		LEFT JOIN district_glossory dgg ON dgg.id =
+		ui.city
+		LEFT JOIN field_glossory fg on fg.id = d.industry_category_a
+		LEFT JOIN field_glossory fgg on fgg.id = d.industry_category_b
+		LEFT
+		JOIN demand_interest interest on interest.demand_id = d.id and
+		interest.uid = #{uid,jdbcType=VARCHAR}
+		WHERE
+		<if test="_parameter!= null">
+			d.boutique = #{_parameter,jdbcType=INTEGER}
+		</if>
+		limit 0,30
+	</select>
 </mapper>

+ 17 - 1
src/main/java/com/goafanti/portal/bo/AchievementPortalDetailBo.java

@@ -1,6 +1,7 @@
 package com.goafanti.portal.bo;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -33,6 +34,8 @@ public class AchievementPortalDetailBo {
 	private String			fieldBS;
 
 	private Date			releaseDate;
+	
+	private String			releaseDateS;
 
 	private String			province;
 
@@ -294,7 +297,20 @@ public class AchievementPortalDetailBo {
 		this.categoryS = categoryS;
 	}
 
-	
+	public String getReleaseDateS() {
+		if(null == releaseDate) {
+			return null;
+		}else {
+			SimpleDateFormat sdf =new SimpleDateFormat(AFTConstants.YYYYMMDD);
+			releaseDateS=sdf.format(this.releaseDate);
+			return releaseDateS;
+		}
+	}
+
+	public void setReleaseDateS(String releaseDateS) {
+		this.releaseDateS = releaseDateS;
+	}
+
 	
 	
 }

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

@@ -13,6 +13,8 @@ public class BoutiqueListBo {
 	private String industryCatalog;
 	private String pictureUrl;
 	private String technicalpictureurl;
+	/** 拥有者类别 0 - 个人, 1 - 组织 **/
+	private Integer ownerType;
 
 	public String getId() {
 		return id;
@@ -68,5 +70,12 @@ public class BoutiqueListBo {
 	public void setTechnicalpictureurl(String technicalpictureurl) {
 		this.technicalpictureurl = technicalpictureurl;
 	}
+	public Integer getOwnerType() {
+		return ownerType;
+	}
+	public void setOwnerType(Integer ownerType) {
+		this.ownerType = ownerType;
+	}
+	
 	
 }

+ 23 - 3
src/main/java/com/goafanti/portal/bo/DemandPortalDetailBo.java

@@ -1,6 +1,10 @@
 package com.goafanti.portal.bo;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.goafanti.common.constant.AFTConstants;
 
 public class DemandPortalDetailBo {
 	private String		id;
@@ -39,9 +43,11 @@ public class DemandPortalDetailBo {
 	
 	private String		employerAddress;
 	
-	private String      validityPeriod;
+	private Date      validityPeriod;
 	
 	private Integer      fixedbudget;
+	
+	private String      validityPeriodS;
 
 	public Integer getLevel() {
 		return level;
@@ -196,13 +202,27 @@ public class DemandPortalDetailBo {
 		this.fixedbudget = fixedbudget;
 	}
 
-	public String getValidityPeriod() {
+	public Date getValidityPeriod() {
 		return validityPeriod;
 	}
 
-	public void setValidityPeriod(String validityPeriod) {
+	public void setValidityPeriod(Date validityPeriod) {
 		this.validityPeriod = validityPeriod;
 	}
+
+	public String getValidityPeriodS() {
+		SimpleDateFormat sdf =new SimpleDateFormat(AFTConstants.YYYYMMDD);
+		if(null==validityPeriod) {
+		return null ;
+		}else {
+			validityPeriodS=sdf.format(this.validityPeriod);
+			return validityPeriodS;
+		}
+	}
+
+	public void setValidityPeriodS(String validityPeriodS) {
+		this.validityPeriodS = validityPeriodS;
+	}
 	
 	
 	

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

@@ -270,16 +270,22 @@
 				</ul>
 			</div>
 			<div class="pagination_box">
-				<span aria-hidden="true" class="page_right">&gt;&gt;</span>
-				<div>
-					<div class="paging_box">
-						<!--<span value="1" class="action_span">1</span>-->
-						<!--<span value="2" >2</span>-->
-						<!--<span value="3" >3</span>-->
-						<!--<span value="4" >4</span>-->
-					</div>
-				</div>
-				<span aria-hidden="false" class="page_left">&lt;&lt;</span>
+				<nav aria-label="Page navigation" class="clearfix">
+						<ul class="pagination">
+							<li class="pagePre">
+								<a href="#" aria-label="Previous">
+									<span aria-hidden="true" value="1">首页</span>
+								</a>
+							</li>
+							<li class="pageNumber active"><a href="#" value="1">1</a></li>
+							<li class="pageNext">
+								<a href="#" aria-label="Next">
+									<span aria-hidden="true">末页</span>
+								</a>
+							</li>
+						</ul>
+						<span class="totalCount">共 0 页 0 条数据</span>
+					</nav>
 			</div>
 		</div>
 	</div>

File diff suppressed because it is too large
+ 133 - 131
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


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

@@ -71,21 +71,27 @@
 				<div class="detail_centertext" th:each="achievementdetail:${achievementdetail}">
 					<div class="text_left">
 						<div>
+							<h5 class="left_p">拥有者:</h5>
+							<p th:text="${achievementdetail.ownerName}?${achievementdetail.ownerName}:未公开">未公开</p>
+						</div>
+						<div>
 							<h5 class="left_p">技术成熟度:</h5>
-							<p >可以量产</p>
+							<p th:text="${achievementdetail.maturityS}?${achievementdetail.maturityS}:未知">未知</p>
+							
 						</div>
 						<div>
 							<h5>类型:</h5>
-							<p  th:text="${achievementdetail.categoryS}">发明专利</p>
+							<p th:text="${achievementdetail.categoryS}?${achievementdetail.categoryS}:暂无分类信息">发明专利</p>
 						</div>
 						<div>
 							<h5>最近更新</h5>
-							<p  th:text="${achievementdetail.releaseDate}">2017-09-17</p>
+							<p th:text="${achievementdetail.releaseDateS}?${achievementdetail.releaseDateS}:暂无该信息">2017-09-17</p>
 						</div>
 					</div>
 					<div class="text_right">
 						<div>技术简介</div>
-						<p th:text="${achievementdetail.introduction}"></p>
+						<p th:text="${achievementdetail.introduction}?${achievementdetail.introduction}:暂无相关简介"></p>
+						
 					</div>
 				</div>
 			</div>
@@ -97,21 +103,21 @@
 							<img th:src="${avatarUploadHost+reachievementlist.technicalpictureurl}" alt="" />
 							<div class="list_text">
 								<p>
-									行业:<span th:text="${reachievementlist.field}"></span>
+									行业:<span th:text="${reachievementlist.field}?${reachievementlist.field}:暂无分类信息"></span>
 								</p>
 								<p >
-									名称:<span th:text="${reachievementlist.name}"></span>
+									名称:<span th:text="${reachievementlist.name}?${reachievementlist.name}:未知"></span>
 								</p>
 							    <p >
-									类型<span th:text="${reachievementlist.ownerTypeS}"></span>
+									类型<span th:text="${reachievementlist.ownerTypeS}?${reachievementlist.ownerTypeS}:个人所有"></span>
 								</p> 
 								<p >
-									交易方式:<span th:text="${reachievementlist.transferModeS}"></span>
+									交易方式:<span th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
 								</p>
 								<a href="#">了解详情</a>
 							</div>
 							<div class="star">
-								<p >成熟度:<span th:text="${reachievementlist.maturityS}"></span></p>
+								<p >成熟度:<span th:text="${reachievementlist.maturityS}?${reachievementlist.maturityS}:暂无信息"></span></p>
 							</div>
 						</li>
 					</ul>

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

@@ -53,7 +53,7 @@
 							<span>需求预算:</span> <span th:text="${demand.fixedbudget}?${demand.fixedbudget}:价格面议"></span>
 						</div>
 						<div class="inline_span">
-							<span>有效日期:</span> <span th:text="${demand.validityPeriod}"></span>
+							<span>有效日期:</span> <span th:text="${demand.validityPeriodS}?${demand.validityPeriodS}:永久"></span>
 						</div>
 						<!-- <span> <img src="../../img/detail_img5.jpg" alt="" /> <span>8</span></span> -->
 						<div class="detail_btn">我要咨询</div>

+ 16 - 6
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

@@ -265,12 +265,22 @@
 					</ul>
 				</div>			
 				<div class="pagination_box">
-				<span aria-hidden="true" class="page_right">&gt;&gt;</span>
-					<div>
-						<div class="paging_box">							
-						</div>
-					</div>
-				<span aria-hidden="false" class="page_left">&lt;&lt;</span>
+				<nav aria-label="Page navigation" class="clearfix">
+						<ul class="pagination">
+							<li class="pagePre">
+								<a href="#" aria-label="Previous">
+									<span aria-hidden="true" value="1">首页</span>
+								</a>
+							</li>
+							<li class="pageNumber active"><a href="#" value="1">1</a></li>
+							<li class="pageNext">
+								<a href="#" aria-label="Next">
+									<span aria-hidden="true">末页</span>
+								</a>
+							</li>
+						</ul>
+						<span class="totalCount">共 0 页 0 条数据</span>
+					</nav>
 				</div>
 			</div>
 		</div>