|
|
@@ -266,19 +266,37 @@ public class WebpageController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/portal/continueHigh", method = RequestMethod.GET)
|
|
|
- public ModelAndView portalContinueHigh(HttpServletRequest request, ModelAndView modelview) {
|
|
|
+ public ModelAndView portalContinueHigh(HttpServletRequest request, ModelAndView modelview) {
|
|
|
+ JtBusinessCategory bc1=jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企诊断");
|
|
|
+ JtBusinessCategory bc2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企认定");
|
|
|
+ JtBusinessCategory bc3=jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企培育");
|
|
|
+ modelview.addObject("gqc1", bc1);
|
|
|
+ modelview.addObject("gqc2", bc2);
|
|
|
+ modelview.addObject("gqc3", bc3);
|
|
|
modelview.setViewName("/portal/continueHigh");
|
|
|
return modelview;
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/portal/militaryProject", method = RequestMethod.GET)
|
|
|
- public ModelAndView portalMilitaryProject(HttpServletRequest request, ModelAndView modelview) {
|
|
|
+ public ModelAndView portalMilitaryProject(HttpServletRequest request, ModelAndView modelview) {
|
|
|
+ JtBusinessCategory bc1=jtBusinessService.getBusinessCategoryByLayerAndName(2, "武器装备科研生产保密资格认证");
|
|
|
+ JtBusinessCategory bc2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "武器装备科研生产许可证认证");
|
|
|
+ JtBusinessCategory bc3=jtBusinessService.getBusinessCategoryByLayerAndName(2, "装备承制单位资格认证");
|
|
|
+ modelview.addObject("gqc1", bc1);
|
|
|
+ modelview.addObject("gqc2", bc2);
|
|
|
+ modelview.addObject("gqc3", bc3);
|
|
|
modelview.setViewName("/portal/militaryProject");
|
|
|
return modelview;
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/portal/practicalPatent", method = RequestMethod.GET)
|
|
|
- public ModelAndView portalPracticalPatent(HttpServletRequest request, ModelAndView modelview) {
|
|
|
+ public ModelAndView portalPracticalPatent(HttpServletRequest request, ModelAndView modelview) {
|
|
|
+ JtBusinessCategory bc1=jtBusinessService.getBusinessCategoryByLayerAndName(2, "发明专利");
|
|
|
+ JtBusinessCategory bc2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "商标注册");
|
|
|
+ JtBusinessCategory bc3=jtBusinessService.getBusinessCategoryByLayerAndName(2, "软著申请");
|
|
|
+ modelview.addObject("gqc1", bc1);
|
|
|
+ modelview.addObject("gqc2", bc2);
|
|
|
+ modelview.addObject("gqc3", bc3);
|
|
|
modelview.setViewName("/portal/practicalPatent");
|
|
|
return modelview;
|
|
|
}
|
|
|
@@ -1190,21 +1208,22 @@ public class WebpageController extends BaseController {
|
|
|
return modelAndView;
|
|
|
}
|
|
|
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
- @RequestMapping(value = "/portal/companyProfile")
|
|
|
+
|
|
|
+
|
|
|
+ @RequestMapping(value = "/portal/facilitatorDetails")
|
|
|
public ModelAndView companyProfile(HttpServletRequest request, ModelAndView modelAndView, String uid) {
|
|
|
- modelAndView.setViewName("/portal/companyProfile");
|
|
|
+ modelAndView.setViewName("/portal/facilitator");
|
|
|
+
|
|
|
OrgIdentityBo org = organizationIdentityService.selectOrgIdentityBoByUserId(uid);
|
|
|
modelAndView.addObject("org", org);
|
|
|
- List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
|
|
|
+ /*List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
|
|
|
.getProjects(null,null, null, null, 12, 1, 0, 2, null, null, 0, 0, uid).getList();
|
|
|
- modelAndView.addObject("jtProjects", projectResults);
|
|
|
+ modelAndView.addObject("jtProjects", projectResults);*/
|
|
|
String honor = org.getHonorPicture();
|
|
|
if (honor != null && honor.contains(".")) {
|
|
|
List<String> honorPictures = Arrays.asList(honor.split(","));
|
|
|
if (honorPictures.size() > 0)
|
|
|
modelAndView.addObject("honors", honorPictures);
|
|
|
-
|
|
|
}
|
|
|
return modelAndView;
|
|
|
}
|
|
|
@@ -1461,4 +1480,5 @@ public class WebpageController extends BaseController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|