Procházet zdrojové kódy

Merge remote-tracking branch 'origin/master' into prod

wanghui před 8 roky
rodič
revize
7cdd777134

+ 2 - 0
schema/20170821-alert.sql

@@ -0,0 +1,2 @@
+alter table achievement add column jmrh_flag int(1) default 0 comment '是否属于军民融合';
+alter table news add column jmrh_flag int(1) default 0 comment '是否属于军民融合';

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

@@ -12,7 +12,7 @@
     <result column="industry_category_b" property="industryCategoryB" jdbcType="INTEGER" />
     <result column="industry_category_c" property="industryCategoryC" jdbcType="INTEGER" />
     <result column="demand_type" property="demandType" jdbcType="INTEGER" />
-    <result column="problem_des" property="problemDes" jdbcType="VARCHAR" />
+    <result column="problem_des" property="problemDes" jdbcType="LONGVARCHAR" />
     <result column="technical_requirements" property="technicalRequirements" jdbcType="VARCHAR" />
     <result column="picture_url" property="pictureUrl" jdbcType="LONGVARCHAR" />
     <result column="text_file_url" property="textFileUrl" jdbcType="VARCHAR" />

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

@@ -141,6 +141,8 @@
 			news
 		where 
 			jmrh_flag = 1 and type = #{type,jdbcType=INTEGER}
+		order by 
+			create_time desc
 		limit 3;
 	</select>
 </mapper>

+ 5 - 5
src/main/java/com/goafanti/news/bo/InputNews.java

@@ -38,7 +38,7 @@ public class InputNews {
 	
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-    private Integer jmrhFlagp;
+    private Integer jmrhFlag;
     
 	private String	content;
 
@@ -122,11 +122,11 @@ public class InputNews {
 		this.content = content;
 	}
 
-	public Integer getJmrhFlagp() {
-		return jmrhFlagp;
+	public Integer getJmrhFlag() {
+		return jmrhFlag;
 	}
 
-	public void setJmrhFlagp(Integer jmrhFlagp) {
-		this.jmrhFlagp = jmrhFlagp;
+	public void setJmrhFlag(Integer jmrhFlag) {
+		this.jmrhFlag = jmrhFlag;
 	}
 }

+ 7 - 1
src/main/java/com/goafanti/residentIntegration/bo/ResidentIntegrationBo.java

@@ -6,7 +6,7 @@ public class ResidentIntegrationBo {
 	private String maturity;/** 成熟度 **/
 	private String industry;/** 行业 **/
 	private String residenceCity;/** 所属城市 **/
-	
+	private String ownerType;/** 所有人类型 **/
 	public String getName() {
 		return name;
 	}
@@ -37,4 +37,10 @@ public class ResidentIntegrationBo {
 	public void setResidenceCity(String residenceCity) {
 		this.residenceCity = residenceCity;
 	}
+	public String getOwnerType() {
+		return ownerType;
+	}
+	public void setOwnerType(String ownerType) {
+		this.ownerType = ownerType;
+	}
 }

+ 2 - 2
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.39
+static.host=//afts.hnzhiming.com/1.0.40
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload
@@ -67,7 +67,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//afts.hnzhiming.com/portal/1.0.8
+portal.host=//afts.hnzhiming.com/portal/1.0.10
 
 patentTemplate=SMS_72005286
 

+ 4 - 2
src/main/webapp/WEB-INF/views/portal/detail/achievementDetail.html

@@ -39,8 +39,10 @@
 	<div class="container transaction_info">
 		<div class="transaction_img">
 			<div class="img_b">
-				<img th:if="${achievement.pictureList != null}"
-					th:src="${avatarUploadHost+achievement.pictureList[0]}">
+				<img th:if="${achievement.pictureList != null && achievement.pictureList.size() > 0}"
+					th:src="${avatarUploadHost+achievement.pictureList[0]}" />
+				<img th:if="${achievement.pictureList == null || achievement.pictureList.size() == 0}"
+					th:src="${portalHost + '/img/achievement_default.jpg'}" />
 			</div>
 			<div class="img_list">
 				<ul>

+ 36 - 85
src/main/webapp/WEB-INF/views/portal/residentIntegration/index.html

@@ -58,11 +58,14 @@
 			<h3>解密专利</h3>
 			<div class="patent_top row">
 				<div class="col-xs-6 bg-left">
-					<!-- <a th:each="it: ${jmrhAchievementList}" href="${basePath+ 'portal/detail/achievementDetail.html?id=' + it.id}">
-						<span class="note" th:text="${it.name}"></span>
-					</a> -->
-					<a href="/portal/search/achievement.html"><span class="note">平衡力距传动增衡器怒我很期待</span><span class="node">使用新型</span></a>
-					<a href="/portal/search/achievement.html"><span class="note">平衡力距传动增衡器怒我很期待</span><span class="node">使用新型</span></a>
+					<ul>
+						<li th:each="it: ${jmrhAchievementList}">
+							<a th:href="${basePath+ '/portal/detail/achievementDetail.html?id=' + it.id +'&type=' + it.ownerType}">
+								<span class="note" th:text="${it.name}"></span>
+								<span class="node"></span>
+							</a>
+						</li>
+					</ul>
 					<a th:href="${basePath +'/portal/search/achievement.html'}" class="more">MORE</a>
 				</div>
 				<div class="col-xs-6 imgs"><img th:src="${portalHost + '/img/cicm_1.png'}"/></div>
@@ -70,8 +73,18 @@
 			<h3>项目投资</h3>
 			<div class="patent_bottom">
 				<div class="col-xs-6 bg-left">
-					<a href="/portal/search/achievement.html"><span class="note">平衡力距传动增衡器怒我很期待</span><span class="node">使用新型</span></a>
-					<a href="/portal/search/achievement.html"><span class="note">平衡力距传动增衡器怒我很期待</span><span class="node">使用新型</span></a>
+					<ul>
+						<li th:each="it: ${jmrhTechnologyList}">
+							<a th:href="${basePath+ '/portal/detail/achievementDetail.html?id=' + it.id +'&type=' + it.ownerType}">
+								<span class="note" th:text="${it.name}"></span>
+								<span th:if="${it.maturity == '1'}" class="node" >正在研发</span>
+								<span th:if="${it.maturity == '2'}" class="node" >已有样品</span>
+								<span th:if="${it.maturity == '3'}" class="node" >通过小试</span>
+								<span th:if="${it.maturity == '4'}" class="node" >通过中试</span>
+								<span th:if="${it.maturity == '5'}" class="node" >可以量产</span>
+							</a>
+						</li>
+					</ul>
 					<a th:href="${basePath +'/portal/search/achievement.html'}" class="more">MORE</a>
 				</div>
 				<div class="col-xs-6 imgs"><img th:src="${portalHost + '/img/cicm_2.png'}"/></div>
@@ -83,8 +96,15 @@
 			<div class="product_main">
 				<div class="col-xs-6 imgt"><img th:src="${portalHost + '/img/cicm_3.png'}"/></div>
 				<div class="col-xs-6 bg-right">
-					<a href="/portal/search/achievement.html"><span class="note">平衡力距传动增衡器怒我很期待</span><span class="node">使用新型</span></a>
-					<a href="/portal/search/achievement.html"><span class="note">平衡力距传动增衡器怒我很期待</span><span class="node">使用新型</span></a>
+					<ul>
+						<li th:each="it: ${jmrhProjectList}">
+							<a th:href="${basePath+ '/portal/detail/achievementDetail.html?id=' + it.id +'&type=' + it.ownerType}">
+								<span class="note" th:text="${it.name}"></span>
+								<span class="node" th:text="${it.industry}"></span>
+<!-- 								<span class="note" th:text="${it.residenceCity}"></span> -->
+							</a>
+						</li>
+					</ul>
 					<a th:href="${basePath +'/portal/search/achievement.html'}" class="more">MORE</a>
 				</div>			
 			</div>
@@ -209,22 +229,10 @@
                 </div>
                 <div class="national_policy_list">
                     <ul>
-                        <li>
+                        <li th:each="it: ${gjzcNewsList}">
                             <a>
-                                <p><a href="#"><i>[头条]</i> 逆战新版本新武MSR-电离对撞... </a></p>
-                                <span>12/12</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a>
-                                <p><a href="#"><i>[头条]</i> 逆战新版本新武MSR-电离对撞... </a></p>
-                                <span>12/12</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a>
-                                  <p><a href="#"><i>[头条]</i> 逆战新版本新武MSR-电离对撞... </a></p>
-                                <span>12/12</span>
+                                <p><a th:href="${basePath + '/portal/news/newsDetail.html?newsId=' + it.id}" th:text="${it.title}"><i>[头条]</i></a></p>
+                                <span th:text="${#dates.format(it.createTime, 'dd/MM')}"></span>
                             </a>
                         </li>
                     </ul>
@@ -238,22 +246,10 @@
                 </div>
                 <div class="national_policy_list">
                     <ul>
-                        <li>
+                        <li th:each="it: ${dfzcNewsList}">
                             <a>
-                                <p><a href="#"><i>[头条]</i> 逆战新版本新武MSR-电离对撞... </a></p>
-                                <span>12/12</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a>
-                                 <p><a href="#"><i>[头条]</i> 逆战新版本新武MSR-电离对撞... </a></p>
-                                <span>12/12</span>
-                            </a>
-                        </li>
-                        <li>
-                            <a>
-                                <p><a href="#"><i>[头条]</i> 逆战新版本新武MSR-电离对撞... </a></p>
-                                <span>12/12</span>
+                                <p><a th:href="${basePath + '/portal/news/newsDetail.html?newsId=' + it.id}" th:text="${it.title}"><i>[头条]</i></a></p>
+                                <span th:text="${#dates.format(it.createTime, 'dd/MM')}"></span>
                             </a>
                         </li>
                     </ul>
@@ -261,57 +257,12 @@
             </div>
         </div>
     </div>
-<!-- 	<div>
-		<table>
-		    <tr data-th-each="achievement : ${jmrhAchievementList}">
-		        <td data-th-text="${achievement.name}"></td>
-		    </tr>
-		</table>
-		<table>
-		    <tr data-th-each="technology : ${jmrhTechnologyList}">
-		        <td data-th-text="${technology.name}"></td>
-		    </tr>
-		</table>
-		<table>
-		    <tr data-th-each="project : ${jmrhProjectList}">
-		        <td data-th-text="${project.name}"></td>
-		    </tr>
-		</table>
-	</div>
-	<div>
-		<div>合作单位</div>
-		<div>
-			<ul>
-				<li>
-					中国航空研究院
-				</li>
-				<li>
-					中国航空研究院
-				</li>
-				<li>
-					中国航空研究院
-				</li>
-			</ul>
-		</div>
-	</div>
-	<div>
-		<div>政策法规</div>
-		<div>
-			<ul>
-				<li>贯彻中央决策部署加快推进军民融合发展</li>
-				<li>贯彻中央决策部署加快推进军民融合发展</li>
-				<li>贯彻中央决策部署加快推进军民融合发展</li>
-				<li>贯彻中央决策部署加快推进军民融合发展</li>
-				<li>贯彻中央决策部署加快推进军民融合发展</li>
-			</ul>
-		</div>
-	</div> -->
 	<footer>
 		<div th:replace="common::copyright"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost + '/index.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/residentIntegration/residentIntegration.js'}"></script>
 	</div>
 </body>
 </html>