Browse Source

解决冲突

wanghui 8 years ago
parent
commit
ddb27f9c7d

+ 9 - 5
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -1,6 +1,5 @@
 package com.goafanti.achievement.service;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 import com.goafanti.achievement.bo.AchievementImportBo;
@@ -52,9 +51,8 @@ public interface AchievementService {
 
 	void insertImport(List<AchievementImportBo> data);
 
-	Pagination<AchievementSearchListBo> listAchievementSearchList(Integer bargainingMode, Integer category,
-			Integer maturity, BigDecimal transferPriceLower, BigDecimal transferPriceUpper, Integer transferMode,
-			String keyword, Integer fieldA, Integer fieldB, Integer pageNo, Integer pageSize ,String technicalPictureUrl);
+	Pagination<AchievementSearchListBo> listAchievementSearchList(
+			String keyword,Integer dataCategory ,Integer fieldA,String transferMode, Integer pageNo, Integer pageSize);
 
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
 	
@@ -76,5 +74,11 @@ public interface AchievementService {
 	List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementKey);
 	
 	/** 查询精品成果  **/
-	Pagination<BoutiqueListBo> boutiqueSearchList(Integer dataCategory,Integer category,Integer fieldA,Integer pageNo, Integer pageSize);
+	Pagination<BoutiqueListBo> boutiqueSearchList(Integer dataCategory,Integer category,Integer fieldA,Integer pageNo, Integer pageSize);
+	
+	/** 查询精品成果  **/
+	public List<AchievementListBo> getAchievement(Integer boutique);
+	 
+    /** 查询猜你喜欢  **/
+    public List<AchievementListBo>  getPerhapLike();
 }

+ 31 - 37
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -1,6 +1,5 @@
 package com.goafanti.achievement.service.impl;
 
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -411,48 +410,23 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementSearchListBo> listAchievementSearchList(Integer bargainingMode, Integer category,
-			Integer maturity, BigDecimal transferPriceLower, BigDecimal transferPriceUpper, Integer transferMode,
-			String keyword, Integer fieldA, Integer fieldB, Integer pNo, Integer pSize ,String technicalPictureUrl) {
+	public Pagination<AchievementSearchListBo> listAchievementSearchList(
+			String keyword,Integer dataCategory, Integer fieldA, String transferMode,Integer pNo, Integer pSize ) {
 		Map<String, Object> params = new HashMap<>();
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
 		}
-
-		if (null != bargainingMode) {
-			params.put("bargainingMode", bargainingMode);
-		}
-
-		if (null != category) {
-			params.put("category", category);
-		}
-
-		if (null != maturity) {
-			params.put("maturity", maturity);
-		}
-
-		if (null != transferPriceLower) {
-			params.put("transferPriceLower", transferPriceLower);
-		}
-
-		if (null != transferPriceUpper) {
-			params.put("transferPriceUpper", transferPriceUpper);
-		}
-
-		if (null != transferMode) {
-			params.put("transferMode", transferMode);
+		
+		if (null != dataCategory) {
+			params.put("dataCategory", dataCategory);
 		}
 
 		if (null != fieldA) {
 			params.put("fieldA", fieldA);
 		}
-
-		if (null != fieldB) {
-			params.put("fieldB", fieldB);
-		}
-
-		if (null != technicalPictureUrl) {
-			params.put("technicalPictureUrl", technicalPictureUrl);
+		
+		if (!StringUtils.isBlank(transferMode)) {
+			params.put("transferMode", transferMode);
 		}
 		
 		if (pNo == null || pNo < 0) {
@@ -462,8 +436,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (pSize == null || pSize < 0 || pSize > 20) {
 			pSize = 20;
 		}
-		return (Pagination<AchievementSearchListBo>) findPage("findSearchAchievementListByPage",
-				"findSearchAchievementCount", params, pNo, pSize);
+		Pagination<AchievementSearchListBo> result = (Pagination<AchievementSearchListBo>) findPage("findSearchAchievementListByPage","findSearchAchievementCount", params, pNo, pSize);
+		List<AchievementSearchListBo> AchievementSearchList = (List<AchievementSearchListBo>) result.getList();
+		for (int i = 0; i < AchievementSearchList.size(); i++) {
+			String introduction = AchievementSearchList.get(i).getIntroduction();
+			introduction=introduction.length()>20?introduction.substring(0, 20)+"... ...":introduction;
+
+		}
+		return result;
 	}
 
 	@Override
@@ -625,6 +605,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.selectByPrimaryKey(id);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<BoutiqueListBo> boutiqueSearchList(Integer dataCategory, Integer category, Integer fieldA,
 			Integer pNo, Integer pSize) {
@@ -639,5 +620,18 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			params.put("fieldA", fieldA);
 		}
 		return (Pagination<BoutiqueListBo>)findPage("findBoutiqueListByPage","findBoutiqueCount",params, pNo, pSize);
-	}
+	}
+
+	@Override
+	public List<AchievementListBo> getAchievement(Integer boutique) {
+		return achievementMapper.listAchievement();
+	}
+
+	@Override
+	public List<AchievementListBo> getPerhapLike() {
+		return achievementMapper.selectCsutomerLike(); //查询出猜你喜欢
+	}
+
+	
+	
 }

+ 68 - 38
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
+import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.enums.AchievementBargainingMode;
 import com.goafanti.common.enums.AchievementMaturity;
@@ -21,9 +22,11 @@ import com.goafanti.common.enums.AchievementTransferMode;
 import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.service.FieldGlossoryService;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
+import com.goafanti.portal.bo.BoutiqueListBo;
 import com.goafanti.portal.bo.DemandPortalDetailBo;
 import com.goafanti.portal.bo.DemandPortalSimilarListBo;
 
@@ -126,30 +129,32 @@ public class PortalController extends BaseController {
 	/**
 	 * 科技成果详情
 	 */
+	@SuppressWarnings("null")
 	@RequestMapping(value = "/portal/detail/achievementDetail", method = RequestMethod.GET)
 	public ModelAndView portalAchievementDetail(String id, Integer type) {
 		ModelAndView mv = new ModelAndView();
-		AchievementPortalDetailBo achievement = null;
+		AchievementPortalDetailBo achievementdetail = null;
+		AchievementListBo achievement = null;
 		if (UserType.PERSONAL.getCode().equals(type)) {
-			achievement = achievementService.findUserPortalAchievementDetail(id);
+			achievementdetail = achievementService.findUserPortalAchievementDetail(id);
 		} else if (UserType.ORGANIZATION.getCode().equals(type)) {
-			achievement = achievementService.findOrgPortalAchievementDetail(id);
+			achievementdetail = achievementService.findOrgPortalAchievementDetail(id);
 		}
-		if (null != achievement) {
-			if (StringUtils.isBlank(achievement.getOwnerName())) {
-				if (UserLevel.GENERAL.getCode().equals(achievement.getLevel())) {
-					achievement.setOwnerName(UNCERTIFY);
+		if (null != achievementdetail) {
+			if (StringUtils.isBlank(achievementdetail.getOwnerName())) {
+				if (UserLevel.GENERAL.getCode().equals(achievementdetail.getLevel())) {
+					achievementdetail.setOwnerName(UNCERTIFY);
 				} else {
-					achievement.setOwnerName(" ");
+					achievementdetail.setOwnerName(" ");
 				}
 			}
-			Integer fieldA = achievement.getFieldA();
+			Integer fieldA = achievementdetail.getFieldA();
 			String field = "";
 			boolean a = Boolean.FALSE;
 			boolean b = Boolean.FALSE;
 			if (null != fieldA) {
 				List<AchievementPortalSimilarListBo> similarList = achievementService.findByFieldA(fieldA,
-						achievement.getId(), type);
+						achievementdetail.getId(), type);
 				if (!similarList.isEmpty()) {
 					for (AchievementPortalSimilarListBo bo : similarList) {
 						if (null != bo.getMaturity()) {
@@ -181,70 +186,95 @@ public class PortalController extends BaseController {
 					}
 				}
 				mv.addObject("similarList", similarList);
-				if (StringUtils.isNotBlank(achievement.getFieldAS())) {
+				if (StringUtils.isNotBlank(achievementdetail.getFieldAS())) {
 					a = Boolean.TRUE;
 				}
 			}
-			if (StringUtils.isNotBlank(achievement.getFieldBS())) {
+			if (StringUtils.isNotBlank(achievementdetail.getFieldBS())) {
 				b = Boolean.TRUE;
 			}
 
-			field += (a ? achievement.getFieldAS() : "") + (a && b ? DELIMITER : "")
-					+ (b ? achievement.getFieldBS() : "");
-			achievement.setField(field);
-			String technicalPictureUrl = achievement.getTechnicalPictureUrl();
+			field += (a ? achievementdetail.getFieldAS() : "") + (a && b ? DELIMITER : "")
+					+ (b ? achievementdetail.getFieldBS() : "");
+			achievementdetail.setField(field);
+			String technicalPictureUrl = achievementdetail.getTechnicalPictureUrl();
 			if (StringUtils.isNotBlank(technicalPictureUrl)) {
-				achievement.setPictureList(Arrays.asList(technicalPictureUrl.trim().split(",|,")));
+				achievementdetail.setPictureList(Arrays.asList(technicalPictureUrl.trim().split(",|,")));
 			}
 
-			Integer transfermode = achievement.getTransferMode();
+			Integer transfermode = achievementdetail.getTransferMode();
 			if (null != transfermode) {
 				if (AchievementTransferMode.FULLTRANSFER.getCode().equals(transfermode)) {
-					achievement.setTransferModeS(AchievementTransferMode.FULLTRANSFER.getDesc());
+					achievementdetail.setTransferModeS(AchievementTransferMode.FULLTRANSFER.getDesc());
 				} else if (AchievementTransferMode.PERMISSIONTRANSFER.getCode().equals(transfermode)) {
-					achievement.setTransferModeS(AchievementTransferMode.PERMISSIONTRANSFER.getDesc());
+					achievementdetail.setTransferModeS(AchievementTransferMode.PERMISSIONTRANSFER.getDesc());
 				} else if (AchievementTransferMode.TECHNOLOGYSHARES.getCode().equals(transfermode)) {
-					achievement.setTransferModeS(AchievementTransferMode.TECHNOLOGYSHARES.getDesc());
+					achievementdetail.setTransferModeS(AchievementTransferMode.TECHNOLOGYSHARES.getDesc());
 				} else if (AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getCode().equals(transfermode)) {
-					achievement.setTransferModeS(AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getDesc());
+					achievementdetail.setTransferModeS(AchievementTransferMode.EXCLUSIVETECHNOLOGYSHARES.getDesc());
 				}
 			}
 
-			Integer maturity = achievement.getMaturity();
+			Integer maturity = achievementdetail.getMaturity();
 			if (null != maturity) {
 				if (AchievementMaturity.RESEARCH.getCode().equals(maturity)) {
-					achievement.setMaturityS(AchievementMaturity.RESEARCH.getDesc());
+					achievementdetail.setMaturityS(AchievementMaturity.RESEARCH.getDesc());
 				} else if (AchievementMaturity.SAMPLE.getCode().equals(maturity)) {
-					achievement.setMaturityS(AchievementMaturity.SAMPLE.getDesc());
+					achievementdetail.setMaturityS(AchievementMaturity.SAMPLE.getDesc());
 				} else if (AchievementMaturity.PRIMARYTEST.getCode().equals(maturity)) {
-					achievement.setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
+					achievementdetail.setMaturityS(AchievementMaturity.PRIMARYTEST.getDesc());
 				} else if (AchievementMaturity.INTERMEDIATETEST.getCode().equals(maturity)) {
-					achievement.setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
+					achievementdetail.setMaturityS(AchievementMaturity.INTERMEDIATETEST.getDesc());
 				} else if (AchievementMaturity.MASSPRODUCTION.getCode().equals(maturity)) {
-					achievement.setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
+					achievementdetail.setMaturityS(AchievementMaturity.MASSPRODUCTION.getDesc());
 				}
 			}
 			String location = "";
-			String province = achievement.getProvince();
-			String city = achievement.getCity();
+			String province = achievementdetail.getProvince();
+			String city = achievementdetail.getCity();
 			location += (StringUtils.isBlank(province) ? "" : province) + (StringUtils.isBlank(city) ? "" : city);
 
-			if (null == achievement.getBargainingMode()
-					|| AchievementBargainingMode.NEGOTIABLE.equals(achievement.getBargainingMode())) {
-				achievement.setTransferPriceS(PRICE_NEGOTIABLE);
+			if (null == achievementdetail.getBargainingMode()
+					|| AchievementBargainingMode.NEGOTIABLE.equals(achievementdetail.getBargainingMode())) {
+				achievementdetail.setTransferPriceS(PRICE_NEGOTIABLE);
 			} else {
-				if (null != achievement.getTransferPrice()) {
-					achievement.setTransferPriceS(achievement.getTransferPrice() + UNIT);
+				if (null != achievementdetail.getTransferPrice()) {
+					achievementdetail.setTransferPriceS(achievementdetail.getTransferPrice() + UNIT);
 				} else {
-					achievement.setTransferPriceS(PRICE_NEGOTIABLE);
+					achievementdetail.setTransferPriceS(PRICE_NEGOTIABLE);
 				}
 			}
 
-			achievement.setLocation(location);
+			achievementdetail.setLocation(location);
 
 		}
+		
+		//查询精品成果
+		List<AchievementListBo> boutiqueAchievement = achievementService.getAchievement(1);
+		List<AchievementListBo> ReboutiqueAchievement = null;
+		int index1=(int)(1+Math.random()*(12-1+1));
+		int index2=(int)(1+Math.random()*(12-1+1));
+		int index3=(int)(1+Math.random()*(12-1+1));
+		
+		for (int i = 0; i < boutiqueAchievement.size(); i++) {
+			ReboutiqueAchievement.add(boutiqueAchievement.get(index1));
+			ReboutiqueAchievement.add(boutiqueAchievement.get(index2));
+			ReboutiqueAchievement.add(boutiqueAchievement.get(index3));
+		};
+		
+		//判断登录没登录. 登录了.查找用户喜欢的. 没登录就随机查四个.
+		boolean isLogin = TokenManager.isLogin();
+		
+		if(isLogin) {
+			List<AchievementListBo> CustomerLike = achievementService.getPerhapLike();
+		}else {
+			
+		}
+		
+		
 		mv.setViewName("/portal/detail/achievementDetail");
-		mv.addObject("achievement", achievement);
+		mv.addObject("achievement", achievementdetail);
+		mv.addObject("ReboutiqueAchievement", ReboutiqueAchievement);
 		return mv;
 	}
 

+ 9 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -4,12 +4,14 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
 import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.portal.bo.AchievementDetailBo;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
+import com.goafanti.portal.bo.BoutiqueListBo;
 import com.goafanti.portal.bo.InternationalListBo;
 import com.goafanti.residentIntegration.bo.ResidentIntegrationBo;
 
@@ -65,4 +67,11 @@ public interface AchievementMapper {
 	
 	/** 查询军民融合项目 **/
 	List<ResidentIntegrationBo> selectJmrProject();
+	
+	/** 查询精品项目 **/
+	List<AchievementListBo> listAchievement();
+	
+	/** 查询猜你喜欢 **/
+	List<AchievementListBo> selectCsutomerLike();
+	
 }

+ 61 - 24
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1072,43 +1072,30 @@
   
   <select id="findSearchAchievementListByPage" parameterType="String" resultType="com.goafanti.portal.bo.AchievementSearchListBo">
   	select 
-  		a.id, a.name, a.keyword,a.technical_picture_url,
-  		a.serial_number as serialNumber, a.data_category as dataCategory, a.category,
-  		a.release_date as releaseDate, a.owner_type as ownerType, 
+  		a.id, a.name, a.keyword,a.introduction,a.category,
+  		a.serial_number as serialNumber, 
+  		a.data_category as dataCategory, 
+  	    a.owner_type as ownerType, 
   		a.owner_name as ownerName,
-  		a.field_a as fieldA, a.field_b as fieldB,
-  		a.transfer_price as transferPrice, a.maturity, a.transfer_mode as transferMode,
-  		a.bargaining_mode as bargainingMode, u.lvl as level
+  		a.field_a as fieldA, 
+  		a.field_b as fieldB,
+  		a.transfer_price as transferPrice,
+  		a.technical_picture_url as technicalpictureurl
   	from achievement a 
   	left join user u on u.id = a.owner_id
   	where a.deleted_sign = 0 
   	<if test="keyword != null">
   		and a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
   	</if>
-  	<if test="category != null">
-  		and a.category = #{category,jdbcType=INTEGER}
-  	</if>
-  	<if test="bargainingMode != null">
-  		and a.bargaining_mode = #{bargainingMode,jdbcType=INTEGER}
-  	</if>
-  	<if test="maturity != null">
-  		and a.maturity = #{maturity,jdbcType=INTEGER}
-  	</if>
-  	<if test="transferPriceLower != null">
-  		and a.transfer_price <![CDATA[ >= ]]> #{transferPriceLower,jdbcType=DECIMAL}
-  	</if>
-  	<if test="transferPriceUpper != null">
-  		and a.transfer_price <![CDATA[ <= ]]> #{transferPriceUpper,jdbcType=DECIMAL}
-  	</if>
   	<if test="transferMode != null">
   		and a.transfer_mode = #{transferMode,jdbcType=INTEGER}
   	</if>
+  	<if test="dataCategory != null">
+  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
+  	</if>
   	<if test="fieldA != null">
   		and a.field_a = #{fieldA,jdbcType=INTEGER}
   	</if>
-  	<if test="fieldB != null">
-  		and a.field_b = #{fieldB,jdbcType=INTEGER}
-  	</if>
   	and a.deleted_sign = 0 
   	and a.release_status = 1
   	and a.audit_status = 3
@@ -1150,6 +1137,9 @@
   	<if test="fieldB != null">
   		and a.field_b = #{fieldB,jdbcType=INTEGER}
   	</if>
+  	<if test="dataCategory != null">
+  		and a.data_category = #{dataCategory,jdbcType=INTEGER}
+  	</if>
   	and a.release_status = 1
   	and a.audit_status = 3
   </select>
@@ -1483,4 +1473,51 @@
 		and category = #{category,jdbcType=INTEGER}
 	</if>	
   </select>
+  
+  <select id="listAchievement" resultType="com.goafanti.portal.bo.BoutiqueListBo">
+  		select 
+  		a.id, a.name, a.keyword,a.introduction,a.category,
+  		a.serial_number as serialNumber, 
+  		a.data_category as dataCategory, 
+  	    a.owner_type as ownerType, 
+  		a.owner_name as ownerName,
+  		a.field_a as fieldA, 
+  		a.field_b as fieldB,
+  		a.transfer_price as transferPrice,
+  		a.technical_picture_url as technicalpictureurl
+  		from achievement a 
+  		where 
+  	    a.deleted_sign = 0 
+		and a.category = 0
+  	    and a.release_status = 1
+  	    and a.audit_status = 3
+  	    order by a.release_date desc limit 0,12
+  </select>
+  
+    <!--  查询猜你喜欢 -->
+    <select id="selectCsutomerLike" resultType="com.goafanti.achievement.bo.AchievementListBo">
+  		select 
+  		a.id, a.name, a.keyword,a.introduction,a.category,
+  		a.serial_number as serialNumber, 
+  		a.data_category as dataCategory, 
+  	    a.owner_type as ownerType, 
+  		a.owner_name as ownerName,
+  		a.field_a as fieldA, 
+  		a.field_b as fieldB,
+  		a.transfer_price as transferPrice,
+  		a.technical_picture_url as technicalpictureurl
+  		from achievement a 
+  		LEFT JOIN aft.achievement_interest b on a.id = b.achievement_id
+  		where 
+  	    a.deleted_sign = 0 
+		and category = 0
+  	    and a.release_status = 1
+  	    and a.audit_status = 3
+  	    <if test="boutique != null">
+      	  and a.boutique= #{boutique,jdbcType=INTEGER}
+        </if>
+  	    order by a.release_date desc limit 0,4
+  </select>
+  
+  
 </mapper>

+ 15 - 0
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -91,6 +91,11 @@ public class AchievementSearchListBo {
 	 * 图片链接
 	 */
 	private String		technicalPictureUrl;
+	
+	/**
+	 * 项目介绍
+	 */
+	private String		introduction;
 
 	public Integer getLevel() {
 		return level;
@@ -249,4 +254,14 @@ public class AchievementSearchListBo {
 
 	}
 
+	public String getIntroduction() {
+		return introduction;
+	}
+
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
+	}
+	
+	
+
 }

+ 8 - 0
src/main/java/com/goafanti/portal/bo/BoutiqueListBo.java

@@ -12,6 +12,7 @@ public class BoutiqueListBo {
 	private String personName;
 	private String industryCatalog;
 	private String pictureUrl;
+	private String technicalpictureurl;
 
 	public String getId() {
 		return id;
@@ -61,4 +62,11 @@ public class BoutiqueListBo {
 	public void setPictureUrl(String pictureUrl) {
 		this.pictureUrl = pictureUrl;
 	}
+	public String getTechnicalpictureurl() {
+		return technicalpictureurl;
+	}
+	public void setTechnicalpictureurl(String technicalpictureurl) {
+		this.technicalpictureurl = technicalpictureurl;
+	}
+	
 }

+ 5 - 6
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -33,12 +33,11 @@ public class PortalSearchController extends BaseController {
 	private OrganizationIdentityService	organizationIdentityService;
 
 	/**
-	 * 科技成果搜索
+	 * 项目搜索
 	 */
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
-	public Result achievementSearchList(Integer bargainingMode, Integer category, Integer maturity,
-			BigDecimal transferPriceLower, BigDecimal transferPriceUpper, Integer transferMode, String keyword,
-			Integer fieldA, Integer fieldB, String pageNo, String pageSize,String technicalPictureUrl) {
+	public Result achievementSearchList(  String keyword,Integer dataCategory,
+			Integer fieldA, String pageNo, String pageSize,String transferMode ) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 20;
@@ -48,8 +47,8 @@ public class PortalSearchController extends BaseController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(achievementService.listAchievementSearchList(bargainingMode, category, maturity, transferPriceLower,
-				transferPriceUpper, transferMode, keyword, fieldA, fieldB, pNo, pSize,technicalPictureUrl));
+		res.setData(achievementService.listAchievementSearchList( 
+				  keyword, dataCategory,fieldA, transferMode, pNo, pSize));
 		return res;
 	}
 

+ 6 - 6
src/main/resources/props/config_local.properties

@@ -1,9 +1,9 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://192.168.1.213:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #\u5e10\u53f7
-jdbc.username=root
+jdbc.username=dev
 #\u5bc6\u7801
 jdbc.password=123456
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=127.0.0.1
+jedis.host=192.168.1.213
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456
@@ -54,13 +54,13 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//sb.jishutao.com/1.0.41
+static.host=//sb.jishutao.com/front/2.0.0
 portal.host=//sf.jishutao.com/portal/2.0.0
 avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload
 
-upload.path=F:/data/public/upload
-upload.private.path=F:/data/private/upload
+upload.path=E:/data/public/upload
+upload.private.path=E:/data/private/upload
 
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9

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

@@ -47,7 +47,7 @@
   					<li th:classappend="${mainM=='thinkTank'}? 'active'">
   						<a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a>
   					</li>
-  					<li><a href="#">科技金融</a></li>
+  					<li><a th:href="${basePath + '/portal/financial/financialIndex.html'}">科技金融</a></li>
   					<li><a href="#">科技活动</a></li>
   					<li><a href="#">平台共建</a></li> 					
   				</ul>

File diff suppressed because it is too large
+ 266 - 95
src/main/webapp/WEB-INF/views/portal/financial/financialIndex.html