Browse Source

SC网页修改

anderx 7 years ago
parent
commit
199b6adc84

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

@@ -448,7 +448,7 @@
   
   <select id="selectById" parameterType="String" resultType="com.goafanti.sc.bo.inputAchievement">
 		select a.id,a.name,date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createDateFormat,a.summary,a.`type`,a.industry,
-c.name as industryName,a.introduce,a.owner_name as ownerName,b.introduce as pIntroduce,a.patent_number as patentNumber,
+a.introduce,a.owner_name as ownerName,b.introduce as pIntroduce,a.patent_number as patentNumber,
 a.publisher_id as publisherId,a.reserve_butt_mode as reserveButtMode,a.transfer_price as transferPrice,
 b.telephone,b.contacts as publisherName,b.email,b.zip_code as zipCode,b.province,b.city,d.name as provinceName,e.name as cityName
 from sc_achievement a left join sc_publisher b on a.publisher_id=b.id

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

@@ -455,7 +455,7 @@
   </select>
   
   <select id="selectById" parameterType="String" resultType="com.goafanti.sc.bo.inputDemands">
-  	select a.id,a.name,a.type,a.introduce,a.summary,a.industry,c.name as industryName,
+  	select a.id,a.name,a.type,a.introduce,a.summary,a.industry,
 		a.reserve_butt_mode as reserveButtMode,a.reserve_butt_unit as reserveButtUnit,a.reserve_solve_mode as reserveSolveMode,
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createDateFormat,a.investment_cost as investmentCost,
 		b.name as pname,b.province,d.name as provinceName,b.city,e.name as cityName,b.email, b.zip_code as zipCode,

+ 2 - 1
src/main/java/com/goafanti/sc/controller/ScWebController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.model.ScDemand;
 import com.goafanti.sc.bo.inputAchievement;
 import com.goafanti.sc.bo.inputDemands;
@@ -17,7 +18,7 @@ import com.goafanti.sc.service.ScDemandService;
 
 
 @Controller
-public class ScWebController {
+public class ScWebController extends BaseController{
 	@Resource
     private ScAchievementService		scAchievementService;
 	@Resource

+ 19 - 1
src/main/java/com/goafanti/sc/service/impl/ScAchievementServiceImpl.java

@@ -94,7 +94,25 @@ public class ScAchievementServiceImpl extends BaseMybatisDao<ScAchievementMapper
 
 	@Override
 	public inputAchievement AchievementDetails(String id) {
-		return scAchievementMapper.selectById(id);
+			inputAchievement s=scAchievementMapper.selectById(id);
+			if(s!=null&&s.getIndustry()!=null){
+				if (s.getIndustry().equals("1")) {
+						s.setIndustryName( "先进制造与自动化");
+				}if (s.getIndustry().equals("2")) {
+					s.setIndustryName( "电子信息技术");
+				}if (s.getIndustry().equals("3")) {
+					s.setIndustryName( "新材料技术");
+				}if (s.getIndustry().equals("4")) {
+					s.setIndustryName( "生物与新药");
+				}if (s.getIndustry().equals("6")) {
+					s.setIndustryName( "资源与环境");
+				}if (s.getIndustry().equals("7")) {
+					s.setIndustryName( "新能源");
+					}
+			}
+				
+			return s;
+		
 	}
 	
 	

+ 18 - 2
src/main/java/com/goafanti/sc/service/impl/ScDmandServiceImpl.java

@@ -108,8 +108,24 @@ public class ScDmandServiceImpl extends BaseMybatisDao<ScDemandMapper> implement
 
 	@Override
 	public inputDemands demandDetails(String id) {
-		
-		return scDemandMapper.selectById(id);
+		inputDemands s=scDemandMapper.selectById(id);
+		if(s!=null&&s.getIndustry()!=null){
+			if (s.getIndustry().equals("1")) {
+					s.setIndustryName( "先进制造与自动化");
+			}if (s.getIndustry().equals("2")) {
+				s.setIndustryName( "电子信息技术");
+			}if (s.getIndustry().equals("3")) {
+				s.setIndustryName( "新材料技术");
+			}if (s.getIndustry().equals("4")) {
+				s.setIndustryName( "生物与新药");
+			}if (s.getIndustry().equals("6")) {
+				s.setIndustryName( "资源与环境");
+			}if (s.getIndustry().equals("7")) {
+				s.setIndustryName( "新能源");
+				}
+		}
+
+		return s;
 	}
 
 	@Override

+ 6 - 4
src/main/webapp/WEB-INF/views/sc/achievement.html

@@ -7,7 +7,7 @@
 		<!-- <link rel="stylesheet" href="../../src/css/bootstrap.css""/>
 		<link rel="stylesheet" href="../../src/css/sichuan/detail.css""/> -->
 		<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-		<link th:href="${portalHost + '/index.css'}" rel="stylesheet">
+		<link th:href="${portalHost + '/sichuan/achievement.css'}" rel="stylesheet">
 	</head>
 	<body>
 		<div class="container cont">
@@ -93,7 +93,7 @@
 				</div>
 			</div> 
 			<div class="row">
-				<a href="#">
+				<a th:href="'message?id='+${achievementList.id}+'&sourceType=0'">
 					<button  class="btn btn-block btn-success tiaozhuan">
 						我要留言
 					</button >
@@ -103,6 +103,8 @@
 	</body>
 	<!-- <script type="text/javascript" src="../../src/js/jquery-2.1.0.js"></script>
 	<script type="text/javascript" src="../../src/js/bootstrap.min.js"></script> -->
-	<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost + '/index.js'}"></script>
+		<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/sichuan/achievement.js'}"></script>
+		</div>
 </html>

+ 7 - 4
src/main/webapp/WEB-INF/views/sc/demand.html

@@ -3,9 +3,8 @@
 	<head>
 		<meta charset="UTF-8">
 		<title></title>
-		<!-- <meta name="viewport" content="width=device-width",initial-scale=1.0,user-scalable="yes"/>
-		<link rel="stylesheet" href="../../src/css/bootstrap.css""/>
-		<link rel="stylesheet" href="../../src/css/sichuan/detail.css""/> -->
+		<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+		<link th:href="${portalHost + '/sichuan/achievement.css'}" rel="stylesheet">
 	</head>
 	<body>
 		<div class="container cont">
@@ -84,7 +83,7 @@
 				</div>
 			</div> 
 			<div class="row">
-				<a href="#">
+				<a th:href="'message?id='+${demandList.id}+'&sourceType=1'">
 					<button  class="btn btn-block btn-success tiaozhuan">
 						我要留言
 					</button >
@@ -94,4 +93,8 @@
 	</body>
 	<!-- <script type="text/javascript" src="../../src/js/jquery-2.1.0.js"></script>
 	<script type="text/javascript" src="../../src/js/bootstrap.min.js"></script> -->
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/sichuan/achievement.js'}"></script>
+		</div>
 </html>

+ 7 - 6
src/main/webapp/WEB-INF/views/sc/man.html

@@ -3,9 +3,8 @@
 	<head>
 		<meta charset="UTF-8">
 		<title></title>
-	<!-- 	<meta name="viewport" content="width=device-width",initial-scale=1.0,user-scalable="yes"/>
-		<link rel="stylesheet" href="../../src/css/bootstrap.css""/>
-		<link rel="stylesheet" href="../../src/css/sichuan/detail.css""/> -->
+	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+		<link th:href="${portalHost + '/sichuan/achievement.css'}" rel="stylesheet">
 	</head>
 	<body>
 		<div class="container cont">
@@ -96,7 +95,7 @@
 				</div>
 			</div> 
 			<div class="row">
-				<a href="#">
+				<a th:href="'message?id='+${demandList.id}+'&sourceType=1'">
 					<button  class="btn btn-block btn-success tiaozhuan">
 						我要留言
 					</button >
@@ -104,6 +103,8 @@
 			</div>
 		</div>
 	</body>
-	<script type="text/javascript" src="../../src/js/jquery-2.1.0.js"></script>
-	<script type="text/javascript" src="../../src/js/bootstrap.min.js"></script>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/sichuan/achievement.js'}"></script>
+		</div>
 </html>

+ 7 - 5
src/main/webapp/WEB-INF/views/sc/words.html

@@ -3,12 +3,11 @@
 	<head>
 		<meta charset="UTF-8">
 		<title></title>
-		<meta name="viewport" content="width=device-width",initial-scale=1.0,user-scalable="yes"/>
-		<!-- <link rel="stylesheet" href="../../src/css/bootstrap.css""/>
-		<link rel="stylesheet" href="../../src/css/sichuan/detail.css""/> -->
+		<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+		<link th:href="${portalHost + '/sichuan/achievement.css'}" rel="stylesheet">
 	</head>
 	<body>
-		<form class="form-horizontal">
+		
 			<div class="container cont">
 				<div class="row">
 					<div class="col-xs-12 liuyan">
@@ -62,8 +61,11 @@
 					</a>
 				</div>
 			</div>
-		</form>
 	</body>
 	<!-- <script type="text/javascript" src="../../src/js/jquery-2.1.0.js"></script>
 	<script type="text/javascript" src="../../src/js/bootstrap.min.js"></script> -->
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/sichuan/achievement.js'}"></script>
+		</div>
 </html>