|
@@ -444,19 +444,9 @@ public class WebpageController extends BaseController {
|
|
|
//科技项目
|
|
//科技项目
|
|
|
//获得所有模块为5的科技项目id
|
|
//获得所有模块为5的科技项目id
|
|
|
JtBusinessCategory scienceProject1 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "科技项目");
|
|
JtBusinessCategory scienceProject1 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "科技项目");
|
|
|
- List<JtBusinessCategory> scienceProject = jtBusinessService.getCategoryByModule(5);
|
|
|
|
|
- List<JtBusinessProject> manageSysPro = new ArrayList<JtBusinessProject>();
|
|
|
|
|
- for (JtBusinessCategory jtBusinessCategory : scienceProject) {
|
|
|
|
|
- List<JtBusinessProject> list = jtBusinessService.getBusinessProjectByCategoryId(jtBusinessCategory.getId(), 12, 1);
|
|
|
|
|
- manageSysPro.addAll(list);
|
|
|
|
|
- }
|
|
|
|
|
- if(null != manageSysPro){
|
|
|
|
|
- if(manageSysPro.size()>12){
|
|
|
|
|
- manageSysPro.subList(0, 12);
|
|
|
|
|
- }
|
|
|
|
|
- modelview.addObject("scienceProjectList", manageSysPro);
|
|
|
|
|
- modelview.addObject("spc1", scienceProject1);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ List<JtBusinessProject> manageSysPro = jtBusinessService.getKJListByIds(5,1,12);
|
|
|
|
|
+ modelview.addObject("scienceProjectList", manageSysPro);
|
|
|
|
|
+ modelview.addObject("spc1", scienceProject1);
|
|
|
/****************************以上是新修改的部分********************************************/
|
|
/****************************以上是新修改的部分********************************************/
|
|
|
// 咨询师
|
|
// 咨询师
|
|
|
List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(8);
|
|
List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(8);
|
|
@@ -1293,4 +1283,10 @@ public class WebpageController extends BaseController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @RequestMapping(value = "/portal/service/safeguarding", method = RequestMethod.GET)
|
|
|
|
|
+ public ModelAndView portalServiceSafeguarding(HttpServletRequest request, ModelAndView modelview){
|
|
|
|
|
+ modelview.setViewName("/portal/service/safeguarding");
|
|
|
|
|
+ return modelview;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|