Antiloveg 8 years ago
parent
commit
cae821817c

+ 2 - 1
src/main/java/com/goafanti/activity/service/ActivityService.java

@@ -1,11 +1,12 @@
 package com.goafanti.activity.service;
 
+import com.goafanti.activity.bo.ActivityListBo;
 import com.goafanti.common.model.Activity;
 import com.goafanti.core.mybatis.page.Pagination;
 
 public interface ActivityService {
 
-	Pagination<Activity> listActivity(String sTime, String eTime, String name, String host, Integer type, Integer form,
+	Pagination<ActivityListBo> listActivity(String sTime, String eTime, String name, String host, Integer type, Integer form,
 			Integer pNo, Integer pSize);
 
 	void save(Activity a, String startTimeFormattedDate, String endTimeFormattedDate,

+ 3 - 2
src/main/java/com/goafanti/activity/service/impl/ActivityServiceImpl.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.activity.bo.ActivityListBo;
 import com.goafanti.activity.service.ActivityService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.ActivityMapper;
@@ -23,7 +24,7 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<Activity> listActivity(String sTime, String eTime, String name, String host, Integer type,
+	public Pagination<ActivityListBo> listActivity(String sTime, String eTime, String name, String host, Integer type,
 			Integer form, Integer pNo, Integer pSize) {
 
 		Map<String, Object> params = new HashMap<>();
@@ -58,7 +59,7 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
-		return (Pagination<Activity>) findPage("findActivityListByPage", "findActivityCount", params, pNo, pSize);
+		return (Pagination<ActivityListBo>) findPage("findActivityListByPage", "findActivityCount", params, pNo, pSize);
 	}
 
 	@Override

+ 6 - 0
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -111,6 +111,12 @@ public class NewsController extends BaseController {
 		return res;
 	}
 	
+	@RequestMapping(value = "/portal/news/newsDetail", method = RequestMethod.GET)
+	public ModelAndView portalHighTechEvaluateIprInfo(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/newsDetail");
+		return modelview;
+	} 
+	
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {

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

@@ -29,7 +29,7 @@
 			</div>
 			<div class="rt" th:if="${isLogin}">
 				<span>欢迎光临,</span>
-				<a class="login" th:href="${basePath + isAdmin? '/admin/index.html':'/user/account/index.html'}" th:text="${userName}">个人中心</a>
+				<a class="login" th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}" th:text="${userName}">个人中心</a>
 				<a th:href="${basePath + '/user/logout'}">退出</a>
 				<a href="#">导航</a>
 				<a href="#">关于我们</a>