|
|
@@ -648,7 +648,7 @@ public class WebpageController extends BaseController {
|
|
|
List<News>newsList=(List<News>) newsService.listNews(0, null, null, null, null, null, 1, 1, 3, "2", null, "web_index").getList();
|
|
|
modelview.addObject("news",newsList);
|
|
|
//
|
|
|
- List<News> subscriptions=(List<News>) newsService.listNews(99, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
|
|
|
+ List<News> subscriptions=(List<News>) newsService.listNews(0, null, null, null, null, null, null, 1, 4, "2", null, "web_index").getList();
|
|
|
modelview.addObject("subscription",subscriptions);
|
|
|
|
|
|
if(subscriptions!=null && subscriptions.size()>0 && subscriptions.get(0).getSourceUrl()!=null && subscriptions.get(0).getSourceUrl().contains(".")) {
|
|
|
@@ -875,26 +875,26 @@ public class WebpageController extends BaseController {
|
|
|
|
|
|
//最新发布
|
|
|
List<JtBusinessProjectResult>recents=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(null, null, null, 4, 1,
|
|
|
- 1, 2, 1, null, 0, 1,null).getList();
|
|
|
+ 1, 2, 1, null, 0, 0,null).getList();
|
|
|
modelAndView.addObject("recent",recents);
|
|
|
|
|
|
//专利服务-商标服务-版权服务
|
|
|
for(JtBusinessCategoryBo c:categoryBos) {
|
|
|
if("专利服务".equals(c.getTopLevel())){
|
|
|
List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
|
|
|
- null, 3, 1, 1, 2, 1, null, 0, 1,null).getList();
|
|
|
+ null, 3, 1, 1, 2, 1, null, 0, 0,null).getList();
|
|
|
modelAndView.addObject("patentService",res);
|
|
|
modelAndView.addObject("patentTopId",c.getTopLevelId());
|
|
|
}
|
|
|
else if("商标服务".equals(c.getTopLevel())){
|
|
|
List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
|
|
|
- null, 4, 1, 1, 2, 1, null, 0, 1,null).getList();
|
|
|
+ null, 4, 1, 1, 2, 1, null, 0, 0,null).getList();
|
|
|
modelAndView.addObject("branchService",res);
|
|
|
modelAndView.addObject("branchTopId",c.getTopLevelId());
|
|
|
}
|
|
|
else if("版权服务".equals(c.getTopLevel())){
|
|
|
List<JtBusinessProjectResult>res=(List<JtBusinessProjectResult>) jtBusinessService.getProjects(c.getTopLevelId(), null,
|
|
|
- null, 3, 1, 1, 2, 1, null, 0, 1,null).getList();
|
|
|
+ null, 3, 1, 1, 2, 1, null, 0, 0,null).getList();
|
|
|
modelAndView.addObject("copyrightService",res);
|
|
|
modelAndView.addObject("copyrightTopId",c.getTopLevelId());
|
|
|
}
|
|
|
@@ -914,7 +914,7 @@ public class WebpageController extends BaseController {
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/portal/technologyTrading/tradingIndex")
|
|
|
public ModelAndView patentTrading(HttpServletRequest request, ModelAndView modelAndView) {
|
|
|
- String showLocation="web_achievement_main";
|
|
|
+ String showLocation="web_demand_trading_index";
|
|
|
String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
|
|
|
modelAndView.setViewName("/portal/technologyTrading/tradingIndex");
|
|
|
//成果
|
|
|
@@ -922,7 +922,7 @@ public class WebpageController extends BaseController {
|
|
|
modelAndView.addObject("achievement",achievementObjects);
|
|
|
|
|
|
//需求
|
|
|
- List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,"web_demand_main");
|
|
|
+ List<DemandListBo>demandListBos=demandService.getHotDemand(2, url,showLocation);
|
|
|
modelAndView.addObject("demand",demandListBos);
|
|
|
|
|
|
//政策
|
|
|
@@ -1068,5 +1068,22 @@ public class WebpageController extends BaseController {
|
|
|
res.setData(newsService.portalNewsList(pSize, pNo, type, hot, provinceId, keyword,2));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 政策列表
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/portal/policy/list", method = RequestMethod.GET)
|
|
|
+ @ResponseBody
|
|
|
+ public Result policyList(Integer type, String pageSize, String pageNo, Integer hot, Integer provinceId,
|
|
|
+ String keyword) {
|
|
|
+ Result res = new Result();
|
|
|
+ Integer pNo = 1, pSize = 4;
|
|
|
+ if (StringUtils.isNumeric(pageNo)) {
|
|
|
+ pNo = Integer.parseInt(pageNo);
|
|
|
+ }
|
|
|
+ if (StringUtils.isNumeric(pageSize)) {
|
|
|
+ pSize = Integer.parseInt(pageSize);
|
|
|
+ }
|
|
|
+ res.setData(policyService.searchPolicy( keyword,2, null, null, "web_index", pNo, pSize));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
}
|