Преглед изворни кода

Merge remote-tracking branch 'origin/test'

limin пре 7 година
родитељ
комит
b0addab2bb

+ 5 - 5
src/main/java/com/goafanti/app/controller/OpenAppHomeController.java

@@ -179,16 +179,16 @@ public class OpenAppHomeController extends BaseApiController{
 		Map<String, Object> map=new HashMap<>();
 		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		map.put("homeImg", bannersService.findBannersList( apiUrl,1, 1, 1));
-//		map.put("achievement", achievementService.getHotAchievements(3, url,"app_achievement_trading_index"));
-//		map.put("demand", demandService.getHotDemand(3, url, "app_demand_trading_index",0));
-		map.put("achievement", achievementService.getHotAchievements(3, url,"web_index"));
-		map.put("demand", demandService.getHotDemand(3, url, "web_index",0));
+		map.put("achievement", achievementService.getHotAchievements(3, url,"app_achievement_trading_index"));
+		map.put("demand", demandService.getHotDemand(3, url, "app_demand_trading_index",0));
+//		map.put("achievement", achievementService.getHotAchievements(3, url,"web_index"));
+//		map.put("demand", demandService.getHotDemand(3, url, "web_index",0));
 		result.setData(map);
 		return result;
 	}
 	
 	/**
-	 * 全局搜索
+	 * 成果需求全局搜索
 	 */
 	@RequestMapping(value = "/AchievementsDemandSearch", method = RequestMethod.GET)
 	@ResponseBody

+ 1 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1124,6 +1124,7 @@ select
 a.name as name ,
 a.id as id,
 a.technical_picture_url as technicalPictureUrl,
+a.picture_url_min as pictureUrlMin,
 b.ct as interestCount,
 a.category,
 a.data_category as dataCategory,

+ 1 - 1
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -1049,7 +1049,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   <select id="getHotDemand" resultType="com.goafanti.demand.bo.DemandListBo">
  select d.name,release_date as releaseDate,d.id,problem_des as problemDes,
  research_type as researchType,budget_cost as fundForPersonnel,crowd_cost as fundForCrowd,demand_type as demandType,
- fg.name as industryCategory1,fgg.name as industryCategory2,d.picture_url as pictureUrl,
+ fg.name as industryCategory1,fgg.name as industryCategory2,d.picture_url as pictureUrl,d.picture_url_min as pictureUrlMin,
  data_category as dataCategory,validity_period as validityPeriod
   from demand d 
       left join industry_category  fg  on fg.id=d.industry_category_a