albertshaw 8 years ago
parent
commit
526630d264

+ 43 - 38
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -35,28 +35,28 @@ import com.goafanti.news.service.NewsService;
 @Controller
 public class WebpageController extends BaseController {
 	@Resource
-	private UserService userService;
-	
+	private UserService					userService;
+
 	@Resource
-	private DistrictGlossoryService districtglossoryservice;
+	private DistrictGlossoryService		districtglossoryservice;
 
 	@Resource
-	private DemandService demandService;
+	private DemandService				demandService;
 
 	@Resource
-	private AchievementService achievementService;
+	private AchievementService			achievementService;
 
 	@Resource
-	private BannersService bannersService;
+	private BannersService				bannersService;
 
 	@Resource
-	private UserIdentityService userIdentityService;
+	private UserIdentityService			userIdentityService;
 
 	@Resource
-	private OrganizationIdentityService organizationIdentityService;
+	private OrganizationIdentityService	organizationIdentityService;
 
 	@Resource
-	private NewsService newsService;
+	private NewsService					newsService;
 
 	/**
 	 * 首页
@@ -145,14 +145,14 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/user/subscriberDetail", method = RequestMethod.GET)
 	public ModelAndView subscriberDetail(HttpServletRequest request, ModelAndView modelview, String uid, Integer type) {
 		ModelAndView mv = new ModelAndView();
-		UserPartnerDetailBo rePartnerDetail =new UserPartnerDetailBo();
+		UserPartnerDetailBo rePartnerDetail = new UserPartnerDetailBo();
 		/* 查询智者详细信息 */
 
 		if (UserType.PERSONAL.getCode().equals(type)) {
 			rePartnerDetail = userService.findUserPartnerDetail(uid);
 			if (null != rePartnerDetail) {
 				Integer province = rePartnerDetail.getProvince();
-				if(null!=province) {
+				if (null != province) {
 					rePartnerDetail.setProvinceS(districtglossoryservice.selectNameById(province));
 				}
 			}
@@ -160,7 +160,7 @@ public class WebpageController extends BaseController {
 			rePartnerDetail = (UserPartnerDetailBo) userService.findOrgPartnerDetail(uid);
 			if (null != rePartnerDetail) {
 				Integer province = rePartnerDetail.getProvince();
-				if(null!=province) {
+				if (null != province) {
 					rePartnerDetail.setProvinceS(districtglossoryservice.selectNameById(province));
 				}
 			}
@@ -184,7 +184,7 @@ public class WebpageController extends BaseController {
 				}
 			}
 		}
-		
+
 		/* 查询相关智者信息 */
 		List<UserPartnerDetailBo> userPartner = userService.findUserPartner();
 		List<UserPartnerDetailBo> reuserPartner = new ArrayList<UserPartnerDetailBo>();
@@ -198,16 +198,17 @@ public class WebpageController extends BaseController {
 		}
 		for (int i = 0; i < reuserPartner.size(); i++) {
 			String personalProfile = reuserPartner.get(i).getPersonalProfile();
-			if(null!= personalProfile&& ""!=personalProfile &&personalProfile.length()>40) {
-				personalProfile=personalProfile.substring(0, 40)+"... ...";
+			if (null != personalProfile && "" != personalProfile && personalProfile.length() > 40) {
+				personalProfile = personalProfile.substring(0, 40) + "... ...";
 				reuserPartner.get(i).setPersonalProfile(personalProfile);
 			}
 		}
-		
+
 		mv.setViewName("/user/subscriberDetail");
-		mv.addObject("rePartnerDetail",rePartnerDetail);
-		mv.addObject("reuserPartner",reuserPartner);
-		mv.addObject("partnerAchievementList",partnerAchievementList);
+		mv.addObject("rePartnerDetail", rePartnerDetail);
+		mv.addObject("reuserPartner", reuserPartner);
+		mv.addObject("partnerAchievementList", partnerAchievementList);
+		mv.addObject("uid", uid);
 		return mv;
 
 	};
@@ -492,29 +493,31 @@ public class WebpageController extends BaseController {
 		handleBanners(modelview, BannersType.FU_WU_HUI);
 		return modelview;
 	}
-	
+
 	/**
 	 * 知识产权
 	 * @param request
 	 * @param modelview
 	 * @return
 	 */
-	@RequestMapping(value = "/portal/service/propertyRight" , method = RequestMethod.GET)
-	public ModelAndView propertyRight(HttpServletRequest request, ModelAndView modelview){
+	@RequestMapping(value = "/portal/service/propertyRight", method = RequestMethod.GET)
+	public ModelAndView propertyRight(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/service/propertyRight");
 		return modelview;
 	}
+
 	/**
 	 * 高企认定
 	 * @param request
 	 * @param modelview
 	 * @return
 	 */
-	@RequestMapping(value = "/portal/service/highTechCognizance" , method= RequestMethod.GET)
-	public ModelAndView highTechCognizance(HttpServletRequest request, ModelAndView modelview){
+	@RequestMapping(value = "/portal/service/highTechCognizance", method = RequestMethod.GET)
+	public ModelAndView highTechCognizance(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/service/highTechCognizance");
 		return modelview;
 	}
+
 	/**
 	 * 技术交易
 	 */
@@ -533,44 +536,45 @@ public class WebpageController extends BaseController {
 	 * @param modelview
 	 * @return
 	 */
-	@RequestMapping(value="/portal/thinkTank/index",method = RequestMethod.GET)
-	public ModelAndView thinkTank(HttpServletRequest request, ModelAndView modelview){
+	@RequestMapping(value = "/portal/thinkTank/index", method = RequestMethod.GET)
+	public ModelAndView thinkTank(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/thinkTank/index");
 		return modelview;
 	}
-	
+
 	/**
 	 * 政策列表
 	 * @return 
 	 */
 	@SuppressWarnings("unchecked")
-	@RequestMapping(value="/portal/thinkTank/policyList",method = RequestMethod.GET)
-	public ModelAndView policyList(ModelAndView modelview){
+	@RequestMapping(value = "/portal/thinkTank/policyList", method = RequestMethod.GET)
+	public ModelAndView policyList(ModelAndView modelview) {
 		modelview.setViewName("/portal/thinkTank/policyList");
-		List<NewsPortalList> newsList = (List<NewsPortalList>)newsService.portalNewsList(5, 1, null, null, null, null).getList();
+		List<NewsPortalList> newsList = (List<NewsPortalList>) newsService.portalNewsList(5, 1, null, null, null, null)
+				.getList();
 		modelview.addObject("newsList", newsList);
 		return modelview;
 	}
-	
+
 	/**
 	 * 会员介绍
 	 * @param request
 	 * @param modelview
 	 * @return
 	 */
-	@RequestMapping(value="/portal/member")
-	public ModelAndView member(HttpServletRequest request, ModelAndView modelview){
+	@RequestMapping(value = "/portal/member")
+	public ModelAndView member(HttpServletRequest request, ModelAndView modelview) {
 		modelview.setViewName("/portal/member");
 		return modelview;
 	}
-	
+
 	private void handleBanners(ModelAndView modelview, BannersType bannersType) {
 		List<Banners> banners = bannersService.findPortalBanners(bannersType.getKey());
 		if (!banners.isEmpty()) {
 			modelview.addObject("banners", banners);
 		}
 	}
-	
+
 	/**
 	 * 会员介绍
 	 * @param request
@@ -580,8 +584,9 @@ public class WebpageController extends BaseController {
 	 *   
 	 * @return
 	 */
-	@RequestMapping(value="/portal/search/keyword" ,method = RequestMethod.GET)
-	private ModelAndView searchListByKeyword (HttpServletRequest request, ModelAndView modelview ,Integer pageType ,String keyWord) {
+	@RequestMapping(value = "/portal/search/keyword", method = RequestMethod.GET)
+	private ModelAndView searchListByKeyword(HttpServletRequest request, ModelAndView modelview, Integer pageType,
+			String keyWord) {
 		modelview.addObject("keyWord", keyWord);
 		System.out.println("进来没有");
 		/*if (null != pageType && pageType == 2) {
@@ -594,6 +599,6 @@ public class WebpageController extends BaseController {
 			modelview.setViewName("/portal/technologyTrading/achievement");
 		}*/
 		/*modelview.setViewName("/portal/technologyTrading/achievement");*/
-		return new ModelAndView("/portal/technologyTrading/achievement","keyWord", keyWord);
+		return new ModelAndView("/portal/technologyTrading/achievement", "keyWord", keyWord);
 	}
 }

+ 1 - 1
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -21,7 +21,6 @@
 					<div>
 						<h4 th:text="${rePartnerDetail.workUnit}?${rePartnerDetail.workUnit}:${rePartnerDetail.username}"></h4><h4 th:text="${rePartnerDetail.position}?${rePartnerDetail.position}:''"></h4>
 						<p th:text="${rePartnerDetail.achievement}"></p>
-						<input type="hidden" th:value="${rePartnerDetail.uid}" id="userId"/>
 					</div>
 				</div> 
 				<div class="detailtop_img">
@@ -101,6 +100,7 @@
 				<div class="modal-body" id="modal-content">
 				</div>
 				<div class="modal-footer">
+					<input type="hidden" th:value="${uid}" id="userId"/>
 					<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
 					<button type="button" class="btn btn-primary" id="submitOrder">提交订单</button>
 				</div>