|
@@ -1,19 +1,20 @@
|
|
|
package com.goafanti.common.controller;
|
|
package com.goafanti.common.controller;
|
|
|
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
import org.apache.commons.lang3.time.DateFormatUtils;
|
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
import com.goafanti.achievement.service.AchievementInterestService;
|
|
import com.goafanti.achievement.service.AchievementInterestService;
|
|
|
import com.goafanti.achievement.service.AchievementService;
|
|
import com.goafanti.achievement.service.AchievementService;
|
|
|
import com.goafanti.banners.enums.BannersType;
|
|
import com.goafanti.banners.enums.BannersType;
|
|
@@ -315,7 +316,7 @@ public class WebpageController extends BaseController {
|
|
|
/**
|
|
/**
|
|
|
* 服务汇
|
|
* 服务汇
|
|
|
*/
|
|
*/
|
|
|
- @SuppressWarnings("unchecked")
|
|
|
|
|
|
|
+ @SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/portal/service/serviceIndex", method = RequestMethod.GET)
|
|
|
public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
public ModelAndView portalServiceServiceIndex(HttpServletRequest request, ModelAndView modelview) {
|
|
|
modelview.setViewName("/portal/service/serviceIndex");
|
|
modelview.setViewName("/portal/service/serviceIndex");
|
|
@@ -328,8 +329,8 @@ public class WebpageController extends BaseController {
|
|
|
List<News> news = (List<News>) newsService.portalNewsList(5, 1, null, null, null, null, 2).getList();
|
|
List<News> news = (List<News>) newsService.portalNewsList(5, 1, null, null, null, null, 2).getList();
|
|
|
modelview.addObject("newsList", news);
|
|
modelview.addObject("newsList", news);
|
|
|
// 高企服务
|
|
// 高企服务
|
|
|
- JtBusinessCategory gaoqi = jtBusinessService.getBusinessCategoryByLayerAndName(1, "高企服务");
|
|
|
|
|
- JtBusinessCategory gaoqi2 = jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企服务");
|
|
|
|
|
|
|
+ /*JtBusinessCategory gaoqi = jtBusinessService.getBusinessCategoryByLayerAndName(1, "高新技术企业服务");
|
|
|
|
|
+ JtBusinessCategory gaoqi2 = jtBusinessService.getBusinessCategoryByLayerAndName(2, "高新技术企业服务");
|
|
|
if (gaoqi2 != null) {
|
|
if (gaoqi2 != null) {
|
|
|
List<JtBusinessProject> gaoqiList = jtBusinessService.getBusinessProjectByCategoryId(gaoqi2.getId(), 6,
|
|
List<JtBusinessProject> gaoqiList = jtBusinessService.getBusinessProjectByCategoryId(gaoqi2.getId(), 6,
|
|
|
null);
|
|
null);
|
|
@@ -354,7 +355,7 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("zscqc1", zscqgb);
|
|
modelview.addObject("zscqc1", zscqgb);
|
|
|
}
|
|
}
|
|
|
// 企业认证
|
|
// 企业认证
|
|
|
- JtBusinessCategory qiyerenzheng = jtBusinessService.getBusinessCategoryByLayerAndName(1, "企业认证");
|
|
|
|
|
|
|
+ JtBusinessCategory qiyerenzheng = jtBusinessService.getBusinessCategoryByLayerAndName(1, "企业资质认定");
|
|
|
if (qiyerenzheng != null) {
|
|
if (qiyerenzheng != null) {
|
|
|
List<JtBusinessCategory> qyrzCategories = jtBusinessService
|
|
List<JtBusinessCategory> qyrzCategories = jtBusinessService
|
|
|
.getBusinessCategoryBySuperId(qiyerenzheng.getId(), 2);
|
|
.getBusinessCategoryBySuperId(qiyerenzheng.getId(), 2);
|
|
@@ -363,8 +364,8 @@ public class WebpageController extends BaseController {
|
|
|
modelview.addObject("qyrzc1", qiyerenzheng);
|
|
modelview.addObject("qyrzc1", qiyerenzheng);
|
|
|
}
|
|
}
|
|
|
// 管理体系
|
|
// 管理体系
|
|
|
- JtBusinessCategory manageSys = jtBusinessService.getBusinessCategoryByLayerAndName(1, "管理体系");
|
|
|
|
|
- JtBusinessCategory manageSys2 = jtBusinessService.getBusinessCategoryByLayerAndName(2, "管理体系");
|
|
|
|
|
|
|
+ JtBusinessCategory manageSys = jtBusinessService.getBusinessCategoryByLayerAndName(1, "管理体系认证");
|
|
|
|
|
+ JtBusinessCategory manageSys2 = jtBusinessService.getBusinessCategoryByLayerAndName(2, "管理体系认证");
|
|
|
if (manageSys2 != null) {
|
|
if (manageSys2 != null) {
|
|
|
List<JtBusinessProject> manageSysPro = jtBusinessService.getBusinessProjectByCategoryId(manageSys2.getId(),
|
|
List<JtBusinessProject> manageSysPro = jtBusinessService.getBusinessProjectByCategoryId(manageSys2.getId(),
|
|
|
18, null);
|
|
18, null);
|
|
@@ -379,7 +380,60 @@ public class WebpageController extends BaseController {
|
|
|
.getBusinessProjectByCategoryId(scienceProject2.getId(), 12, AFTConstants.YES);
|
|
.getBusinessProjectByCategoryId(scienceProject2.getId(), 12, AFTConstants.YES);
|
|
|
modelview.addObject("scienceProjectList", scienceProjects);
|
|
modelview.addObject("scienceProjectList", scienceProjects);
|
|
|
modelview.addObject("spc1", scienceProject);
|
|
modelview.addObject("spc1", scienceProject);
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ */
|
|
|
|
|
+ /*************以下是重新查询的数据********************************/
|
|
|
|
|
+ //高企服务
|
|
|
|
|
+ JtBusinessCategory gaoqi = jtBusinessService.getBusinessCategoryByLayerAndName(1, "高新技术企业服务");
|
|
|
|
|
+ if (gaoqi != null) {
|
|
|
|
|
+ List<JtBusinessCategory> scienceProject = jtBusinessService.getCategoryByModule(2);
|
|
|
|
|
+ List<JtBusinessProject> gaoqiList = new ArrayList<JtBusinessProject>();
|
|
|
|
|
+ for (JtBusinessCategory jtBusinessCategory : scienceProject) {
|
|
|
|
|
+ List<JtBusinessProject> list = jtBusinessService.getBusinessProjectByCategoryId(jtBusinessCategory.getId(), 6, null);
|
|
|
|
|
+ gaoqiList.addAll(list);
|
|
|
|
|
+ }
|
|
|
|
|
+ /*List<JtBusinessProject> gaoqiList = jtBusinessService.getBusinessProjectByCategoryId(gaoqi2.getId(), 6, null);*/
|
|
|
|
|
+ for (JtBusinessProject project : gaoqiList) {
|
|
|
|
|
+ if (project.getMinImgUrl() != null && project.getMinImgUrl().length() <= 0)
|
|
|
|
|
+ project.setMinImgUrl(null);
|
|
|
|
|
+ //去除数据中的标签
|
|
|
|
|
+ if(StringUtils.isNotBlank(project.getIntroduce())){
|
|
|
|
|
+ project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", ""));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ modelview.addObject("gaoqiList", gaoqiList);
|
|
|
|
|
+ modelview.addObject("gqc1", gaoqi);
|
|
|
|
|
+ }
|
|
|
|
|
+ //企业资质认证
|
|
|
|
|
+ JtBusinessCategory qiyerenzheng = jtBusinessService.getBusinessCategoryByLayerAndName(2, "企业资质认定");
|
|
|
|
|
+ if (qiyerenzheng != null) {
|
|
|
|
|
+ List<JtBusinessProject> qyrzCategories = jtBusinessService.getBusinessProjectByCategoryId(qiyerenzheng.getId(), 16,null);
|
|
|
|
|
+ modelview.addObject("qyrzCategories", qyrzCategories);
|
|
|
|
|
+ modelview.addObject("qyrzc1", qiyerenzheng);
|
|
|
|
|
+ }
|
|
|
|
|
+ //管理体系认证
|
|
|
|
|
+ JtBusinessCategory manageSys2 = jtBusinessService.getBusinessCategoryByLayerAndName(2, "管理体系认证");
|
|
|
|
|
+ if (manageSys2 != null) {
|
|
|
|
|
+ List<JtBusinessProject> manageSysPro = jtBusinessService.getBusinessProjectByCategoryId(manageSys2.getId(),
|
|
|
|
|
+ 18, null);
|
|
|
|
|
+ modelview.addObject("manageSystemList", manageSysPro);
|
|
|
|
|
+ modelview.addObject("managerSysc1", manageSys2);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //科技项目
|
|
|
|
|
+ //获得所有模块为5的科技项目id
|
|
|
|
|
+ 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(), 18, null);
|
|
|
|
|
+ manageSysPro.addAll(list);
|
|
|
|
|
+ }
|
|
|
|
|
+ if(null != manageSysPro){
|
|
|
|
|
+ modelview.addObject("scienceProjectList", manageSysPro);
|
|
|
|
|
+ modelview.addObject("spc1", scienceProject1);
|
|
|
|
|
+ }
|
|
|
|
|
+ /****************************以上是新修改的部分********************************************/
|
|
|
// 咨询师
|
|
// 咨询师
|
|
|
List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(8);
|
|
List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(8);
|
|
|
// List<consultantListBo>userIdentityBos=userIdentityService.getConsultantList(8);
|
|
// List<consultantListBo>userIdentityBos=userIdentityService.getConsultantList(8);
|