Browse Source

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

albertshaw 8 years ago
parent
commit
3c44be2a55

+ 10 - 9
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -6,6 +6,7 @@ import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -1441,12 +1442,12 @@ public class CognizanceApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "该研究项目费用详情已录入!"));
 				return res;
 			}
-			
+
 			res = disposeActivityYear(res, ac, oac);
 			if (!res.getError().isEmpty()) {
 				return res;
 			}
-			
+
 			oac.setStartDate(ac.getStartDate());
 			oac.setEndDate(ac.getEndDate());
 			oac.setId(UUID.randomUUID().toString());
@@ -2394,11 +2395,12 @@ public class CognizanceApiController extends CertifyApiController {
 			return res;
 		}
 		List<OrgCognizanceLog> list = orgCognizanceLogService.selectOrgCognizanceLogByCid(cid);
-		for (OrgCognizanceLog log : list) {
-			if (OrgCognizanceStatus.getStatus(log.getState()) == OrgCognizanceStatus.SIGN
-					|| OrgCognizanceStatus.getStatus(log.getState()) == OrgCognizanceStatus.CIRCULATION
-					|| OrgCognizanceStatus.getStatus(log.getState()) == OrgCognizanceStatus.SETTLEMENT) {
-				list.remove(log);
+		for (Iterator<OrgCognizanceLog> log = list.iterator(); log.hasNext();) {
+			Integer state = log.next().getState();
+			if (OrgCognizanceStatus.getStatus(state) == OrgCognizanceStatus.SIGN
+					|| OrgCognizanceStatus.getStatus(state) == OrgCognizanceStatus.CIRCULATION
+					|| OrgCognizanceStatus.getStatus(state) == OrgCognizanceStatus.SETTLEMENT) {
+				log.remove();
 			}
 		}
 
@@ -2591,7 +2593,6 @@ public class CognizanceApiController extends CertifyApiController {
 		return fileName;
 	}
 
-
 	// 高企认定
 	private CognizanceDetailBo handleCognizanceDetail(String uid, String cid, Integer year) {
 		return orgCognizanceService.selectCognizanceDetailBo(uid, cid, year);
@@ -2601,7 +2602,7 @@ public class CognizanceApiController extends CertifyApiController {
 	private AnnualReportBo handleAnnualReport(String uid, Integer year) {
 		return orgAnnualReportService.selectAnnualReportBo(uid, year);
 	}
-	
+
 	private Result disposeActivityYear(Result res, OrgActivity ac, OrgActivityCost oac) {
 		Calendar c = Calendar.getInstance();
 		c.setTime(ac.getStartDate());

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

@@ -522,7 +522,7 @@
     <include refid="Base_Column_List" />
     from contract
     where uid = #{uid,jdbcType=VARCHAR}
-    and year = #{year,jdbcType=INTEGER}
+    and cognizance_year = #{year,jdbcType=INTEGER}
     and deleted_sign = 0
   </select>
 </mapper>

File diff suppressed because it is too large
+ 4 - 2
src/main/webapp/WEB-INF/views/common.html


File diff suppressed because it is too large
+ 61 - 25
src/main/webapp/WEB-INF/views/portal/index.html


File diff suppressed because it is too large
+ 3 - 4
src/main/webapp/WEB-INF/views/portal/international/internationalIndex.html


File diff suppressed because it is too large
+ 13 - 14
src/main/webapp/WEB-INF/views/portal/news/newsDetails.html


+ 14 - 14
src/main/webapp/WEB-INF/views/portal/patent.html

@@ -51,13 +51,13 @@
 				<ul id="myTab">
 					<li class="active"><a href="#tab1" data-toggle="tab"> <span>专利技术分析</span>
 					</a> <img th:src="${portalHost + '/img/consulting_atv.png'}" /></li>
-					<li><a href="#tab2" data-toggle="tab"> <span>竞争对手专利分析</span>
+					<li><a href="#tab2" data-toggle="tab"> <span>专利情报分析</span>
 					</a> <img th:src="${portalHost + '/img/consulting_atv.png'}" /></li>
-					<li><a href="#tab3" data-toggle="tab"> <span>行业专利信息分析专利挖掘与布局</span>
+					<li><a href="#tab3" data-toggle="tab"> <span>专利挖掘</span>
 					</a> <img th:src="${portalHost + '/img/consulting_atv.png'}" /></li>
-					<li><a href="#tab4" data-toggle="tab"> <span>专利预警服务</span>
+					<li><a href="#tab4" data-toggle="tab"> <span>专利布局</span>
 					</a> <img th:src="${portalHost + '/img/consulting_atv.png'}" /></li>
-					<li><a href="#tab5" data-toggle="tab"> <span>专利维权确权服务</span>
+					<li><a href="#tab5" data-toggle="tab"> <span>专利预警分析</span>
 					</a> <img th:src="${portalHost + '/img/consulting_atv.png'}" /></li>
 
 				</ul>
@@ -66,40 +66,40 @@
 				<div id="tab1" class="tab-pane in active">
 					<div class="content_info ">
 						<div class="zc_info_txt">
-							<h2>专利情报分析:</h2>
-							<p>专利情报分析是指对来自专利说明书、专利公报中大量的、个别的专利信息进行加工及组合,并利用统计方法或技术手段使这些信息具有纵览全局及预测的功能,并且通过分析将原始的专利信息从量变到质变,使它们由普通的信息上升为企业经营活动中有价值的情报。</p>
+							<h2>专利技术分析:</h2>
+							<p>调查与企业相关产品或技术相关的专利,特别是竞争对手的专利布局及研发动态。从而作为技术参考,跟踪竞争对手的研发方向。</p>
 						</div>
 					</div>
 				</div>
 				<div id="tab2" class="tab-pane">
 					<div class="content_info ">
 						<div class="zc_info_txt">
-							<h2>专利挖掘:</h2>
-							<p>专利挖掘就是从创新成果中提炼出具有专利申请和保护价值的技术创新点和方案。对技术创新成果进行全面、充分、有效的保护,全面梳理并掌握可能具有专利申请价值的各主要技术点及其外围的关联技术,避免出现专利保护的漏洞。</p>
+							<h2>专利情报分析:</h2>
+							<p>专利情报分析是指对来自专利说明书、专利公报中大量的、个别的专利信息进行加工及组合,并利用统计方法或技术手段使这些信息具有纵览全局及预测的功能,并且通过分析将原始的专利信息从量变到质变,使它们由普通的信息上升为企业经营活动中有价值的情报。</p>
 						</div>
 					</div>
 				</div>
 				<div id="tab3" class="tab-pane">
 					<div class="content_info ">
 						<div class="zc_info_txt">
-							<h2>专利布局:</h2>
-							<p>企业综合产业、市场和法律等因素,对专利进行有机结合,涵盖了企业利害相关的时间、地域、技术和产品等维度,构建严密高效的专利保护网,最终形成对企业有利格局的专利组合。</p>
+							<h2>专利挖掘:</h2>
+							<p>专利挖掘就是从创新成果中提炼出具有专利申请和保护价值的技术创新点和方案。对技术创新成果进行全面、充分、有效的保护,全面梳理并掌握可能具有专利申请价值的各主要技术点及其外围的关联技术,避免出现专利保护的漏洞。</p>
 						</div>
 					</div>
 				</div>
 				<div id="tab4" class="tab-pane">
 					<div class="content_info ">
 						<div class="zc_info_txt">
-							<h2>专利预警分析:</h2>
-							<p>专利预警分析便于对技术发展趋势、申请人状况、专利保护地域等专利战略要素进行定性、定量分析,使企业对所在行业领域内的各种发展趋势、竞争态势有一个综合了解,更加全面、有效地利用专利制定战略。</p>
+							<h2>专利布局:</h2>
+							<p>企业综合产业、市场和法律等因素,对专利进行有机结合,涵盖了企业利害相关的时间、地域、技术和产品等维度,构建严密高效的专利保护网,最终形成对企业有利格局的专利组合。</p>
 						</div>
 					</div>
 				</div>
 				<div id="tab5" class="tab-pane">
 					<div class="content_info ">
 						<div class="zc_info_txt">
-							<h2>专利维权确权服务:</h2>
-							<p>调查与企业相关产品或技术相关的专利,特别是竞争对手的专利布局及研发动态。从而作为技术参考,跟踪竞争对手的研发方向。</p>
+							<h2>专利预警分析:</h2>
+							<p>专利预警分析便于对技术发展趋势、申请人状况、专利保护地域等专利战略要素进行定性、定量分析,使企业对所在行业领域内的各种发展趋势、竞争态势有一个综合了解,更加全面、有效地利用专利制定战略。</p>
 						</div>
 					</div>
 				</div>

+ 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">

File diff suppressed because it is too large
+ 114 - 2
src/main/webapp/WEB-INF/views/portal/scienceTechnology/lecture.html


File diff suppressed because it is too large
+ 363 - 2
src/main/webapp/WEB-INF/views/portal/scienceTechnology/star.html