Просмотр исходного кода

Merge branch 'master' of ssh://admin@git.jishutao.com:55555/jishutao/jitao-server.git

wanghui лет назад: 7
Родитель
Сommit
808390b115

+ 12 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -7,10 +7,12 @@ import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
 import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
+import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.demand.bo.DemandAchievementListBo;
 import com.goafanti.portal.bo.AchievementDetailBo;
+import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
 import com.goafanti.portal.bo.AchievementSearchListBo;
@@ -105,4 +107,14 @@ public interface AchievementService {
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
+public List<AchievementObject> recentAchievements(int size,String url,String showLocation);
+
+public List<AchievementObject>getHotAchievements(int size,String url,String showLocation);
+
+public List<AchievementObject>getPatentList(int size,String url,String showLocation);
+
+public List<AchievementObject>getPracticalTechnologys(int size,String url,String showLocation);
+
+List<PolicyEntity> getIntellectualProperty(int size);
+
 }

+ 36 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -24,6 +24,7 @@ import com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo;
 import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
 import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AchievementDemandCountMapper;
 import com.goafanti.common.dao.AchievementDemandMapper;
@@ -61,6 +62,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.DemandAchievementListBo;
 import com.goafanti.portal.bo.AchievementDetailBo;
+import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
 import com.goafanti.portal.bo.AchievementSearchListBo;
@@ -874,4 +876,38 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.insert(a);
 	}
 
+	@Override
+	public List<AchievementObject> recentAchievements(int size, String url, String showLocation) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getRecentAchievements(size,url,showLocation);
+	}
+
+	@Override
+	public List<AchievementObject> getHotAchievements(int size, String url, String showLocation) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getHotAchievements( size,  url,  showLocation);
+	}
+
+	@Override
+	public List<AchievementObject> getPatentList(int size, String url, String showLocation) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getPatentList(size,url,showLocation);
+	}
+
+	@Override
+	public List<AchievementObject> getPracticalTechnologys(int size, String url, String showLocation) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getPracticalTechnologys(size,url,showLocation);
+	}
+
+	@Override
+	public List<PolicyEntity> getIntellectualProperty(int size) {
+		// TODO Auto-generated method stub
+		return achievementMapper.getIntellectualProperty(size);
+	}
+	
+	
+	
+	
+
 }

+ 79 - 0
src/main/java/com/goafanti/common/bo/PolicyEntity.java

@@ -0,0 +1,79 @@
+package com.goafanti.common.bo;
+
+import java.sql.Date;
+
+public class PolicyEntity {
+Date createTime;
+Date editTime;
+String title;
+Integer province;
+String provinceS;
+Integer city;
+String cityS;
+String summary;
+String content;
+String titleImg;
+//String firstPictureUrl;
+public Date getCreateTime() {
+	return createTime;
+}
+public void setCreateTime(Date createTime) {
+	this.createTime = createTime;
+}
+public Date getEditTime() {
+	return editTime;
+}
+public void setEditTime(Date editTime) {
+	this.editTime = editTime;
+}
+public String getTitle() {
+	return title;
+}
+public void setTitle(String title) {
+	this.title = title;
+}
+public Integer getProvince() {
+	return province;
+}
+public void setProvince(Integer province) {
+	this.province = province;
+}
+public String getProvinceS() {
+	return provinceS;
+}
+public void setProvinceS(String provinceS) {
+	this.provinceS = provinceS;
+}
+public Integer getCity() {
+	return city;
+}
+public void setCity(Integer city) {
+	this.city = city;
+}
+public String getCityS() {
+	return cityS;
+}
+public void setCityS(String cityS) {
+	this.cityS = cityS;
+}
+public String getSummary() {
+	return summary;
+}
+public void setSummary(String summary) {
+	this.summary = summary;
+}
+public String getContent() {
+	return content;
+}
+public void setContent(String content) {
+	this.content = content;
+}
+public String getTitleImg() {
+	return titleImg;
+}
+public void setTitleImg(String titleImg) {
+	this.titleImg = titleImg;
+}
+
+
+}

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

@@ -12,9 +12,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
+import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.constant.PageConstants;
 import com.goafanti.common.model.Banners;
@@ -32,6 +34,7 @@ import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
+import com.goafanti.portal.bo.AchievementObject;
 
 @Controller
 public class WebpageController extends BaseController {
@@ -222,11 +225,7 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)
-	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/technologyTrading/achievement");
-		return modelview;
-	}
+
 
 	@RequestMapping(value = "/portal/membership", method = RequestMethod.GET)
 	public ModelAndView membership(HttpServletRequest request, ModelAndView modelview) {
@@ -234,11 +233,7 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 
-	@RequestMapping(value = "/portal/technologyTrading/demand", method = RequestMethod.GET)
-	public ModelAndView portalSearchDemand(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/technologyTrading/demand");
-		return modelview;
-	}
+
 
 	@RequestMapping(value = "/portal/search/subscriberUser", method = RequestMethod.GET)
 	public ModelAndView portalSearchSubscriberUser(HttpServletRequest request, ModelAndView modelview) {
@@ -421,7 +416,8 @@ public class WebpageController extends BaseController {
 	 * @return 
 	 * 
 	 * */
-	@RequestMapping(value = "/portal/demand")
+	//需求首页
+	@RequestMapping(value = "/portal/technologyTrading/demand")
 	public ModelAndView demand(HttpServletRequest request, ModelAndView modelview) {
 		String showLocation="web_demand_main";
 		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
@@ -503,7 +499,8 @@ public class WebpageController extends BaseController {
 		modelview.addObject("personnelDemandList",sixMaxPersonnelDemand);
 		return modelview;
 	}
-	
+	 
+	//需求详情
 	@RequestMapping(value = "/portal/technologyTrading/demandDetail")
 	public ModelAndView  DemandDetail(HttpServletRequest request, ModelAndView modelAndView,String id, Integer type) {
 		String url=StringUtils.getDomainByHttpRequest(request);
@@ -526,6 +523,34 @@ public class WebpageController extends BaseController {
 		return modelAndView;
 	}
 	
-
+	
+	//成果首页
+	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)
+	public ModelAndView portalSearchAchievement(HttpServletRequest request, ModelAndView modelview) {
+		String showLocation="web_achievement_main";
+		String url =com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
+		modelview.setViewName("/portal/technologyTrading/achievement");
+		//行业
+				List<fieldGlossoryBo> industryList = userIdentityService.industryList();
+				modelview.addObject("industryList", industryList);
+
+		//最新成果
+		List<AchievementObject>recentAchievements=achievementService.recentAchievements(5,url,showLocation);
+		modelview.addObject("recentAchievements",recentAchievements);
+		//热门关注
+		List<AchievementObject> hotAchievements=achievementService.getHotAchievements(6,url,showLocation);
+		modelview.addObject("hotAchievements",hotAchievements);
+		
+		//专利
+		List<AchievementObject>patentAchievements=achievementService.getPatentList(9,url,showLocation);
+		modelview.addObject("patents",patentAchievements);
+		//实用技术
+		List<AchievementObject>practicalTechnology=achievementService.getPracticalTechnologys(8,url,showLocation);
+		modelview.addObject("practicalTechnology",practicalTechnology); 
+		
+		List<PolicyEntity>intellectualPropertyPolicyList=achievementService.getIntellectualProperty(5);
+		modelview.addObject("policyList",intellectualPropertyPolicyList);
+		return modelview;
+	}
 
 }

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

@@ -11,8 +11,10 @@ import com.goafanti.achievement.bo.AchievementPartnerListBo;
 import com.goafanti.achievement.bo.AchievementRecommended;
 import com.goafanti.achievement.bo.AchievementUserOwnerDetailBo;
 import com.goafanti.app.bo.HomeAchievemend;
+import com.goafanti.common.bo.PolicyEntity;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.portal.bo.AchievementDetailBo;
+import com.goafanti.portal.bo.AchievementObject;
 import com.goafanti.portal.bo.AchievementPortalDetailBo;
 import com.goafanti.portal.bo.AchievementPortalSimilarListBo;
 import com.goafanti.portal.bo.InternationalListBo;
@@ -78,4 +80,14 @@ public interface AchievementMapper {
 
 	List<AchievementRecommended> getAppHomeRecommended();
 	
+	List<AchievementObject>getRecentAchievements(int size,String url,String showLocation);
+	
+	List<AchievementObject>getHotAchievements(int size,String url,String showLocation);
+	
+	List<AchievementObject>getPatentList(int size,String url,String showLocation);
+	
+	List<AchievementObject>getPracticalTechnologys(int size,String url,String showLocation);
+	
+	List<PolicyEntity>getIntellectualProperty(int size);
+	
 }

+ 45 - 0
src/main/java/com/goafanti/common/enums/AchievementCategory.java

@@ -0,0 +1,45 @@
+package com.goafanti.common.enums;
+
+public enum AchievementCategory {
+	Patent(0,"专利"),
+SoftwareCopyright(1,"软件著作权"),
+Project(2,"项目"),
+Copyright(3,"版权"),
+IndustryDesign(4,"工业设计"),
+Formula(5,"配方"),
+Nonstandard(6,"非标"),
+Unknow(-1,"未知类型")
+;
+	int i;
+	String name;
+	
+	AchievementCategory(int i, String name) {
+		this.i = i;
+		this.name = name;
+	}
+
+	public int getI() {
+		return i;
+	}
+
+	public void setI(int i) {
+		this.i = i;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	public static AchievementCategory find(int i)
+	{
+		for(AchievementCategory achievementCategory:values())
+		{
+			if(achievementCategory.getI()==i)return achievementCategory;
+		}
+		return Unknow;
+	}
+
+}

+ 41 - 0
src/main/java/com/goafanti/common/enums/AchievementDataCategory.java

@@ -0,0 +1,41 @@
+package com.goafanti.common.enums;
+
+public enum AchievementDataCategory {
+	 IntellectualProperty(0,"知识产权"),
+	PracticalTechnology(1,"实用技术"),
+	TechieProduct(2,"科技产品"),
+	Unknow(-1,"未知类型")
+	;
+		int i;
+		String name;
+		
+		private AchievementDataCategory(int i, String name) {
+			this.i = i;
+			this.name = name;
+		}
+
+		public int getI() {
+			return i;
+		}
+
+		public void setI(int i) {
+			this.i = i;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+		public static AchievementDataCategory find(int i)
+		{
+			for(AchievementDataCategory achievementCategory:values())
+			{
+				if(achievementCategory.getI()==i)return achievementCategory;
+			}
+			return Unknow;
+		}
+
+}

+ 44 - 0
src/main/java/com/goafanti/common/enums/TransferModes.java

@@ -0,0 +1,44 @@
+package com.goafanti.common.enums;
+
+public enum TransferModes {
+	TransferOfPropertyRights(0,"产权转让"),
+	AuthorizedProduction(1,"授权生产"),
+	Permissions(2,"实施许可"),
+	 Shareholder(3,"作家入股"),
+CooperativeDevelopment(4,"合作生产"),
+	Unknow(-1,"未知类型")
+	;
+		int i;
+		String name;
+		
+		private TransferModes(int i, String name) {
+			this.i = i;
+			this.name = name;
+		}
+
+		public int getI() {
+			return i;
+		}
+
+		public void setI(int i) {
+			this.i = i;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+		public static TransferModes find(int i)
+		{
+			for(TransferModes achievementCategory:values())
+			{
+				if(achievementCategory.getI()==i)return achievementCategory;
+			}
+			return Unknow;
+		}
+
+
+}

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

@@ -2180,4 +2180,121 @@ order by
 	ap.show_number asc limit 0,
 	6
 </select> 	
+
+<select id="getRecentAchievements" resultType="com.goafanti.portal.bo.AchievementObject">
+ select
+	d.name,
+	d.id ,
+	data_category as dataCategory,
+	release_date as releaseDate,
+	category,
+	d.audit_status ,
+	fg.name as industryCategory1,
+	fgg.name as industryCategory2,
+	d.technical_picture_url as technicalPictureUrl
+from
+	achievement d
+left join aft.field_glossory fg on
+	fg.id = d.field_a
+left join aft.field_glossory fgg on
+	fgg.id = d.field_b
+left join branch_information branchInfo on
+	instr( branchInfo.domain_name, #{1} )>0
+left join achievement_publish dp on
+	dp.achievement_id = d.id
+	and dp.publish_platform = branchInfo.id
+where
+	audit_status = 2
+	and dp.achievement_id = d.id
+	and dp.publish_platform = branchInfo.id
+	and instr( dp.publish_page, #{2} )>0
+	and info_sources = 1
+order by
+	release_date desc limit #{0}
+</select>
+
+<select id="getHotAchievements" resultType="com.goafanti.portal.bo.AchievementObject">
+select 
+a.name as name ,
+a.id as id,
+a.technical_picture_url as technicalPictureUrl,
+b.ct as interestCount,
+a.category,
+a.data_category as dataCategory
+from achievement a
+left join branch_information branchInfo 
+on INSTR(branchInfo.domain_name,#{1})>0
+left join achievement_publish ap
+ on ap.achievement_id=a.id
+left join 
+(select 
+count(0) as ct,
+achievement_id as interest_aid
+from achievement_interest
+group by
+achievement_id
+) b 
+on b.interest_aid=a.id
+where a.audit_status=2
+and ap.achievement_id=a.id
+and branchInfo.id = ap.publish_platform
+and instr(ap.publish_page,#{2})>0
+and is_hot=1
+and info_sources=1
+order by ct desc limit #{0}
+</select>
+
+<select id="getPatentList" resultType="com.goafanti.portal.bo.AchievementObject">
+select
+	a.id,
+	a.name,
+	a.technical_picture_url as technicalPictureUrl,
+	a.category,
+	release_date as releaseDate
+from
+	achievement a
+left join branch_information bi on instr(bi.domain_name,#{1})>0
+left join achievement_publish ap on ap.achievement_id=a.id
+where audit_status=2
+and bi.id =ap.publish_platform
+and category=0
+and instr(ap.publish_page,#{2})>0
+and info_sources=1
+order by release_date desc limit #{0}
+</select>
+
+<select id="getPracticalTechnologys" resultType="com.goafanti.portal.bo.AchievementObject">
+select
+	a.id,
+	a.name,
+	a.technical_picture_url as technicalPictureUrl,
+	a.category,
+	release_date as releaseDate,
+	a.data_category as dataCategory,
+	transfer_mode as transferMode,
+	fg.name as fieldAS,
+	fgg.name as fieldBS
+from
+	achievement a
+left join branch_information bi on instr(bi.domain_name,#{1})>0
+left join achievement_publish ap on ap.achievement_id=a.id
+left join aft.field_glossory fg on
+	fg.id = a.field_a
+left join aft.field_glossory fgg on
+	fgg.id = a.field_b
+where audit_status=2
+and bi.id =ap.publish_platform
+and data_category=1
+and instr(ap.publish_page,#{2})>0
+and info_sources=1
+order by release_date desc limit #{0}
+</select>
+
+<select id="getIntellectualProperty" resultType="com.goafanti.common.bo.PolicyEntity" >
+select p.id,p.title,p.title_img as titleImg,p.summary,dg1.name as provinceS,dg2.name as cityS,edit_time as editTime from policy p 
+left join district_glossory dg1 on dg1.id=p.province
+left join district_glossory dg2 on dg2.id=p.city
+order by edit_time
+limit #{0}
+</select>
 </mapper>

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

@@ -1121,7 +1121,7 @@
     left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
   left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
- where audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id  and instr(dp.publish_page,#{2})
+ where audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id  and instr(dp.publish_page,#{2})>0
  order by  release_date  desc limit #{0}
   </select>
   
@@ -1129,7 +1129,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  select d.name,picture_url as pictureUrl,d.id from demand d  
    left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
- where d.data_category=1 and info_sources=1 and d.audit_status=2  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+ where d.data_category=1 and info_sources=1 and d.audit_status=2  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date  desc limit #{0}
   </select>
   
@@ -1140,7 +1140,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   from demand d  
     left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
-  where d.is_urgent=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+  where d.is_urgent=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
    order by  release_date  desc limit #{0}
   </select>
   
@@ -1150,7 +1150,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   from demand d 
       left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
-   where d.is_hot=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+   where d.is_hot=1 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
     order by  release_date  desc limit #{0}
   </select>
   
@@ -1158,7 +1158,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  select name,picture_url as pictureUrl ,problem_des as problemDes ,d.id from demand d 
        left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
-  where d.demand_type=4 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+  where d.demand_type=4 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date  desc limit #{0}
   </select>
   
@@ -1168,14 +1168,14 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
     left join aft.field_glossory fgg  on fgg.id=d.industry_category_b
            left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
- where d.demand_type=2 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+ where d.demand_type=2 and d.audit_status=2 and info_sources=1  and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
  order by  release_date  desc limit #{0}
   </select>
    <select id="getFundCrowdDemand" resultType="com.goafanti.demand.bo.DemandListBo">
   select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,crowd_cost as fundForCrowd,research_type as researchType from demand d  
              left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
-  where d.demand_type=3 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+  where d.demand_type=3 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date 
    desc limit #{0}
   </select>
@@ -1184,7 +1184,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
   select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,budget_cost as fundForPersonnel from demand d  
  left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
-  where d.demand_type=5 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+  where d.demand_type=5 and d.audit_status=2 and info_sources=1 and dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
   order by  release_date  desc limit #{0}
   </select>
   
@@ -1201,7 +1201,7 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  from demand d
  left join branch_information branchInfo on INSTR(branchInfo.domain_name,#{1})>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
-where d.boutique=1 and  dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})
+where d.boutique=1 and  dp.demand_id=d.id and dp.publish_platform=branchInfo.id and instr(dp.publish_page,#{2})>0
 order by release_date desc limit #{0}
   </select>  <select id="listMyDemand" resultType="com.goafanti.portal.bo.DemandSearchListBo">
 	select

+ 138 - 0
src/main/java/com/goafanti/portal/bo/AchievementObject.java

@@ -0,0 +1,138 @@
+package com.goafanti.portal.bo;
+
+import java.sql.Date;
+
+import com.goafanti.achievement.bo.InputAchievement;
+import com.goafanti.common.enums.AchievementCategory;
+import com.goafanti.common.enums.AchievementDataCategory;
+import com.goafanti.common.enums.TransferModes;
+
+public class AchievementObject extends InputAchievement {
+	private String		fieldAS;
+	private String		fieldBS;
+	private String		fieldCS;
+	private String		maturityS;
+			
+	private String		transferModeS;
+	private String categoryS;
+	private String	ownerTypeS;
+	private Integer isHot;
+	private Date releaseDate;
+	private int interestCount;
+	private String dataCategoryS;
+	private String firstPicture;
+
+	
+	public String getDataCategoryS() {
+		return dataCategoryS;
+	}
+	public void setDataCategoryS(String dataCategoryS) {
+		this.dataCategoryS = dataCategoryS;
+	}
+	public String getFirstPicture() {
+		return firstPicture;
+	}
+	public void setFirstPicture(String firstPicture) {
+		this.firstPicture = firstPicture;
+	}
+	public int getInterestCount() {
+		return interestCount;
+	}
+	public void setInterestCount(int interestCount) {
+		this.interestCount = interestCount;
+	}
+	public Date getReleaseDate() {
+		return releaseDate;
+	}
+	public void setReleaseDate(Date releaseDate) {
+		this.releaseDate = releaseDate;
+	}
+	public String getFieldAS() {
+		return fieldAS;
+	}
+	public void setFieldAS(String fieldAS) {
+		this.fieldAS = fieldAS;
+	}
+	public String getFieldBS() {
+		return fieldBS;
+	}
+	public void setFieldBS(String fieldBS) {
+		this.fieldBS = fieldBS;
+	}
+	public String getFieldCS() {
+		return fieldCS;
+	}
+	public void setFieldCS(String fieldCS) {
+		this.fieldCS = fieldCS;
+	}
+	public String getMaturityS() {
+		return maturityS;
+	}
+	public void setMaturityS(String maturityS) {
+		this.maturityS = maturityS;
+	}
+	public String getTransferModeS() {
+		return transferModeS;
+	}
+	public void setTransferModeS(String transferModeS) {
+		this.transferModeS = transferModeS;
+	}
+	public String getOwnerTypeS() {
+		return ownerTypeS;
+	}
+	public void setOwnerTypeS(String ownerTypeS) {
+		this.ownerTypeS = ownerTypeS;
+	}
+	public Integer getIsHot() {
+		return isHot;
+	}
+	public void setIsHot(Integer isHot) {
+		this.isHot = isHot;
+	}
+	public String getCategoryS() {
+		return categoryS;
+	}
+	public void setCategoryS(String categoryS) {
+		this.categoryS = categoryS;
+	}
+	
+	
+	//override
+	@Override
+	public void setCategory(Integer category) {
+		// TODO Auto-generated method stub
+		super.setCategory(category);
+		setCategoryS(AchievementCategory.find(category.intValue()).getName());
+	}
+	
+	@Override
+	public void setTechnicalPictureUrl(String url) {
+	super.setTechnicalPictureUrl(url);
+	if(url!=null && url.contains(".")) {
+		setFirstPicture(url.split(",")[0]);
+	}
+	}
+	@Override
+	public void setDataCategory(Integer dataCategory) {
+		// TODO Auto-generated method stub
+		super.setDataCategory(dataCategory);
+		setDataCategoryS(AchievementDataCategory.find(dataCategory.intValue()).getName());
+	//todo
+	}
+	@Override
+	public Integer getTransferMode() {
+		// TODO Auto-generated method stub
+		return super.getTransferMode();
+	}
+	@Override
+	public void setTransferMode(Integer transferMode) {
+		// TODO Auto-generated method stub
+		super.setTransferMode(transferMode);
+		System.out.println(transferMode.intValue());
+		setTransferModeS(TransferModes.find(transferMode.intValue()).getName());
+	}
+	
+	
+	
+	
+}

+ 654 - 204
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -1,210 +1,660 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html lang="en">
 
-<head th:replace="common::header(~{::title},~{::link})">
-	<title>科技交易--我的技术和科技服务交易平台</title>
-	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${portalHost + '/technologyTrading/achievement.css'}" rel="stylesheet">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>科技成果</title>
+    <!-- <link rel="stylesheet" href="../../th:src/css/bootstrap.css">
+    <link rel="stylesheet" href="../../th:src/css/newMenu/public.css">
+    <link rel="stylesheet" href="../../th:src/css/newMenu/header.css">
+    <link rel="stylesheet" href="../../th:src/css/newMenu/achievement.css"> -->
+    
+<link th:href="${portalHost+ '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost+ '/newMenu/achievement.css'}" rel="stylesheet">
 </head>
+
 <body>
-	<header>
-		<div th:replace="common::nav('technologyTrading','achievement')"></div>
-	</header>
-	<!--banner-->
-  	<div class="carouselt">
-		<ul class="ct-img-big clear">
-			<li data-index=0><a href=""><img
-					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
-			<li data-index=1><a href=""><img
-					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
-			<li data-index=2><a href=""><img
-					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
-		</ul>
-		<!-- <a class="btn btn-next" href=""> <img
-			th:src="${portalHost + '/img/index_next.png'}" alt="" />
-		</a> <a class="btn btn-pre" href=""> <img
-			th:src="${portalHost + '/img/index_pre.png'}" alt="" />
-		</a>-->
-		<ul class="ct-img-small clear">
+    <div class="header">
+        <div class="container">
+            <div>
+                <a href="#">网站导航</a>
+            </div>
+            <div>
+                <ul>
+                    <li>
+                        <a href="javascript:void(0)" class="head_login">登录</a>
+                    </li>
+                    <li>
+                        <a href="#">注册</a>
+                    </li>
+                    <li>
+                        <a href="#">我的订单</a>
+                    </li>
+                    <li>
+                        <a href="#">我的关注</a>
+                    </li>
+                    <li>
+                        <a href="#">我的消息</a>
+                    </li>
+                </ul>
+            </div>
+            <div class="colorRed">
+                全国统一服务热线:400-8800-962
+            </div>
+        </div>
+    </div>
+    <!-- search -->
+    <div class="container">
+        <div class="navHeader">
+            <div class="logo">
+                <a href="#">
+                    <img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘">
+                </a>
+            </div>
+            <div class="logo_right"></div>
+            <div class="nav">
+                <ul>
+                    <li>
+                        <a href="#">科技服务</a>
+                        <img th:src="${portalHost+'/img/hot.png'}">
+                        <ol class="subnavigation">
+                            <li>
+                                <a href="#">高企认定</a>
+                            </li>
+                            <li>
+                                <a href="#">知识产权</a>
+                            </li>
+                        </ol>
+                    </li>
+                    <li>
+                        <a href="#">技术交易</a>
+                        <ol class="subnavigation">
+                            <li>
+                                <a href="#">专利产品</a>
+                            </li>
+                            <li>
+                                <a href="#">技术成果</a>
+                            </li>
+                            <li>
+                                <a href="#">技术需求</a>
+                            </li>
+                            <li>
+                                <a href="#">技术评估</a>
+                            </li>
+                        </ol>
+                    </li>
+                    <li>
+                        <a href="#">智库咨询</a>
+                        <ol class="subnavigation">
+                            <li>
+                                <a href="#">智政</a>
+                            </li>
+                            <li>
+                                <a href="/portal/thinkTank/index.html#zizone'}">智者</a>
+                            </li>
+                        </ol>
+                    </li>
+
+                    <li>
+                        <a href="/portal/aboutUs.html">关于公司</a>
+                        <ol class="subnavigation" style="display: none;">
+                            <li>
+                                <a href="#">联系我们</a>
+                            </li>
+                        </ol>
+                    </li>
+                </ul>
+            </div>
+            <div class="nav_right">
+                <img th:src="${portalHost+'/img/newMenu/navImg.jpg'}" alt="">
+                <span>国家技术转移示范机构</span>
+            </div>
+        </div>
+        <div class="clearFix search">
+            <div class="navMeau">
+                <div>
+                    <span class="selfun">行业选择</span>
+                    <div class="menuList">
+                        <ul>
+                            <li th:each="industry:${industryList}" >
+                            <p th:text="${industry.name}"></p>
+                            </li>
+                         
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <div class="search-inp">
+                    <div class="input-group">
+                        <input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
+                        <span class="input-group-btn">
+                            <button class="btn btn-default searchBtn" type="button">
+                                <img th:src="${portalHost+'/img/newMenu/search-icon.jpg'}" alt=""> 搜索
+                            </button>
+                        </span>
+                        <div class="txtVal"></div>
+                    </div>
+                    <div>
+                        <img th:src="${portalHost+'/img/newMenu/search-xq.png'}" alt="">
+                        <span>发布需求</span>
+                    </div>
+                    <div>
+                        <img th:src="${portalHost+'/img/newMenu/search-cg.png'}" alt="">
+                        <span>发布技术</span>
+                    </div>
+                </div>
+                <div class="searchMain">
+                    <ol>
+                        <li class="active">热搜</li>
+                        <li><a href="#" target="_blank">人工智能</a></li>
+                        <li><a href="#">区块链</a></li>
+                        <li><a href="#">环保</a></li>
+                        <li><a href="#">金属材料</a></li>
+                        <li><a href="#">软件开发</a></li>
+                    </ol>
+                </div>
+                <div>
+                    <ol>
+                        <li>
+                            <a href="#patentTitle">专利技术</a>
+                        </li>
+                        <li>
+                            <a href="#practicalTitle">实用技术</a>
+                        </li>
+                        <li>
+                            <a href="#transactionTitle">知识产权交易政策</a>
+                        </li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- banner -->
+    <div id="myCarousel" class="carousel slide">
+        <!-- 轮播(Carousel)指标 -->
+        <ol class="carousel-indicators">
+            <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
+            <li data-target="#myCarousel" data-slide-to="1"></li>
+            <li data-target="#myCarousel" data-slide-to="2"></li>
+        </ol>
+        <!-- 轮播(Carousel)项目 -->
+        <div class="carousel-inner">
+            <div class="item active">
+                <img th:src="${portalHost+'/img/index_banner01.jpg'}" alt="First slide">
+            </div>
+            <div class="item">
+                <img th:src="${portalHost+'/img/index_banner02.jpg'}" alt="Second slide">
+            </div>
+            <div class="item">
+                <img th:src="${portalHost+'/img/index_banner03.jpg'}" alt="Third slide">
+            </div>
+        </div>
+        <!-- 轮播(Carousel)导航 -->
+        <!-- <a class="carousel-control left" href="#myCarousel" 
+               data-slide="prev">&lsaquo;</a>
+            <a class="carousel-control right" href="#myCarousel" 
+               data-slide="next">&rsaquo;</a> -->
+    </div>
+    <!-- 主体内容区域 -->
+    <div class="container">
+        <div class="demand-marq">
+            <span></span>
+            <marquee direction="left" behavior="scroll" scrollamount="10" loop="-1">
+                <ul>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                    <li>匿名***,查看了“寻找关于土壤修复的技术”</li>
+                </ul>
+            </marquee>
+        </div>
+        <div class="newRelease">
+            <div></div>
+            <ul>
+                <li th:each="ra:${recentAchievements}">
+                    <img th:src="${ra.firstPicture}==null?${portalHost+'/img/newMenu/achievement_2.jpg'}:${avatarUploadHost+ra.firstPicture}" alt="">
+                    <div>
+                            <p th:text="${ra.name}"></p>
+                            <p><span class="orange" th:text="${ra.dataCategoryS}"></span>
+                            <span class="blur" th:text="${ra.releaseDate}==null?'未知发布时间':${#dates.format(ra.releaseDate,'yyyy-MM-dd')}"></span></p> 
+                        </div>
+                </li>
+              
+            </ul>
+            <a href="#"> 查看更多 >></a>
+        </div>
+        <div class="achievementHot">
+            <div></div>
+            <ol>
+                <li><a href="#">人工智能</a></li>
+                <li>/</li>
+                <li><a href="#">区块链</a></li>
+                <li>/</li>
+                <li><a href="#">环保</a></li>
+                <li>/</li>
+                <li><a href="#">金属材料</a></li>
+                <li>/</li>
+                <li><a href="#">软件开发</a></li>
+            </ol>
+            <a href="#">查看更多 > </a>
+        </div>
+        <hr />
+        <div class="achievementHot-list">
+            <ul class="row">
+              
+                <li class="col-sm-4" th:each="hota:${hotAchievements}">
+                    <div>
+                        <img th:src="${hota.firstPicture}==null?${portalHost+'/img/newMenu/achievement_8.jpg'}:${avatarUploadHost+hota.firstPicture}" alt="">
+                        <div>
+                            <h4 th:text="${hota.name}">高压电极加热技术和蓄热技术巨物无...</h4>
+                            <p><span class="orange" th:text="${hota.interestCount}==null?'已关注:0人':${'已关注'+hota.interestCount+'人'}">
+                            </span></p>
+                            <p>
+                            <span class="follow">关注</span>
+                            <span class="technology" th:text="${hota.categoryS}"></span></p>
+                            
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </div>
+        <div class="study" id="patentTitle">
+                <h4>专利技术
+                    <a href="#">查看更多 > </a>
+                </h4>
+        </div>
+        <div class="patent">
+           <a href=""><img th:src="${portalHost+'/img/newMenu/achievement_9.jpg'}" alt=""></a> 
+        </div>
+        <div class="patentList">
+            <div class="row">
+                <div class="col-sm-4">
+                    <img th:src="${portalHost+'/img/newMenu/achievement_10.jpg'}" alt="">
+                    <img th:src="${portalHost+'/img/newMenu/achievement_11.jpg'}" alt="">
+                </div>
+                <div class="col-sm-8">
+                    <ul class="row">
+                     
+                        <li class="col-sm-4" th:each="pts:${patents}">
+                            <div>
+                                <img th:src="${pts.firstPicture}==null?${portalHost+'/img/newMenu/achievement_14.jpg'}:${avatarUploadHost+pts.firstPicture}" alt="">
+                                <p th:text="${pts.name}"></p>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="achieveBj">
+            <img th:src="${portalHost+'/img/newMenu/achievement_15.jpg'}" alt="">
+        </div>
+        <div class="studyT" id="practicalTitle">
+            <h4>实用技术
+                <a href="#">查看更多 &gt; </a>
+            </h4>
+        </div>
+        <div class="practical">
+            <div class="practicalLeft">
+                <ul>
+                    
+                    <li th:each="pt,ptStat:${practicalTechnology}" th:if="${ptStat.index}<5">
+                        <div class="imgBj" >
+                            <img th:src="${pt.firstPicture}==null?${portalHost+'/img/newMenu/achievement_19.jpg'}:${avatarUploadHost+pt.firstPicture}" alt="">   
+                            <span></span>
+                        </div>
+                        <div class="txts">
+                            <h5 th:text="${pt.name}"></h5>
+                            <p><span th:text="${pt.dataCategoryS}">
+                            </span><span th:text="${pt.transferModeS}==null?'未知类型':${pt.transferModeS}"></span><span class="hotImg"></span></p>
+                        </div>
+                        <div class="hr"></div>
+                        <div class="btnTxt">
+                            <span class="float-left" th:text="${pt.fieldAS}==null?'未知类型':${pt.fieldAS}">环保</span>
+                            <span class="float-right" th:text="${pt.fieldBS}==null?'未知类型':${pt.fieldBS}">医疗</span>
+                        </div>
+                    </li>
+                </ul>
+                <div class="practicalGrounp">
+                    <ol>
+                      
+                        <li  th:each="pt,ptStat:${practicalTechnology}" th:if="${ptStat.index}>=5 and ${ptStat.index}<8">
+                            <img th:src="${pt.firstPicture}==null?${portalHost+'/img/newMenu/achievement_19.jpg'}:${avatarUploadHost+pt.firstPicture}" alt="">
+                            <div class="practicalGrounpTxt">
+                                <div class="txts">
+                                    <h5 th:text="${pt.name}"></h5>
+                                    <p><span th:text="${pt.dataCategoryS}"></span>
+                                    <span th:text="${pt.transferModeS}==null?'未知类型':${pt.transferModeS}"></span><span class="hotImg"></span></p>
+                                </div>
+                                <div class="hr"></div>
+                                <div class="btnTxt">
+                                    <span class="float-left" th:text="${pt.fieldAS}==null?'未知类型':${pt.fieldAS}">环保</span>
+                            <span class="float-right" th:text="${pt.fieldBS}==null?'未知类型':${pt.fieldBS}">医疗</span>
+                                </div>
+                            </div>
+                        </li>
+                    </ol>
+                </div>
+            </div>
+            <div class="practicalRight">
+                <h4>技淘百科</h4>
+                <ul>
+                    <li>
+                        <img th:src="${portalHost+'/img/newMenu/achievement_21.jpg'}" alt="">
+                        <div>
+                            <p>高新服务流程如何</p>
+                            <hr />
+                        </div>
+                    </li>
+                    <li>
+                        <img th:src="${portalHost+'/img/newMenu/achievement_22.jpg'}" alt="">
+                        <div>
+                            <p>高新服务流程如何</p>
+                            <hr />
+                        </div>
+                    </li>
+                    <li>
+                        <img th:src="${portalHost+'/img/newMenu/achievement_23.jpg'}" alt="">
+                        <div>
+                            <p>高新服务流程如何</p>
+                            <hr />
+                        </div>
+                    </li>
+                    <li>
+                        <img th:src="${portalHost+'/img/newMenu/achievement_24.jpg'}" alt="">
+                        <div>
+                            <p>高新服务流程如何</p>
+                            <hr />
+                        </div>
+                    </li>
+                </ul>
+                <a href="#" class="float-right">查看更多 > </a>
+            </div>
+        </div>
+        <div class="studyT" id="transactionTitle">
+            <h4>知识产权交易政策
+                <a href="#">查看更多 &gt; </a>
+            </h4>
+        </div>
+        <div class="transaction">
+            <div class="transactionImg">
+                <img th:src="${portalHost+'/img/newMenu/achievement_29.jpg'}" alt="">
+                <div th:each="policy,policyStat:${policyList}" th:if="${policyStat.index}==0">
+                    <address><img th:src="${policy.titleImg}==null?${portalHost+'/img/newMenu/achievement_28.jpg'}:${avatarUploadHost+policy.titleImg}" alt="">
+                    <span th:text="${policy.provinceS+policy.cityS}"></span>
+                    <time th:text="${#dates.format(policy.editTime,'yyyy-MM-dd')}"></time>
+                    </address>
+                    <h5>《<span th:text="${policy.title}"></span>》</h5>
+                    <p th:text="${policy.summary}"></p>
+                    <a href="#">查看更多 > </a>
+                </div>
+            </div>
+            <ul>
+                <li th:each="policy,policyStat:${policyList}" th:if="${policyStat.index}>0 and ${policyStat.index}<3">
+                    <div class="time">
+                        <p th:text="${#dates.format(policy.editTime,'dd')}"></p>
+                        <hr>
+                        <span th:text="${#dates.format(policy.editTime,'yyyy-MM')}"></span>
+                    </div>
+                    <div class="introduce">
+                       <address><img th:src="${policy.titleImg}==null?${portalHost+'/img/newMenu/achievement_28.jpg'}:${avatarUploadHost+policy.firstPicture}" alt="">
+                       <span th:text="${policy.provinceS+policy.cityS}"></span>
+                       <span class="title" >《<span th:text="${policy.title}"></span>》</span></address>
+                        <p  th:text="${policy.summary}"></p>
+                    </div>
+                </li>
+            </ul>
+        </div>
+        <div class="transactionList">
+            <ol>
+                <li  th:each="policy,policyStat:${policyList}" th:if="${policyStat.index}>=3 and ${policyStat.index}<5">
+                    <div class="time">
+                        <p th:text="${#dates.format(policy.editTime,'dd')}">23</p>
+                        <hr>
+                        <span  th:text="${#dates.format(policy.editTime,'yyyy-MM')}">2018-06</span>
+                    </div>
+                    <div class="introduce">
+                       <address><img th:src="${policy.titleImg}==null?${portalHost+'/img/newMenu/achievement_28.jpg'}:${avatarUploadHost+policy.firstPicture}" alt="">
+                       <span th:text="${policy.provinceS+policy.cityS}"></span>
+                       <span class="title">《<span th:text="${policy.title}"></span>》</span></address>
+                        <p th:text="${policy.summary}"></p>
+                    </div>
+                </li>
+            </ol>
+        </div>
+    </div>
+    <footer>
+        <div id="bottom">
+            <div class="bottom">
+                <div class="bottom_text">
+                    <div class="text_top">
+                        <a href="/portal/aboutUs.html">关于公司</a>
+                        <a href="/portal/contactUs.html">联系我们</a>
+                        <p>Copyright © 2016-2017 科德 版权所有 湘ICP备15019731号 -2 技术支持:湖南阿凡提科技有限公司
+                        </p>
+                    </div>
+                    <div class="text_center" id="qrCode">
+                        <div class="cont_left">
+                            <img th:src="${portalHost+'/img/dizhi.jpg'}" alt="">
+                            <p>湖南省长沙市营盘东路19号金山大厦八楼</p>
+                        </div>
+                        <div class="cont_center">
+                            <img th:src="${portalHost+'/img/dianhua.jpg'}" alt="">
+                            <p>合作电话:400-8800-962</p>
+                        </div>
+                        <div class="cont_guanli">
+                            <a href="/admin/login">
+                                <img th:src="${portalHost+'/img/guanli.png'}" alt="">
+                                <p>管理员入口</p>
+                            </a>
+                        </div>
+                        <div class="cont_rightapp">
+                            <img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="">
+                            <p>iPhone版</p>
+                        </div>
+                        <div class="cont_right android">
+                            <img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="">
+                            <p>Android版</p>
+                        </div>
+                        <div class="cont_right">
+                            <img th:src="${portalHost+'/img/erweima.jpg'}" alt="">
+                            <p>微信公众号</p>
+                        </div>
+                    </div>
+                    <div class="text_bottom">
+                        <p>友情链接</p>
+                        <a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a>
+                        <a href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a>
+                        <a href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
+                        <a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a>
+                        <a href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a>
+                        <a href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a>
+                        <a href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
+                        <a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a>
+                        <a href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a>
+                        <a href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a>
+                        <a href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a>
+                        <a href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
+                        <a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a>
+                        <a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a>
+                        <a href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
+                        <a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a>
+                        <a href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a>
+                        <a href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a>
+                        <a href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a>
+                        <a href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a>
+                        <a href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div onclick="_MEIQIA('showPanel')" id="lxkf" style="display:none"></div>
+        <div class="pub_fix">
+            <span class="index_blur"></span>
+            <ul class="ret_top">
+                <li class="head_login">
+                    <a href="javascript:;">
+                        <img th:src="${portalHost+'/img/index_fix0.png'}" alt="">
+                        <p>申请会员</p>
+                    </a>
+                </li>
+                <li>
+                    <a onclick="_MEIQIA('showPanel')">
+                        <img th:src="${portalHost+'/img/index_fix3.png'}" alt="">
+                        <p>联系客服</p>
+                    </a>
+                </li>
+                <li>
+                    <a href="" class="pendent_box">
+                        <img th:src="${portalHost+'/img/index_fix4.png'}" alt="">
+                        <p>返回顶部</p>
+                    </a>
+                </li>
+            </ul>
+            <span class="index_orange"></span>
+        </div>
+        <div class="message">
+            <span></span>
+        </div>
+        <div class="login">
+            <div class="login_mian">
+                <div class="login_left">
+                    <div class="login_ewm">
+                        <img th:src="${portalHost+'/img/Android.jpg'}" alt="二维码" />
+                        <p>Android版</p>
+                        <p>客户端</p>
+                    </div>
+                    <div class="login_ewm">
+                        <img th:src="${portalHost+'/img/iPhone.jpg'}" alt="二维码" />
+                        <p>iPhone版</p>
+                        <p>客户端</p>
+                    </div>
+                </div>
+                <div class="login_right">
+                    <h5>用户登陆
+                        <a href="">免费注册有好礼呦!!</a>
+                    </h5>
+                    <form id="form_login">
+                        <div class="login_uesr">
+                            <label for="uesname">
+                                <img th:src="${portalHost+'/img/login_use.png'}" />
+                            </label>
+                            <input type="text" name="uesname" id="Lo_user" placeholder="用户名" />
+                            <img th:src="${portalHost+'/img/login_del.png'}" class="log_del" />
+                        </div>
+                        <div class="login_pass">
+                            <label for="pass">
+                                <img th:src="${portalHost+'/img/login_password.png'}" />
+                            </label>
+                            <input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
+                        </div>
+                        <div class="login_check">
+                            <a href="">忘记密码?</a>
+                        </div>
+                        <input type="submit" value="登 陆" class="login_submit" />
+                    </form>
+                    <img th:src="${portalHost+'/img/login_hua.png'}" alt="" class="login_hua" />
+                    <img th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果" class="login_shadow" />
+                    <img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close" />
+                </div>
+            </div>
+        </div>
+        <div id="forget">
+            <div class="forget">
+                <form id="forget_form">
+                    <div class="forget_top">
+                        <a href="">忘记密码?</a>
+                        <div class="login_check">
+                            <label for="forget_checks" class="lab_check">
+                                <input type="checkbox" name="type" id="forget_checks" />专家登录
+                            </label>
+                            <label for="forget_checkst" class="lab_checkno">
+                                <input type="checkbox" name="type" id="forget_checkst" />企业登录
+                            </label>
+                        </div>
+                    </div>
+                    <div class="forget_center">
+                        <div class="phone">
+                            <label for="forget_phone">
+                                手机号码:
+                                <input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..." />
+                            </label>
+                        </div>
+                        <div class="yanzheng">
+                            <label for="forget_yanzheng">
+                                图形验证码:
+                                <input type="text" name="type" id="forget_yanzheng" />
+                            </label>
+                            <div class="yanzhengma_cont_">
+                                <img th:src="${basePath+'/open/getVCode'}" />
+                            </div>
+                        </div>
+                        <div class="cellcode_">
+                            <div>
+                                验证码:
+                                <input type="text" name="cellCode" placeholder="手机验证码" id="photo_n" />
+                            </div>
+                            <input type="button" id="photo_m" value="获取验证码" disabled/>
+                        </div>
+                        <div class="fastener">
+                            <input type="submit" class="forget_sub" value="确认" />
+                            <div class="fastener_right">
+                                取消
+                            </div>
+                        </div>
+                    </div>
+                </form>
+                <img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close" />
+            </div>
+        </div>
+        <div id="new_password">
+            <div class="new_password">
+                <form id="new_password_form">
+                    <div class="password_top">
+                        <h4>设置新密码</h4>
+                        <span>密码长度为6-20个字符,区分大小写</span>
+                    </div>
+                    <div class="password_center">
+                        <div>
+                            <label for="new_pass">
+                                新密码:
+                                <input type="text" name="type" id="new_pass" placeholder="请输入您的新密码..." />
+                            </label>
+                        </div>
+                        <div>
+                            <label for="new_pass_again">
+                                确认密码:
+                                <input type="text" name="type" id="new_pass_again" placeholder="请确认您的密码..." />
+                            </label>
+                        </div>
+                        <div class="fastener">
+                            <input type="submit" class="new_password_sub" value="确认" />
+                            <div class="fastener_right">
+                                取消
+                            </div>
+                        </div>
+                    </div>
+                </form>
+                <img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close" />
+            </div>
+        </div>
+        <div class="smg">
+            <input type="text" name="msg" value="111" id="msg" />
+        </div>
+    </footer>
+<script type="text/javascript" th:src="${portalHost+'/vendors.js'}"></script><script type="text/javascript" th:src="${portalHost+'/newMenu/achievement.js'}"></script></body>
+<!-- <script th:src="../../th:src/js/jquery-2.1.0.js"></script>
+<script th:src="../../th:src/js/public.js"></script>
+<script th:src="../../th:src//js/newMenu/demand.js"></script>
+<script th:src="../../th:src//js/newMenu/achievement.js"></script>
+<script th:src="http://libs.baidu.com/bootstrap/3.0.3/js/bootstrap.min.js"></script> -->
 
-		</ul>
-	</div>
-	
-	<!--主体内容区域开始-->
-  	<div class="contant">
-  		<div class="achievement_top"><img th:src="${portalHost + '/img/achievement_01.png'}" alt=""/></div>  		
-  	</div>
-  	<div class="container">
-  		
-  		<div th:if="${keyWord} != null "  id="keyword1">
-			<p th:text="${keyWord}"></p>
-		</div>
-		<div th:if="${keyWord} == null " id="keyword2">
-			<p></p>
-		</div>
-  		
-  		<div class="achievement_header">
-  			<p>全部结果: </p>
-  			<ul>
-  				<li>  					
-  					<p>教育休闲</p>
-  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
-  				</li>
-  				<li>  					
-  					<p>教育休闲</p>
-  					<img th:src="${portalHost + '/img/achievement_del.jpg'}" class="del"/>
-  				</li>
-  			</ul>
-  			<div class="text_replace">
-  				<img th:src="${portalHost + '/img/achievement_01_next.jpg'}" alt="" /><span></span>
-  			</div>
-  		</div>
-  		<div class="wrap active">
-			<div class="portal-body">
-				<div class="portal-content">
-					<div class="search-criteria row">
-						<div class="search-title col-md-1">
-							<span>行业分类</span>
-						</div>
-						<div class="search-select col-md-11">
-							<ul id="industryList" class="clearfix"></ul>
-						</div>
-					</div>
-					<div class="search-criteria row">
-						<div class="search-title col-md-1">
-							<span>技术类型</span>
-						</div>
-						<div class="search-select col-md-11">
-							<ul id="selectAct">
-								<li class="active"><span>不限</span></li>
-								<li>
-									<label for="patent" class="demand">
-										专利<input type="checkbox" name="fot" id="patent" value="0" />
-									</label>
-								</li>
-								<li>
-									<label for="demand" class="demand">
-										技术<input type="checkbox" name="fot" id="demand" value="1" />
-									</label>
-								</li>
-							</ul>
-						</div>
-					</div>
-					<div class="search-criteria row">
-						<div class="search-title col-md-1">
-							<span>是否国际</span>
-						</div>
-						<div class="search-select col-md-11">
-							<ul id="selectInt">
-								<li class="active"><span>不限</span></li>
-								<li>
-									<label for="isInt" class="demand">
-										是<input type="checkbox" name="Int" id="isInt" value="1" />
-									</label>
-								</li>
-								<li>
-									<label for="noInt" class="demand">
-										否<input type="checkbox" name="Int" id="noInt" value="0" />
-									</label>
-								</li>
-							</ul>
-						</div>
-					</div>
-					<div class="search-criteria row">
-						<div class="search-title col-md-1">
-							<span>交易方式</span>
-						</div>
-						<div class="search-select col-md-6">
-							<ul id="transferModeList" class="clearfix">
-								<li value="999" class="active"><span>不限</span></li>
-								<li value="0"><span>完全转让</span></li>
-								<li value="1"><span>许可转让</span></li>
-								<li value="2"><span>技术入股</span></li>
-								<li value="3"><span>合作开发</span></li>
-							</ul>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="achievement_main">
-		<div class="container">
-			<div class="main-header">
-				<div class="head-left">
-					<p>排序方式</p>
-					<ul>							
-						<li>
-							<p><span>发布时间</span><img th:src="${portalHost + '/img/achievement_select.jpg'}" alt="" /></p>
-							<div class="time_select">
-								<ul class="timeSelect">
-									<li value="0">由远到近</li>
-									<li value="1">由近到远</li>	
-								</ul>
-							</div>
-						</li>
-						<li>
-							<p><span>价格</span></p>							
-						</li>
-						<li>
-							<div class="inp_select">
-								<input type="number" name="" id="minprice" placeholder="最小价格" maxlength="6" min="0"/>
-								<span>万-</span>
-								<input type="number" id="maxprice" placeholder="最大价格" maxlength="6" min="0"/>万元
-								<button>确定</button>
-							</div>
-						</li>
-					</ul>
-				</div>
-				<div class="head_right">
-					<div class="searchs">
-		 				<div class="select">
-		 					搜一搜
-		 				</div> 				
-		 				<div id="search_on">					
-		 					<input type="search" placeholder="医药生物"/>
-		 				</div>
-		 				<button id="btn_search"></button>				
-		 			</div>
-		 			<ol>
-		 				<li val="457">医药医疗</li>
-		 				<li val="4">建筑建材</li>
-		 				<li val="464">教育休闲</li>
-		 				<li val="460">航空航天</li>
-		 			</ol>
-				</div>
-			</div>
-			<div class="achievementList">
-				<ul>
-				</ul>
-			</div>
-			<div class="container pagination_box">
-				<nav aria-label="Page navigation" class="clearfix">
-					<ul class="pagination">
-						<li class="pagePre">
-							<a href="#" aria-label="Previous">
-								<span aria-hidden="true">&laquo;</span>
-							</a>
-						</li>
-						<li class="pageNumber"><a href="#" value="1">1</a></li>
-						<li class="pageNext">
-							<a href="#" aria-label="Next">
-								<span aria-hidden="true">&raquo;</span>
-							</a>
-						</li>
-					</ul>
-					<span class="totalCount"></span>
-				</nav>
-			</div>
-		</div>
-	</div>
-	<footer>
-		<div th:replace="common::copyright"></div>
-		<div th:replace="common::login"></div>
-	</footer>
-	<div th:replace="common::footer(~{::script})">
-		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost + '/technologyTrading/achievement.js'}"></script>
-	</div>
-</body>
 </html>

+ 4 - 3
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -37,12 +37,13 @@
 							<span class="star"> * </span>
 						</div>
 						<div class="zhuce_input">
-							<span class="glyphicon glyphicon-user"></span>
+				<img th:src="${portalHost+'/img/resiger_username.jpg'}" alt=""/>
+
 							<input type="text" name="customerName" value="请输入客户名称" id="customerName" autocomplete="off"/>
 							<span class="star"> * </span>
 						</div>
 						<div class="zhuce_input">
-							<span class="glyphicon glyphicon-phone"></span>
+							<img th:src="${portalHost+'/img/resiger_photo2.jpg'}" alt=""/>
 							<input type="text" name="photo" value="请输入手机号码" id="usePhoto" autocomplete="off"/>
 							<span class="star"> * </span>
 						</div>						
@@ -70,7 +71,7 @@
 					</div>
 				</div>
 				<div class="shadow">
-					<img src="${portalHost+'/img/shadow7.png'}" alt=""/>
+					<img th:src="${portalHost+'/img/shadow7.png'}" alt=""/>
 				</div>
 			</form>
 		</div>