|
@@ -737,14 +737,14 @@ public class WebpageController extends BaseController {
|
|
|
p.setTitleImg(p.getTitleImg().substring(0, p.getTitleImg().indexOf(",")));
|
|
p.setTitleImg(p.getTitleImg().substring(0, p.getTitleImg().indexOf(",")));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- modelview.addObject("policys", policies);
|
|
|
|
|
|
|
+ modelview.addObject("policys", policies);//政策
|
|
|
List<News> newsList = (List<News>) newsService
|
|
List<News> newsList = (List<News>) newsService
|
|
|
.listNews(0, null, null, null, null, null, null, 1, 3, "2", null, null).getList();
|
|
.listNews(0, null, null, null, null, null, null, 1, 3, "2", null, null).getList();
|
|
|
- modelview.addObject("news", newsList);
|
|
|
|
|
|
|
+ modelview.addObject("news", newsList);//资讯
|
|
|
//
|
|
//
|
|
|
List<News> subscriptions = (List<News>) newsService
|
|
List<News> subscriptions = (List<News>) newsService
|
|
|
.listNews(99, null, null, null, null, null, null, 1, 4, "2", null, null).getList();
|
|
.listNews(99, null, null, null, null, null, null, 1, 4, "2", null, null).getList();
|
|
|
- modelview.addObject("subscription", subscriptions);
|
|
|
|
|
|
|
+ modelview.addObject("subscription", subscriptions);//技淘观点精选
|
|
|
|
|
|
|
|
if (subscriptions != null && subscriptions.size() > 0 && subscriptions.get(0).getSourceUrl() != null
|
|
if (subscriptions != null && subscriptions.size() > 0 && subscriptions.get(0).getSourceUrl() != null
|
|
|
&& subscriptions.get(0).getSourceUrl().contains(".")) {
|
|
&& subscriptions.get(0).getSourceUrl().contains(".")) {
|
|
@@ -1302,4 +1302,26 @@ public class WebpageController extends BaseController {
|
|
|
return modelview;
|
|
return modelview;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 政策 资讯 百科
|
|
|
|
|
+ * @param policy
|
|
|
|
|
+ * @param pageNo
|
|
|
|
|
+ * @param pageSize
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @RequestMapping(value="/portal/policyAndNewsList", method = RequestMethod.GET)
|
|
|
|
|
+ @ResponseBody
|
|
|
|
|
+ public Result policyAndNewsList(Policy policy, Integer pageNo, Integer pageSize){
|
|
|
|
|
+ Result res = new Result();
|
|
|
|
|
+ //如果type是null 查看政策和新闻等的数据
|
|
|
|
|
+ if(null == policy.getType()){
|
|
|
|
|
+ res.setData(policyService.searchPolicyAndNewsList(policy, pageNo, pageSize));
|
|
|
|
|
+ }else if(policy.getType() >= 0){//资讯\观点\知产 news表
|
|
|
|
|
+ res.setData(newsService.listNews(policy.getType(), null, null, null, null, null, null, pageNo, pageSize, "2", null, null).getList());
|
|
|
|
|
+ }else{//政策
|
|
|
|
|
+ res.setData(policyService.searchPolicy(policy.getTitle(), 2, null, null, null, pageNo, pageSize, policy.getProvince()));
|
|
|
|
|
+ }
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|