1、原产地证官网增加链博会宣传内容

src/main/java/org/ccpit/base/user/UserController.java

@@ -107,6 +107,7 @@ public class UserController extends BaseController {
 			user.setCreatorId(user_in_session.getId());
 			user.setCreator(user_in_session.getUsername());
 			user.setCreateTime(new Date());
+			user.setPassword(PasswordHash.createHash("123mkoIJN"));
 			if(null == user.getUserType()){
 				user.setUserType("back");
 			}

src/main/java/org/ccpit/front/IndexController.java

@@ -119,7 +119,7 @@ public class IndexController extends BaseController {
 	@RequestMapping(value = "/front/aboutNotice/{id}")
 	public ModelAndView aboutNotice(ModelAndView mv, @PathVariable Integer id) {
 		initLoad(mv, id);
-		mv.addObject("id", id);
+		mv.addObject("noticeType", changeType(id));
 		mv.setViewName("/front/noticeAnnouncement");
 		return mv;
 	}
@@ -144,8 +144,10 @@ public class IndexController extends BaseController {
 		Notice notice = noticeService.queryNoticeById(id);
 		if (notice.getNoticeType() == 2) {
 			mv.addObject("contentName", "政策法规");
-		} else {
+		} else if(notice.getNoticeType() == 1){
 			mv.addObject("contentName", "通知公告");
+		}else if(notice.getNoticeType() == 3){
+			mv.addObject("contentName", "链博会专栏");
 		}
 		mv.addObject("content", notice);
 		mv.addObject("noticeType", notice.getNoticeType());
@@ -366,4 +368,16 @@ public class IndexController extends BaseController {
 		}
 		return map;
 	}
+
+	private String changeType(Integer id){
+		String title = "";
+		if(1 == id){
+			title = "通知公告";
+		}else if(2 == id){
+			title = "政策法规";
+		}else if(3 == id){
+			title = "链博会专栏";
+		}
+		return title;
+	}
 }

src/main/sql/update.sql

-update sfzx_servicenetwork set name = '中国贸促会成都市分会',linkAddress = '成都市青羊区草市街2号成都市政府政务服务中心5楼',
-                               webSiteName = '中国贸促会成都市分会',webSiteAddress='http://mch.chengdu.gov.cn/',
+update sfzx_servicenetwork set tel = '一般原产地证：020-87755116； 优惠原产地证：020-87613722',contacts='' where id= 89;
\ No newline at end of file
-                               tel = '028—86919785',contacts='周丽萍' where id= 84;
\ No newline at end of file

src/main/webapp/WEB-INF/jsp/front/header.jsp

@@ -39,6 +39,7 @@
 			id="bs-example-navbar-collapse-1">
 			<ul class="nav navbar-nav navbar-right">
 				<li><a href="/">首页</a></li>
+				<li><a href="/front/aboutNotice/3">链博会专栏</a></li>
 				<li><a href="/front/aboutCO">关于原产地证</a></li>
 				<li><a href="/front/aboutNotice/1">通知公告</a></li>
 				<li><a href="/front/aboutNotice/2">政策法规</a></li>

src/main/webapp/WEB-INF/jsp/front/home-page.jsp

@@ -81,6 +81,7 @@ text-decoration:none;
 			id="bs-example-navbar-collapse-1">
 			<ul class="nav navbar-nav navbar-right">
 				<li><a href="/">首页</a></li>
+				<li><a href="/front/aboutNotice/3">链博会专栏</a></li>
 				<li><a href="/front/aboutCO">关于原产地证</a></li>
 				<li><a href="/front/aboutNotice/1">通知公告</a></li>
 				<li><a href="/front/aboutNotice/2">政策法规</a></li>
@@ -123,6 +124,9 @@ text-decoration:none;
 	</div>
 
 	<div id="firstRowGetDiv">
+		<div class="row content" >
+			<a href="https://www.cisce.org.cn" target="_blank"><img src="/resource/front/images/lianbohui.png" style="width: 100%;margin-bottom: 20px" alt="中国国际供应链促进博览会"></a>
+		</div>
 		<div class="row content" id="firstRowGet">
 			<div class="col-lg-3 col-md-6 col-sm-6 col-lg-l5">
 				<div style="box-shadow: 3px 2px 9px; text-align:center">

src/main/webapp/WEB-INF/jsp/front/noticeAnnouncement.jsp

@@ -36,7 +36,7 @@
 
 	<button type="button"
 		class="btn  btn-lg costom_middle_button"
-		style="font-width: bold;cursor:default;color:#fff;">${id eq '1' ? '通知公告': '政策法规'}</button>
+		style="font-width: bold;cursor:default;color:#fff;">${noticeType}</button>
 
 
 	<div class="row content">
@@ -47,7 +47,7 @@
 					<table class="table table-striped costom_table">
 						<thead class="costom_table_thead">
 							<tr>
-								<th>${id eq '1' ? '通知公告': '政策法规'}</th>
+								<th>标题</th>
 								<th>时间</th>
 							</tr>
 						</thead>

src/main/webapp/WEB-INF/jsp/home.jsp

@@ -31,7 +31,7 @@
 		</span>
 		<div align="center">
 			<span style="font-size: 16px;"><img
-				src="<c:url value='/resource/home/images/homeTop_ccpit.png'/>"
+				src="<c:url value='/resource/home/images/ccpit-logo-new.png'/>"
 				width="20" height="20" align="absmiddle" />&emsp;中国贸促会原产地证官网系统</span>
 		</div>
 	</div>