Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

yee 8 years ago
parent
commit
09a71d7d25

+ 4 - 4
src/main/java/com/goafanti/cognizance/bo/CognizanceBo.java

@@ -46,9 +46,9 @@ public class CognizanceBo {
 	private String	founder;
 
 	private String	contractId;
-	
-	private Integer contractNumber;
-	
+
+	private Integer	contractNumber;
+
 	public Integer getContractNumber() {
 		return contractNumber;
 	}
@@ -227,7 +227,7 @@ public class CognizanceBo {
 		if (this.issuingDate == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+			return DateFormatUtils.format(this.getIssuingDate(), AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -44,7 +44,7 @@
   
   <th:block th:fragment="subMenu">
   	<ul class="nav_content">
-		<li class="home"><a href="#">首页</a></li>
+		<li class="home"><a th:href="${basePath + '/portal/index.html'}">首页</a></li>
 		<li><a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
 			<ul class="secondary_navigation_nav">
 				<li><a th:href="${basePath + '/portal/search/demand.html'}">需求谷</a></li>

+ 7 - 7
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html

@@ -120,13 +120,13 @@
 			</ol>
 			<div class="carousel-inner">
 				<div class="item">
-					<img th:src="${portalHost + '/img/star_banner_1.png'}" alt="First slide"> <span>科技明星:袁隆平杂交水稻之父......</span>
+					<img th:src="${portalHost + '/img/star_banner_4.png'}" alt="First slide"> <span>科技明星:袁隆平杂交水稻之父......</span>
 				</div>
 				<div class="item active left">
-					<img th:src="${portalHost + '/img/star_banner_1.png'}" alt="Second slide"> <span>科技明星:袁隆平杂交水稻之父......</span>
+					<img th:src="${portalHost + '/img/star_banner_5.png'}" alt="Second slide"> <span>科技明星:袁隆平杂交水稻之父......</span>
 				</div>
 				<div class="item next left">
-					<img th:src="${portalHost + '/img/star_banner_1.png'}" alt="Third slide"> <span>科技明星:袁隆平杂交水稻之父......</span>
+					<img th:src="${portalHost + '/img/star_banner_6.png'}" alt="Third slide"> <span>科技明星:袁隆平杂交水稻之父......</span>
 				</div>
 			</div>
 		</div>
@@ -134,7 +134,7 @@
 			<ul>
 				<li>
 					<div class="star_content_img">
-						<img src="http://aftts.hnzhiming.com/portal/1.0.0/img/star_img.png">
+						<img th:src="${portalHost + '/img/star_img_5.png'}">
 						<a href="#">报名中</a> <span></span>
 					</div>
 					<div class="lecture_content_info">
@@ -145,7 +145,7 @@
 				</li>
 				<li>
 					<div class="star_content_img">
-						<img src="http://aftts.hnzhiming.com/portal/1.0.0/img/star_img.png">
+						<img th:src="${portalHost + '/img/star_img_6.png'}">
 						<a href="#">报名中</a> <span></span>
 					</div>
 					<div class="lecture_content_info">
@@ -156,7 +156,7 @@
 				</li>
 				<li>
 					<div class="star_content_img">
-						<img src="http://aftts.hnzhiming.com/portal/1.0.0/img/star_img.png">
+						<img th:src="${portalHost + '/img/star_img_7.png'}">
 						<a href="#">报名中</a> <span></span>
 					</div>
 					<div class="lecture_content_info">
@@ -167,7 +167,7 @@
 				</li>
 				<li>
 					<div class="star_content_img">
-						<img src="http://aftts.hnzhiming.com/portal/1.0.0/img/star_img.png">
+						<img th:src="${portalHost + '/img/star_img_8.png'}">
 						<a href="#">报名中</a> <span></span>
 					</div>
 					<div class="lecture_content_info">