|
|
@@ -323,7 +323,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.setViewName("/portal/service/serviceIndex");
|
|
|
//政策
|
|
|
// List<PolicyEntity>policyEntities=achievementService.getIntellectualProperty(8);
|
|
|
- List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_tech_service_index", 1, 8).getList();
|
|
|
+ List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_tech_service_index", 1, 8,null).getList();
|
|
|
modelview.addObject("policyList",policies);
|
|
|
//新闻
|
|
|
List<News>news=(List<News>) newsService.portalNewsList(5, 1, null, null, null, null,2).getList();
|
|
|
@@ -643,12 +643,12 @@ public class WebpageController extends BaseController {
|
|
|
if(project.getMinImgUrl()!=null && project.getMinImgUrl().length()<=0)project.setMinImgUrl(null);
|
|
|
}
|
|
|
modelview.addObject("projects",jtBusinessProjects);
|
|
|
- List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 2).getList();
|
|
|
+ List<PolicyResult>policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 2,null).getList();
|
|
|
modelview.addObject("policys",policies);
|
|
|
- List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, "web_index").getList();
|
|
|
+ List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, null).getList();
|
|
|
modelview.addObject("news",newsList);
|
|
|
//
|
|
|
- List<News> subscriptions=(List<News>) newsService.listNews(0, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
|
|
|
+ List<News> subscriptions=(List<News>) newsService.listNews(99, null, null, null, null, null, null, 1, 4, "2", null, null).getList();
|
|
|
modelview.addObject("subscription",subscriptions);
|
|
|
|
|
|
if(subscriptions!=null && subscriptions.size()>0 && subscriptions.get(0).getSourceUrl()!=null && subscriptions.get(0).getSourceUrl().contains(".")) {
|
|
|
@@ -827,7 +827,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("practicalTechnology",practicalTechnology);
|
|
|
|
|
|
// List<PolicyEntity>intellectualPropertyPolicyList=achievementService.getIntellectualProperty(5);
|
|
|
- List<PolicyResult> policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 5).getList();
|
|
|
+ List<PolicyResult> policies=(List<PolicyResult>) policyService.searchPolicy("", 2, null, null, "web_index", 1, 5,null).getList();
|
|
|
modelview.addObject("policyList",policies);
|
|
|
return modelview;
|
|
|
}
|
|
|
@@ -914,19 +914,18 @@ public class WebpageController extends BaseController {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/portal/technologyTrading/tradingIndex")
|
|
|
public ModelAndView patentTrading(HttpServletRequest request, ModelAndView modelAndView) {
|
|
|
- String showLocation="web_demand_trading_index";
|
|
|
String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
|
|
|
modelAndView.setViewName("/portal/technologyTrading/tradingIndex");
|
|
|
//成果
|
|
|
- List<AchievementObject>achievementObjects=achievementService.getHotAchievements(4, url, showLocation);
|
|
|
+ List<AchievementObject>achievementObjects=achievementService.getHotAchievements(4, url, "web_achievement_trading_index");
|
|
|
modelAndView.addObject("achievement",achievementObjects);
|
|
|
|
|
|
//需求
|
|
|
- List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,showLocation);
|
|
|
+ List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,"web_demand_trading_index");
|
|
|
modelAndView.addObject("demand",demandListBos);
|
|
|
|
|
|
//政策
|
|
|
- List<Policy> policies=(List<Policy>) policyService.searchPolicy(null, 2, null, null, "web_index", 1, 5).getList();
|
|
|
+ List<Policy> policies=(List<Policy>) policyService.searchPolicy(null, 2, null, null, "web_index", 1, 5,null).getList();
|
|
|
modelAndView.addObject("policy",policies);
|
|
|
|
|
|
//专家
|
|
|
@@ -1083,7 +1082,7 @@ public class WebpageController extends BaseController {
|
|
|
if (StringUtils.isNumeric(pageSize)) {
|
|
|
pSize = Integer.parseInt(pageSize);
|
|
|
}
|
|
|
- res.setData(policyService.searchPolicy( keyword,2, null, null, "web_index", pNo, pSize));
|
|
|
+ res.setData(policyService.searchPolicy( keyword,2, null, null, "web_index", pNo, pSize,provinceId));
|
|
|
return res;
|
|
|
}
|
|
|
}
|