Explorar o código

Merge branch 'test' of jishutao/jitao-server into prod

liliang4869 %!s(int64=7) %!d(string=hai) anos
pai
achega
c9ace40e87

+ 21 - 4
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -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;
 	}
@@ -1204,7 +1222,6 @@ public class WebpageController extends BaseController {
 			List<String> honorPictures = Arrays.asList(honor.split(","));
 			if (honorPictures.size() > 0)
 				modelAndView.addObject("honors", honorPictures);
-
 		}
 		return modelAndView;
 	}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 118 - 1
src/main/webapp/WEB-INF/views/portal/continueHigh.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 113 - 1
src/main/webapp/WEB-INF/views/portal/militaryProject.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 110 - 1
src/main/webapp/WEB-INF/views/portal/practicalPatent.html