Просмотр исходного кода

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

wubb лет назад: 8
Родитель
Сommit
35fc01647a

+ 9 - 0
schema/201707011-star.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `star` (
+  `id` VARCHAR(36) NOT NULL,
+  `uid` VARCHAR(36) NOT NULL COMMENT '明星用户ID',
+  `hot` INT(1) NOT NULL DEFAULT 0 COMMENT '是否在首页显示(0--否,1--是)',
+  `star` INT(1) NOT NULL DEFAULT 0 COMMENT '是否在科技明星页显示(0--不显示,1--显示)',
+  `portal_url` VARCHAR(255) NULL COMMENT '个人主页URL',
+  PRIMARY KEY (`id`))
+ENGINE = InnoDB
+COMMENT = '科技明星';

+ 1 - 0
src/main/java/com/goafanti/admin/controller/AdminStarApiController.java

@@ -39,4 +39,5 @@ public class AdminStarApiController extends BaseApiController {
 		res.setData(userService.listStar(number, engagedField, username, professionalTitle, workUnit, pNo, pSize));
 		res.setData(userService.listStar(number, engagedField, username, professionalTitle, workUnit, pNo, pSize));
 		return res;
 		return res;
 	}
 	}
+	
 }
 }

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

@@ -832,6 +832,27 @@
   </select>
   </select>
   
   
   <select id="findStarCount" parameterType="String" resultType="java.lang.Integer">
   <select id="findStarCount" parameterType="String" resultType="java.lang.Integer">
-  
+  	select 
+  		count(1)
+  	from user u
+  	left join user_identity ui on ui.uid = u.id
+  	left join user_career uc on uc.uid = u.id
+  	where 
+  		ui.celebrity = 1
+  	<if test="number != null">
+  		and u.number = #{number,jdbcType=INTEGER}
+  	</if>
+  	<if test="engagedField != null">
+  		and uc.engaged_field like CONCAT(#{engagedField,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="professionalTitle != null">
+  		and uc.professional_title like CONCAT('%',#{professionalTitle,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="workUnit != null">
+  		and uc.work_unit like CONCAT('%',#{workUnit,jdbcType=VARCHAR},'%')
+  	</if>
   </select>
   </select>
 </mapper>
 </mapper>

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

@@ -107,7 +107,7 @@
 				</ul>
 				</ul>
 			</li>
 			</li>
 			<li th:classappend="${mainM=='creative'}? 'active'">
 			<li th:classappend="${mainM=='creative'}? 'active'">
-				<a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">创圈</a>
+				<a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">创圈</a>
 				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
 				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
 					<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">项目圈</a></li>
 					<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html'}">项目圈</a></li>
 					<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html#chuangke'}">创客圈</a></li>
 					<li><a th:href="${basePath + '/portal/entrepreneurship/entrepreneurshipIndex.html#chuangke'}">创客圈</a></li>
@@ -139,28 +139,28 @@
 					</h4>
 					</h4>
 				</div>
 				</div>
 				<div class="friendship_link_content">
 				<div class="friendship_link_content">
-					<a href="http://www.hnst.gov.cn/">湖南省科技厅</a>
-					<a href="http://www.cssti.cn/">长沙市科技局</a>
-					<a href="http://www.cast.org.cn/">中国科学技术协会</a>
-					<a href="http://www.chinatorch.gov.cn/">科技部火炬中心</a>
-					<a href="http://www.nosta.gov.cn/web/index.aspx">国家科技成果奖励办</a>
-					<a href="http://www.nast.org.cn/portal.php">国家科技成果网</a>
-					<a href="http://www.hnast.org.cn/portal/comm/index.action">湖南省科学技术协会</a>
-					<a href="http://www.hncgw.gov.cn/">湖南省科技成果转化公共服务平台</a>
-					<a href="http://www.hnjxw.gov.cn/">湖南省经济信息化委员会</a>
-					<a href="http://kyy.hnu.cn/">湖南大学科学技术研究院</a>
+					<a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅</a>
+					<a href="http://www.cssti.cn/" target="_blank">长沙市科技局</a>
+					<a href="http://www.cast.org.cn/" target="_blank">中国科学技术协会</a>
+					<a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心</a>
+					<a href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办</a>
+					<a href="http://www.nast.org.cn/portal.php" target="_blank">国家科技成果网</a>
+					<a href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会</a>
+					<a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台</a>
+					<a href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会</a>
+					<a href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院</a>
 				</div>
 				</div>
 				<div class="friendship_link_content">
 				<div class="friendship_link_content">
-					<a href="http://www.gxst.gov.cn/">广西省科技厅</a>
-					<a href="http://www.cssti.cn/">内蒙古自治区科技厅</a>
-					<a href="http://www.cshtz.gov.cn/">长沙高新区管委会</a>
-					<a href="http://www.jxas.ac.cn/">江西省科学院</a>
-					<a href="http://www.cnic.cn/">中科院计算机网络信息中心</a>
-					<a href="http://kxyjb.csu.edu.cn/">中南大学科学研究部</a>
-					<a href="http://www.scei.org.cn/">中国科协创新创业服务中心</a>
-					<a href="http://www.hbstd.gov.cn/">湖北省科技厅</a>
-					<a href="http://www.gdstc.gov.cn/">广东省科技厅</a>
-					<a href="http://www.hnkjt.gov.cn/">河南省科技厅</a>
+					<a href="http://www.gxst.gov.cn/" target="_blank">广西省科技厅</a>
+					<a href="http://www.cssti.cn/" target="_blank">内蒙古自治区科技厅</a>
+					<a href="http://www.cshtz.gov.cn/" target="_blank">长沙高新区管委会</a>
+					<a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院</a>
+					<a href="http://www.cnic.cn/" target="_blank">中科院计算机网络信息中心</a>
+					<a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部</a>
+					<a href="http://www.scei.org.cn/" target="_blank">中国科协创新创业服务中心</a>
+					<a href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅</a>
+					<a href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅</a>
+					<a href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅</a>
 				</div>
 				</div>
 			</div>
 			</div>
 			<div class="footer_contact">
 			<div class="footer_contact">
@@ -174,7 +174,7 @@
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="company_link">
 		<div class="company_link">
-			<a href="http://www.kedexinxi.com/about/?49.html">关于公司</a>
+			<a href="http://www.kedexinxi.com/about/?49.html" target="_blank">关于公司</a>
 			<a href="#">联系我们</a>
 			<a href="#">联系我们</a>
 		</div>
 		</div>
 		<div class="container support">
 		<div class="container support">

Разница между файлами не показана из-за своего большого размера
+ 523 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html


Разница между файлами не показана из-за своего большого размера
+ 17 - 17
src/main/webapp/WEB-INF/views/portal/index.html


+ 27 - 11
src/main/webapp/WEB-INF/views/portal/ipr/service.html

@@ -96,35 +96,51 @@
 			</div>
 			</div>
 			<div class="case_content">
 			<div class="case_content">
 				<ul>
 				<ul>
+					<li><a href="#"><img src="../../img/case_16.png"></a></li>
+					<li><a href="#"><img src="../../img/case_20.png"></a></li>
+					<li><a href="#"><img src="../../img/case_17.png"></a></li>
+					<li><a href="#"><img src="../../img/case_22.png"></a></li>
+					<li><a href="#"><img src="../../img/case_5.png"></a></li>
+					<li><a href="#"><img src="../../img/case_19.png"></a></li>
+					<li><a href="#"><img src="../../img/case_7.png"></a></li>
+					<li><a href="#"><img src="../../img/case_18.png"></a></li>
+					<li><a href="#"><img src="../../img/case_26.png"></a></li>
+					<li><a href="#"><img src="../../img/case_25.png"></a></li>
+					<li><a href="#"><img src="../../img/case_11.png"></a></li>
+					<li><a href="#"><img src="../../img/case_21.png"></a></li>
+					<li><a href="#"><img src="../../img/case_13.png"></a></li>
+					<li><a href="#"><img src="../../img/case_23.png"></a></li>
+					<li><a href="#"><img src="../../img/case_24.png"></a></li>
+
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_1.png'}"></a></li>
+							th:src="${portalHost + '/img/case_16.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_2.png'}"></a></li>
+							th:src="${portalHost + '/img/case_20.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_3.png'}"></a></li>
+							th:src="${portalHost + '/img/case_17.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_4.png'}"></a></li>
+							th:src="${portalHost + '/img/case_22.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
 							th:src="${portalHost + '/img/case_5.png'}"></a></li>
 							th:src="${portalHost + '/img/case_5.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_6.png'}"></a></li>
+							th:src="${portalHost + '/img/case_19.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
 							th:src="${portalHost + '/img/case_7.png'}"></a></li>
 							th:src="${portalHost + '/img/case_7.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_8.png'}"></a></li>
+							th:src="${portalHost + '/img/case_18.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_9.png'}"></a></li>
+							th:src="${portalHost + '/img/case_26.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_10.png'}"></a></li>
+							th:src="${portalHost + '/img/case_25.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
 							th:src="${portalHost + '/img/case_11.png'}"></a></li>
 							th:src="${portalHost + '/img/case_11.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_12.png'}"></a></li>
+							th:src="${portalHost + '/img/case_21.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
 							th:src="${portalHost + '/img/case_13.png'}"></a></li>
 							th:src="${portalHost + '/img/case_13.png'}"></a></li>
 					<li><a href="#"><img
 					<li><a href="#"><img
-							th:src="${portalHost + '/img/case_14.png'}"></a></li>
-					<li><a href="#"><img th:src="${portalHost + '/img/case_15.png'}"></a></li>
+							th:src="${portalHost + '/img/case_23.png'}"></a></li>
+					<li><a href="#"><img th:src="${portalHost + '/img/case_24.png'}"></a></li>
 				</ul>
 				</ul>
 			</div>
 			</div>
 		</div>
 		</div>

Разница между файлами не показана из-за своего большого размера
+ 29 - 96
src/main/webapp/WEB-INF/views/portal/websiteBuild/websiteBuildIndex.html