浏览代码

取消原全国多网站判断,优化知识产权交易页访问响应速度

anderx 3 年之前
父节点
当前提交
aed9d3ae3e

+ 1 - 0
.idea/misc.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
+    <type id="Spring" />
   </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">

+ 57 - 56
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -103,12 +103,12 @@ public class WebpageController extends BaseController {
 
 	@Resource
 	private ProjectInterestMapper projectInterestMapper;
-	
+
 	@Resource
-	private JtBusinessCategoryMapper jtBusinessCategoryMapper; 
+	private JtBusinessCategoryMapper jtBusinessCategoryMapper;
 	@Resource
-	private JtTagService jtTagService; 
-	
+	private JtTagService jtTagService;
+
 	@Resource
 	private AdminVideoService adminVideoService;
 
@@ -369,11 +369,11 @@ public class WebpageController extends BaseController {
 		map.put("ownUse", jtBusinessService.getProjectByTag("他山己用", 4));
 		modelview.addObject("prolist", map);//标签项目
 		modelview.addObject("technologyProject", jtBusinessService.getCategoryByModule(5,2,12));//科技项目3级
-		
+
 		//科技项目下面的一级
 		//modelview.addObject("tProject", jtBusinessService.getCategoryByModule(5,1,4));//科技项目2级
-		
-		
+
+
 		// 政策
 		// List<PolicyEntity>policyEntities=achievementService.getIntellectualProperty(8);
 		/*List<PolicyResult> policies = (List<PolicyResult>) policyService
@@ -388,7 +388,7 @@ public class WebpageController extends BaseController {
 		for (JtBusinessProject project : l) {
 			//去除数据中的标签
 			if(StringUtils.isNotBlank(project.getIntroduce())){
-				project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", "")); 
+				project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", ""));
 			}
 		}
 		modelview.addObject("military", military);
@@ -404,7 +404,7 @@ public class WebpageController extends BaseController {
 					project.setMinImgUrl(null);
 				//去除数据中的标签
 				if(StringUtils.isNotBlank(project.getIntroduce())){
-					project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", "")); 
+					project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", ""));
 				}
 			}
 			modelview.addObject("gaoqiList", gaoqiList);
@@ -479,7 +479,7 @@ public class WebpageController extends BaseController {
 			modelview.addObject("manageSystemList", qyrzCategories);
 			modelview.addObject("managerSysc1", manageSys2);
 		}
-		
+
 		//军工认证
 		JtBusinessCategory jungong1 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "军工认证");
 		category.setLayer(3);
@@ -489,8 +489,8 @@ public class WebpageController extends BaseController {
 			modelview.addObject("jungongList", jungongList);
 			modelview.addObject("jungong1", jungong1);
 		}
-		
-		
+
+
 		//科技项目
 		//获得所有模块为5的科技项目id
 		JtBusinessCategory scienceProject1 = jtBusinessService.getBusinessCategoryByLayerAndName(1, "科技项目");
@@ -522,7 +522,7 @@ public class WebpageController extends BaseController {
 
 	/*
 	 * 服务详情
-	 * 
+	 *
 	 * @param id String
 	 */
 	@RequestMapping(value = "/portal/service/serviceDetail", method = RequestMethod.GET)
@@ -553,7 +553,7 @@ public class WebpageController extends BaseController {
 		}
 		modelview.addObject("owner", owner);
 		modelview.addObject("pj", jtBusinessProject);
-		
+
 		//判断是否是个人还是组织
 		if(null != jtBusinessProject.getType() && 0 == jtBusinessProject.getType()){//个人
 			UserIdentity uide =  userIdentityService.selectUserIdentityByUserId(jtBusinessProject.getOwnerId());
@@ -584,7 +584,7 @@ public class WebpageController extends BaseController {
 
 	/*
 	 * 服务详情2
-	 * 
+	 *
 	 * @param id String
 	 */
 	@RequestMapping(value = "/portal/service/patentDetail", method = RequestMethod.GET)
@@ -668,7 +668,7 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 知识产权
-	 * 
+	 *
 	 * @param request
 	 * @param modelview
 	 * @return
@@ -681,7 +681,7 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 高企认定
-	 * 
+	 *
 	 * @param request
 	 * @param modelview
 	 * @return
@@ -707,9 +707,9 @@ public class WebpageController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * 智库咨询
-	 * 
+	 *
 	 * @param request
 	 * @param modelview
 	 * @return
@@ -722,7 +722,7 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 政策列表
-	 * 
+	 *
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
@@ -737,7 +737,7 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 会员介绍
-	 * 
+	 *
 	 * @param request
 	 * @param modelview
 	 * @return
@@ -750,7 +750,7 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 技术评估
-	 * 
+	 *
 	 * @param request
 	 * @param modelview
 	 * @return
@@ -764,7 +764,7 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 关于我们
-	 * 
+	 *
 	 * @param request
 	 * @param modelview
 	 * @return
@@ -777,7 +777,7 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 联系我们
-	 * 
+	 *
 	 * @param request
 	 * @param modelview
 	 * @return
@@ -797,7 +797,7 @@ public class WebpageController extends BaseController {
 
 	/**
 	 * 服务-推荐
-	 * 
+	 *
 	 * @param request
 	 * @param modelview
 	 * @return
@@ -810,7 +810,7 @@ public class WebpageController extends BaseController {
 
 	/*
 	 * 首页
-	 * 
+	 *
 	 */
 
 	@SuppressWarnings("unchecked")
@@ -830,7 +830,7 @@ public class WebpageController extends BaseController {
 				project.setMinImgUrl(null);
 			//去除数据中的标签
 			if(StringUtils.isNotBlank(project.getIntroduce())){
-				project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", "")); 
+				project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", ""));
 			}
 		}
 		modelview.addObject("projects", jtBusinessProjects);
@@ -854,7 +854,7 @@ public class WebpageController extends BaseController {
 				&& subscriptions.get(0).getSourceUrl().contains(".")) {
 			modelview.addObject("videoUrl", subscriptions.get(0).getSourceUrl());
 		}
-		
+
 		//获得轮播图数据
 		List<Banners> blist = bannersService.findBannersList("index", 0, 4, 1);
 		if(null != blist){
@@ -894,16 +894,16 @@ public class WebpageController extends BaseController {
 	}
 
 	/*
-	 * 
-	 * 
+	 *
+	 *
 	 * 技淘3.0-科技需求页
-	 * 
+	 *
 	 * @param request
-	 * 
+	 *
 	 * @param modelview
-	 * 
+	 *
 	 * @return
-	 * 
+	 *
 	 */
 	// 需求首页
 	@RequestMapping(value = "/portal/technologyTrading/demand")
@@ -998,7 +998,7 @@ public class WebpageController extends BaseController {
 		}
 		LimitLengthUtil.limiteDemandLength(sixMaxPersonnelDemand, 7, 30);
 		modelview.addObject("personnelDemandList", sixMaxPersonnelDemand);
-		
+
 		//获得轮播图数据
 		List<Banners> blist = bannersService.findBannersList("demand", 0, 3, 1);
 		if(null != blist){
@@ -1070,13 +1070,13 @@ public class WebpageController extends BaseController {
 		List<PolicyResult> policies = (List<PolicyResult>) policyService
 				.searchPolicy("", 2, null, null, "web_index", 1, 5, null).getList();
 		modelview.addObject("policyList", policies);
-		
+
 		//获得轮播图数据
 		List<Banners> blist = bannersService.findBannersList("achievement", 0, 3, 1);
 		if(null != blist){
 			modelview.addObject("abannerlist", blist);
 		}
-		
+
 		return modelview;
 	}
 
@@ -1179,7 +1179,7 @@ public class WebpageController extends BaseController {
 			modelAndView.addObject("copyrightTopId", bq.get(0).getSuperId());
 		}
 		/*********************************结束**************************************/
-		
+
 		// 知产百科
 		List<News> news = (List<News>) newsService
 				.listNews(98, null, null, null, null, null, null, 1, 4, 2 + "", null, null,null)
@@ -1203,10 +1203,11 @@ public class WebpageController extends BaseController {
 	 */
 	@RequestMapping(value = "/portal/technologyTrading/tradingIndex")
 	public ModelAndView patentTrading(HttpServletRequest request, ModelAndView modelAndView) {
-		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
+		//取消原全国多网站判断
+//		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelAndView.setViewName("/portal/technologyTrading/tradingIndex");
 		// 成果
-		List<AchievementObject> achievementObjects = achievementService.getHotAchievements(4, url,
+		List<AchievementObject> achievementObjects = achievementService.getHotAchievements(4, null,
 				"web_achievement_trading_index");
 		for (AchievementObject a : achievementObjects) {
 			if (null != a.getTechnicalPictureUrl() && a.getTechnicalPictureUrl().contains(",")) {
@@ -1217,7 +1218,7 @@ public class WebpageController extends BaseController {
 		modelAndView.addObject("achievement", achievementObjects);
 
 		// 需求
-		List<DemandListBo> demandListBos = demandService.getHotDemand(2, url, "web_demand_trading_index",0);
+		List<DemandListBo> demandListBos = demandService.getHotDemand(2, null, "web_demand_trading_index",0);
 		for (DemandListBo d : demandListBos) {
 			if (null != d.getFirstPic() && d.getFirstPic().contains(",")) {
 				d.setFirstPic(d.getFirstPic().substring(0, d.getFirstPic().indexOf(",")));
@@ -1227,12 +1228,12 @@ public class WebpageController extends BaseController {
 		return modelAndView;
 	}
 
-	
+
 
 	@RequestMapping(value = "/portal/facilitatorDetails")
 	public ModelAndView companyProfile(HttpServletRequest request, ModelAndView modelAndView, String uid) {
 		modelAndView.setViewName("/portal/facilitator");
-		
+
 		OrgIdentityBo org = organizationIdentityService.selectOrgIdentityBoByUserId(uid);
 		modelAndView.addObject("org", org);
 		/*List<JtBusinessProjectResult> projectResults = (List<JtBusinessProjectResult>) jtBusinessService
@@ -1403,7 +1404,7 @@ public class WebpageController extends BaseController {
 		res.setData(globalSearchService.globalSearchList(name,pageNo,pageSize));
 		return res;
 	}
-	
+
 	/**
 	 * 知识产权维权
 	 * @param request
@@ -1417,12 +1418,12 @@ public class WebpageController extends BaseController {
 		if(null != u&&u.getType()!=null){
 			modelview.addObject("userType",u.getType() );
 		}
-		
+
 		modelview.addObject("slist", userIdentityService.consultantList( null, 1,  4,  null, null, null,  0,  12).getList());
 		modelview.setViewName("/portal/service/safeguarding");
 		return modelview;
 	}
-	
+
 	/**
 	 * 高企自评
 	 * @param request
@@ -1434,7 +1435,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/evaluation/evaluate");
 		return modelview;
 	}
-	
+
 	/**
 	 * 顾问详情
 	 * @param modelview
@@ -1482,7 +1483,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/search");
 		return modelview;
 	}
-	
+
 	/**
 	 * 邀请好友
 	 * @param modelview
@@ -1493,7 +1494,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/invitation");
 		return modelview;
 	}
-	
+
 	/**
 	 * 政策 资讯 百科
 	 * @param policy
@@ -1529,8 +1530,8 @@ public class WebpageController extends BaseController {
 			res.setData(policyList);
 		}
 		return res;
-	} 
-	
+	}
+
 	/**
 	 * 法律顾问列表
 	 * @param modelview
@@ -1541,7 +1542,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/service/safeguardingList");
 		return modelview;
 	}
-	
+
 	/**
 	 * 获得除了指定数据的其他随机法律顾问
 	 * @param id
@@ -1557,7 +1558,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/service/safeguardingDetail");
 		return modelview;
 	}
-	
+
 	/**
 	 * 品牌建设
 	 * @param modelview
@@ -1604,7 +1605,7 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/service/taxFinance");
 		return modelview;
 	}
-	
+
 	private List<JtBusinessProject> handleAdvertisement(List<JtBusinessProject> list){
 		for (JtBusinessProject jtBusinessProject : list) {
 			if(StringUtils.isNotBlank(jtBusinessProject.getAdvertisement())){
@@ -1624,11 +1625,11 @@ public class WebpageController extends BaseController {
 		modelAndView.setViewName("/portal/assessment");
 		return modelAndView;
 	}
-	
+
 	@RequestMapping("/portal/privacyStatement")
 	public ModelAndView privacyStatement(ModelAndView modelAndView){
 		modelAndView.setViewName("/portal/privacyStatement");
 		return modelAndView;
 	}
-	
+
 }

+ 154 - 176
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -62,18 +62,18 @@
     <result column="picture_url_min" property="pictureUrlMin" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, serial_number, data_category, name, keyword, category, summary, introduction, 
-    technical_picture_url, field_a, field_b, field_c, maturity, maturity_picture_url, 
-    maturity_text_file_url, maturity_video_url, innovation, owner_id, owner_name, owner_type, owner_id_number, 
-    owner_mobile, owner_email, owner_postal_address, cooperation_mode, transfer_mode, 
-    bargaining_mode, transfer_price, technical_scene, breakthrough, patent_case, awards, 
-    team_des, parameter, tech_plan_url, business_plan_url, org_id, org_name, org_address, 
-    org_email, org_contacts, org_contacts_mobile, contacts, manager_id, salesman_id, 
+    id, serial_number, data_category, name, keyword, category, summary, introduction,
+    technical_picture_url, field_a, field_b, field_c, maturity, maturity_picture_url,
+    maturity_text_file_url, maturity_video_url, innovation, owner_id, owner_name, owner_type, owner_id_number,
+    owner_mobile, owner_email, owner_postal_address, cooperation_mode, transfer_mode,
+    bargaining_mode, transfer_price, technical_scene, breakthrough, patent_case, awards,
+    team_des, parameter, tech_plan_url, business_plan_url, org_id, org_name, org_address,
+    org_email, org_contacts, org_contacts_mobile, contacts, manager_id, salesman_id,
     status, create_time, release_status, release_date, deleted_sign, audit_status, tech_broker_id,
     country_name_zh,international_flag,jmrh_flag,boutique,picture_url_min
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from achievement
     where id = #{id,jdbcType=VARCHAR}
@@ -83,26 +83,26 @@
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.Achievement">
-    insert into achievement (id, serial_number, data_category, 
-      name, keyword, category, 
-      summary, introduction, technical_picture_url, 
-      field_a, field_b, field_c, 
-      maturity, innovation, owner_id, owner_postal_address, cooperation_mode, 
-      transfer_mode, bargaining_mode, transfer_price,  patent_case, 
-      awards, team_des, parameter,  status, 
-      create_time, release_status, release_date, 
+    insert into achievement (id, serial_number, data_category,
+      name, keyword, category,
+      summary, introduction, technical_picture_url,
+      field_a, field_b, field_c,
+      maturity, innovation, owner_id, owner_postal_address, cooperation_mode,
+      transfer_mode, bargaining_mode, transfer_price,  patent_case,
+      awards, team_des, parameter,  status,
+      create_time, release_status, release_date,
       deleted_sign, audit_status,international_flag,boutique,is_hot,info_sources,picture_url_min)
-    values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
-      #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER}, 
-      #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR}, 
-      #{fieldA,jdbcType=INTEGER}, #{fieldB,jdbcType=INTEGER}, #{fieldC,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER},
+      #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{category,jdbcType=INTEGER},
+      #{summary,jdbcType=VARCHAR}, #{introduction,jdbcType=LONGVARCHAR}, #{technicalPictureUrl,jdbcType=VARCHAR},
+      #{fieldA,jdbcType=INTEGER}, #{fieldB,jdbcType=INTEGER}, #{fieldC,jdbcType=INTEGER},
       #{maturity,jdbcType=INTEGER}, #{innovation,jdbcType=INTEGER}, #{ownerId,jdbcType=VARCHAR}
-      , #{ownerPostalAddress,jdbcType=VARCHAR}, #{cooperationMode,jdbcType=INTEGER}, 
-      #{transferMode,jdbcType=INTEGER}, #{bargainingMode,jdbcType=INTEGER}, #{transferPrice,jdbcType=DECIMAL}, 
-     #{patentCase,jdbcType=VARCHAR}, 
-      #{awards,jdbcType=VARCHAR}, #{teamDes,jdbcType=VARCHAR}, #{parameter,jdbcType=VARCHAR}, 
-    #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, 
+      , #{ownerPostalAddress,jdbcType=VARCHAR}, #{cooperationMode,jdbcType=INTEGER},
+      #{transferMode,jdbcType=INTEGER}, #{bargainingMode,jdbcType=INTEGER}, #{transferPrice,jdbcType=DECIMAL},
+     #{patentCase,jdbcType=VARCHAR},
+      #{awards,jdbcType=VARCHAR}, #{teamDes,jdbcType=VARCHAR}, #{parameter,jdbcType=VARCHAR},
+    #{status,jdbcType=INTEGER},
+      #{createTime,jdbcType=TIMESTAMP}, #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP},
       #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER},
        #{internationalFlag,jdbcType=INTEGER},#{boutique,jdbcType=INTEGER},#{isHot,jdbcType=INTEGER},#{infoSources,jdbcType=INTEGER},#{pictureUrlMin,jdbcType=VARCHAR})
   </insert>
@@ -599,16 +599,16 @@
       picture_url_min=#{pictureUrlMin,jdbcType=VARCHAR},
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  
+
   <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
   	update achievement set deleted_sign = 1
-  	where  id in 
+  	where  id in
 	<foreach item="item"  collection="list" open="(" separator="," close=")">
 		#{item}
 	</foreach>
   </update>
   <select id="findAchievementListWithPid" resultType="com.goafanti.portal.bo.AchievementObject">
-  select a.name,a.id,release_date as releaseDate,technical_picture_url as technicalPictureUrl,data_category as dataCategory,is_hot as isHot 
+  select a.name,a.id,release_date as releaseDate,technical_picture_url as technicalPictureUrl,data_category as dataCategory,is_hot as isHot
   ,field_a as fieldA,field_b as fieldB,ic.name as fieldAS,icc.name as fieldBS
   from achievement a
   left join industry_category ic on ic.id=a.field_a
@@ -650,19 +650,19 @@
   </if>
   </select>
    <select id="findAppAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
-  	
-	select 
+
+	select
   		a.id,a.name, a.keyword, a.introduction,a.field_a as fieldA,a.field_b as fieldB,a.data_category as dataCategory,
   		a.status, a.release_date as releaseDate, a.audit_status as auditStatus,a.maturity,
-		f.name as field1,f2.name as field2,ifnull(b.countInterest,0) as interestCount,if(isnull(c.achievement_id),0,1) as interested  
+		f.name as field1,f2.name as field2,ifnull(b.countInterest,0) as interestCount,if(isnull(c.achievement_id),0,1) as interested
   	from achievement a
-  	left join (select count(0)  as countInterest,achievement_id from achievement_interest 
+  	left join (select count(0)  as countInterest,achievement_id from achievement_interest
   		group by achievement_id)b on a.id = b.achievement_id
 	left join (select achievement_id  from achievement_interest where uid=#{uid,jdbcType=VARCHAR} group by achievement_id)c
 	on a.id=c.achievement_id
   	left join industry_category f on a.field_a=f.id
   	left join industry_category f2 on a.field_b=f2.id
-  	where a.deleted_sign = 0 and a.audit_status = 2 and a.info_sources=1 
+  	where a.deleted_sign = 0 and a.audit_status = 2 and a.info_sources=1
   	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>
@@ -707,12 +707,12 @@
 			${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppAchievementCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
+  	select
   		count(1)
   from achievement a
-  	where a.deleted_sign = 0 and a.audit_status = 2 and a.info_sources=1 
+  	where a.deleted_sign = 0 and a.audit_status = 2 and a.info_sources=1
 	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
   	</if>
@@ -757,27 +757,27 @@
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</select>
-  
+
   <select id="selectUserOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementUserOwnerDetailBo">
-		select  
-		  	a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
-		  	a.name, a.keyword, a.category, 
-		  	a.summary, a.introduction, a.technical_picture_url as technicalPictureUrl, 
+		select
+		  	a.id, a.serial_number as serialNumber, a.data_category as dataCategory,
+		  	a.name, a.keyword, a.category,
+		  	a.summary, a.introduction, a.technical_picture_url as technicalPictureUrl,
 		  	a.field_a as fieldA, a.field_b as fieldB, a.field_c as fieldC, f.name as field1, f2.name as field2,
-		  	a.maturity, a.maturity_picture_url as maturityPictureUrl, a.maturity_text_file_url as maturityTextFileUrl, 
-		  	a.maturity_video_url as maturityVideoUrl, a.innovation, a.owner_id as ownerId, 
-		  	a.owner_name as ownerName, a.owner_type as ownerType, a.owner_id_number as ownerIdNumber, 
-		    a.owner_mobile as ownerMobile, a.owner_email as ownerEmail, a.owner_postal_address as ownerPostalAddress, 
-		    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode, 
-		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
-		    a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
-		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
-		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId, 
-		    a.create_time as createTime, a.release_status as releaseStatus, 
+		  	a.maturity, a.maturity_picture_url as maturityPictureUrl, a.maturity_text_file_url as maturityTextFileUrl,
+		  	a.maturity_video_url as maturityVideoUrl, a.innovation, a.owner_id as ownerId,
+		  	a.owner_name as ownerName, a.owner_type as ownerType, a.owner_id_number as ownerIdNumber,
+		    a.owner_mobile as ownerMobile, a.owner_email as ownerEmail, a.owner_postal_address as ownerPostalAddress,
+		    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode,
+		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough,
+		    a.patent_case as patentCase, a.awards, a.team_des as teamDes,
+		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl,
+		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId,
+		    a.create_time as createTime, a.release_status as releaseStatus,
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
 			ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,j.easemob_name as easemobName,a.remark,
-			ifnull(t2.x,0) as orderCount,a.boutique,a.contacts,a.contact_mobile as contactMobile, 
+			ifnull(t2.x,0) as orderCount,a.boutique,a.contacts,a.contact_mobile as contactMobile,
 			a.international_flag as internationalFlag
 	from achievement a
     left join user_identity ui on a.owner_id = ui.uid
@@ -786,26 +786,26 @@
     left join (select count(0) as x,tl.commodity_id from t_order tr
 				left join t_order_detail tl on tl.order_no=tr.order_no
 				where tr.order_status != 4 and tr.order_status != 0
-				group by  tl.commodity_id) t2 on a.id=t2.commodity_id 
+				group by  tl.commodity_id) t2 on a.id=t2.commodity_id
     left join jpush_easemob_account j on a.owner_id=j.uid
     left join user u on u.id = a.owner_id
   where a.id =#{id,jdbcType=VARCHAR}
   </select>
-  
+
    <select id="selectOrgOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo">
-  	select  
-		  	a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
-		  	a.name, a.keyword, a.category, 
-		  	a.summary, a.introduction, a.technical_picture_url as technicalPictureUrl, 
-		  	a.field_a as fieldA, a.field_b as fieldB, a.field_c as fieldC, 
-		  	a.maturity, a.maturity_picture_url as maturityPictureUrl, a.maturity_text_file_url as maturityTextFileUrl, 
-		  	a.maturity_video_url as maturityVideoUrl, a.innovation, a.owner_id as ownerId, 
-		  	a.owner_name as ownerName, a.owner_type as ownerType, a.owner_id_number as ownerIdNumber, 
-		    a.owner_mobile as ownerMobile, a.owner_email as ownerEmail, a.owner_postal_address as ownerPostalAddress, 
-		    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode, 
-		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough, 
-		    a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
-		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl, 
+  	select
+		  	a.id, a.serial_number as serialNumber, a.data_category as dataCategory,
+		  	a.name, a.keyword, a.category,
+		  	a.summary, a.introduction, a.technical_picture_url as technicalPictureUrl,
+		  	a.field_a as fieldA, a.field_b as fieldB, a.field_c as fieldC,
+		  	a.maturity, a.maturity_picture_url as maturityPictureUrl, a.maturity_text_file_url as maturityTextFileUrl,
+		  	a.maturity_video_url as maturityVideoUrl, a.innovation, a.owner_id as ownerId,
+		  	a.owner_name as ownerName, a.owner_type as ownerType, a.owner_id_number as ownerIdNumber,
+		    a.owner_mobile as ownerMobile, a.owner_email as ownerEmail, a.owner_postal_address as ownerPostalAddress,
+		    a.cooperation_mode as cooperationMode, a.transfer_mode as transferMode, a.bargaining_mode as bargainingMode,
+		    a.transfer_price as transferPrice, a.technical_scene as technicalScene, a.breakthrough,
+		    a.patent_case as patentCase, a.awards, a.team_des as teamDes,
+		    a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl,
 		    a.contacts, a.manager_id as managerId, a.salesman_id as salesmanId,  a.international_flag as internationalFlag,
 		    a.create_time as createTime, a.release_status as releaseStatus,
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
@@ -817,23 +817,23 @@
     left join marketing_management mm on a.id = mm.product_id
     where a.id = #{id,jdbcType=VARCHAR}
   </select>
-  
+
    <insert id="insertBatch" parameterType="com.goafanti.common.model.Achievement">
     insert into achievement
     	(id, deleted_sign, audit_status,
     	 patent_case,parameter,owner_id,
     	 create_time, release_status, data_category,
-    	 info_sources,name, keyword, 
+    	 info_sources,name, keyword,
     	 category,field_a,field_b,
     	 owner_name, owner_type, owner_id_number,
     	 owner_mobile, owner_email, owner_postal_address,
     	 cooperation_mode, introduction, tech_broker_id,
     	 international_flag,maturity,team_des
     	 )
-    values 
+    values
     <foreach item="item" index="index" collection="list" separator=",">
       (
-      	#{item.id,jdbcType=VARCHAR}, #{item.deletedSign,jdbcType=INTEGER}, #{item.auditStatus,jdbcType=INTEGER}, 
+      	#{item.id,jdbcType=VARCHAR}, #{item.deletedSign,jdbcType=INTEGER}, #{item.auditStatus,jdbcType=INTEGER},
       	#{item.patentCase,jdbcType=LONGVARCHAR}, #{item.parameter,jdbcType=LONGVARCHAR},#{item.ownerId,jdbcType=VARCHAR},
       	#{item.createTime,jdbcType=TIMESTAMP}, #{item.releaseStatus,jdbcType=INTEGER}, #{item.dataCategory,jdbcType=INTEGER},
       	#{item.infoSources,jdbcType=INTEGER},#{item.name,jdbcType=VARCHAR}, #{item.keyword,jdbcType=VARCHAR},
@@ -847,40 +847,40 @@
   </insert>
 
   <select id="selectAchievementDetail"  resultType="com.goafanti.portal.bo.AchievementDetailBo">
-  	select 
-  		a.id, 
+  	select
+  		a.id,
   		a.owner_name as ownerName,
-  		a.serial_number as serialNumber, 
-  		a.keyword, 
-  		a.name, 
-  		a.data_category as dataCategory, 
+  		a.serial_number as serialNumber,
+  		a.keyword,
+  		a.name,
+  		a.data_category as dataCategory,
   		a.category,
-  		ui.username, 
-  		oi.unit_name as unitName, 
+  		ui.username,
+  		oi.unit_name as unitName,
   		a.release_date as releaseDate,
-  		a.owner_type as ownerType, 
-  		a.field_a as fieldA, 
+  		a.owner_type as ownerType,
+  		a.field_a as fieldA,
   		a.field_b as fieldB,
-  		a.transfer_price as transferPrice, 
-  		a.maturity, 
+  		a.transfer_price as transferPrice,
+  		a.maturity,
   		a.transfer_mode as transferMode,
-  		a.bargaining_mode as bargainingMode, 
-  		a.summary, 
+  		a.bargaining_mode as bargainingMode,
+  		a.summary,
   		a.introduction,
-  		a.technical_picture_url as technicalPictureUrl, 
-  		a.maturity_picture_url as maturityPictureUrl, 
+  		a.technical_picture_url as technicalPictureUrl,
+  		a.maturity_picture_url as maturityPictureUrl,
   		a.maturity_text_file_url as maturityTextFileUrl,
-  		a.maturity_video_url as maturityVideoUrl, 
-  		a.innovation, 
+  		a.maturity_video_url as maturityVideoUrl,
+  		a.innovation,
   		a.cooperation_mode as cooperationMode,
-  		a.bargaining_mode as bargainingMode, 
-  		a.technical_scene as technicalScene, 
+  		a.bargaining_mode as bargainingMode,
+  		a.technical_scene as technicalScene,
   		a.breakthrough,
-  		a.patent_case as patentCase, 
-  		a.awards, 
-  		a.team_des as teamDes, 
-  		a.parameter, 
-  		a.tech_plan_url as techPlanUrl, 
+  		a.patent_case as patentCase,
+  		a.awards,
+  		a.team_des as teamDes,
+  		a.parameter,
+  		a.tech_plan_url as techPlanUrl,
   		a.business_plan_url as businessPlanUrl,
   		ai.id as achievementInterestId
   	from achievement a
@@ -889,7 +889,7 @@
   	left join achievement_interest ai on ai.achievement_id = a.id and ai.uid = #{0}
   	where a.id = #{1}
   </select>
-  
+
   <select id="findPartnerAchievementListByPage" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementPartnerListBo">
   	SELECT
 		id,
@@ -914,7 +914,7 @@
 	AND deleted_sign = 0
 	AND owner_id = #{ownerId,jdbcType=VARCHAR}
   </select>
-  
+
   <select id="findPartnerAchievementCount" parameterType="java.lang.String" resultType="java.lang.Integer">
   	SELECT
 		count(1)
@@ -926,7 +926,7 @@
 	AND deleted_sign = 0
 	AND owner_id = #{ownerId,jdbcType=VARCHAR}
   </select>
-  
+
   <select id="findUserPortalAchievementDetail" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.AchievementPortalDetailBo">
   	SELECT
 		a.id,
@@ -963,7 +963,7 @@
 	WHERE
 		a.id = #{id,jdbcType=VARCHAR}
   </select>
-  
+
    <select id="findOrgPortalAchievementDetail" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.AchievementPortalDetailBo">
   	SELECT
 		a.id,
@@ -998,34 +998,34 @@
 	WHERE
 		a.id = #{id,jdbcType=VARCHAR}
   </select>
- 
+
   <select id="listAchievement" resultType="com.goafanti.achievement.bo.AchievementListBo">
-  		select 
+  		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.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_a as fieldA,
   		a.transfer_price as transferPrice,
   		a.transfer_mode as transfermode,
   		a.maturity,
   		a.technical_picture_url as technicalpictureurl
-  		from achievement a 
-  		where 
-  	    a.deleted_sign = 0 
+  		from achievement a
+  		where
+  	    a.deleted_sign = 0
 		and a.category = 0
   	    and a.release_status = 1
-  	    and a.audit_status = 3 
+  	    and a.audit_status = 3
   	    order by a.release_date desc limit 0,12
   </select>
- 
+
   <select id="countInterest" resultType="Integer">
   	select count(0)
-  	from achievement_interest 
+  	from achievement_interest
   	where achievement_id=#{achievementId,jdbcType=VARCHAR}
   	</select>
-  	
+
   	<select id="achievementInterest" resultType="com.goafanti.achievement.bo.AchievementInterestBo">
   	select
 		a.id,a.name,a.create_time as createTime
@@ -1033,18 +1033,18 @@
 	LEFT  join achievement a on ai.achievement_id=a.id
 	where uid=#{uid,jdbcType=VARCHAR}
   	</select>
-  	
+
   <select id="findMyAchievementListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementListBo">
-  	select 
+  	select
 	  a.id, a.boutique,a.name,a.category, a.audit_status as auditStatus,ifnull(t.x,0) as buyIntention,
 	  a.release_date as releaseDate,a.create_time as createTime,ifnull(i.y,0) as countInterest
-	from  achievement a 
+	from  achievement a
 	left join (select count(0) as x, tl.commodity_id from t_order tr
 				left join t_order_detail tl on tr.order_no=tl.order_no
 				where tr.order_status != 4
-				group by  tl.commodity_id ) t on a.id=t.commodity_id 
+				group by  tl.commodity_id ) t on a.id=t.commodity_id
 	left join (select count(0) as y,achievement_id from achievement_interest
-				group by achievement_id ) i on a.id=i.achievement_id	
+				group by achievement_id ) i on a.id=i.achievement_id
 	where a.deleted_sign = 0
 	<if test="ownerId != null">
   	and a.owner_id = #{ownerId,jdbcType=VARCHAR}
@@ -1054,11 +1054,11 @@
 			${page_sql}
 	</if>
   </select>
-  
+
   <select id="findMyAchievementCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
+  	select
   		count(1)
-  	from  achievement a 
+  	from  achievement a
 	where a.deleted_sign = 0
 	<if test="ownerId != null">
   	and  a.owner_id  = #{ownerId,jdbcType=VARCHAR}
@@ -1066,7 +1066,7 @@
   </select>
 
   <select id="getAppHomeAchievement" resultType="com.goafanti.app.bo.HomeAchievemend">
-  select ap.achievement_id as id ,a.name as name ,a.technical_picture_url as img, 
+  select ap.achievement_id as id ,a.name as name ,a.technical_picture_url as img,
 		ap.if_top,ap.top_number,ap.show_number
 		from achievement_publish ap
 		left join achievement a on ap.achievement_id=a.id
@@ -1078,7 +1078,7 @@
  <select id="getAppHomeRecommended" resultType="com.goafanti.achievement.bo.AchievementRecommended">
  	select ap.achievement_id as id,a.name,a.introduction,a.technical_picture_url as technicalpictureUrl,
 	a.field_a,a.field_b,f1.name as fieldA,f2.name as fieldB,a.boutique
-	from achievement_publish ap 
+	from achievement_publish ap
 	left join achievement a on ap.achievement_id = a.id
 	left join field_glossory f1 on a.field_a=f1.id
 	left join field_glossory f2 on a.field_b=f2.id
@@ -1090,7 +1090,7 @@ order by
 	ap.top_number,
 	ap.show_number asc limit 0,
 	6
-</select> 	
+</select>
 
 <select id="getRecentAchievements" resultType="com.goafanti.portal.bo.AchievementObject">
  select
@@ -1125,41 +1125,19 @@ order by
 </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,
-a.picture_url_min as pictureUrlMin,
-b.ct as interestCount,
-a.category,
-a.data_category as dataCategory,
-	fg.name as fieldAS,
-	fgg.name as fieldBS,
-	a.introduction
-from achievement a
-left join branch_information branchInfo 
-on INSTR(#{1},branchInfo.domain_name)>0
-left join achievement_publish ap
- on ap.achievement_id=a.id
- left join industry_category fg on
-	fg.id = a.field_a
-left join industry_category fgg on
-	fgg.id = a.field_b
-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 info_sources=1
-order by a.release_date desc limit #{0}
+  select
+    a.name as name ,
+    a.id as id,
+    a.technical_picture_url as technicalPictureUrl,
+    a.picture_url_min as pictureUrlMin,
+    a.category
+  from achievement a
+         left join achievement_publish ap
+                   on ap.achievement_id=a.id
+  where a.audit_status=2
+    and ap.publish_page= #{2}
+    and info_sources=1
+  order by a.release_date desc limit #{0};
 
 </select>
 
@@ -1212,7 +1190,7 @@ 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 ,create_time as createTime,p.id,p.source,p.source_url as sourceUrl  from policy p 
+select p.id,p.title,p.title_img as titleImg,p.summary,dg1.name as provinceS,dg2.name as cityS,edit_time as editTime ,create_time as createTime,p.id,p.source,p.source_url as sourceUrl  from policy p
 left join district_glossory dg1 on dg1.id=p.province
 left join district_glossory dg2 on dg2.id=p.city
 where audit_status = 2
@@ -1290,14 +1268,14 @@ and info_sources=1
 order by release_date limit #{0}
 </select>
 <select id="listMyAchievementByPage"   resultType="com.goafanti.portal.bo.AchievementObject">
-	select 
-  		a.id, 
+	select
+  		a.id,
   		a.serial_number as serialNumber,
   		a.category,
   		a.data_category as dataCategory,
-  		a.name, 
+  		a.name,
   		a.release_date as releaseDate,
-  		a.create_time as createTime, 
+  		a.create_time as createTime,
   		a.audit_status as auditStatus,
   		a.boutique,
   		if(isnull(c.interestCount),0,c.interestCount) as interestCount,
@@ -1343,7 +1321,7 @@ order by release_date limit #{0}
 	</if>
 </select>
 <select id="listMyAchievementCount" resultType="java.lang.Integer">
-	select 
+	select
   		count(0)
   	from achievement a
   	left join user b on a.owner_id = b.id left join (select achievement_id,count(*)as interestCount from achievement_interest group by achievement_id) c
@@ -1417,13 +1395,13 @@ where
 	a.id = #{0}
 </select>
 <select id="listInterestedAchievement" resultType="com.goafanti.portal.bo.AchievementObject">
-	select 
-  		a.id, 
+	select
+  		a.id,
   		a.serial_number as serialNumber,
   		a.category,
   		a.data_category as dataCategory,
-  		a.name, 
-  		a.release_date as releaseDate, 
+  		a.name,
+  		a.release_date as releaseDate,
   		a.audit_status as auditStatus,
   		a.technical_picture_url as technicalPictureUrl,
   		a.boutique,
@@ -1437,7 +1415,7 @@ where
 	</if>
   	</select>
   	<select id="listInterestedAchievementCount" resultType="java.lang.Integer">
-	select 
+	select
   		count(0)
   	from achievement a
   	left join achievement_interest ai on ai.achievement_id=a.id
@@ -1452,15 +1430,15 @@ where
   left join industry_category f2 on a.field_b=f2.id
   left join industry_category f3 on a.field_c=f3.id
   left join (select b.commodity_id as id,count(*) as count from jt_order a left join jt_order_detail b on a.order_no=b.order_no
-	GROUP by b.commodity_id) t on a.id=t.id 
-  left join (select achievement_id,count(*) as count from achievement_interest group by achievement_id ) b 
+	GROUP by b.commodity_id) t on a.id=t.id
+  left join (select achievement_id,count(*) as count from achievement_interest group by achievement_id ) b
   on a.id=b.achievement_id left join (select achievement_id from achievement_interest where uid= #{uid,jdbcType=VARCHAR} )d  on a.id=d.achievement_id
   where a.deleted_sign = 0 and a.info_sources=1
   AND  a.id =#{id,jdbcType=VARCHAR}
   	</select>
   	<select id="myCollectionAchievementList" resultType="com.goafanti.common.bo.MyCollection">
-  	select 
-  		a.id, a.name, a.introduction, b.name as fieidA, ai.uid, a.maturity as textA,ifnull(c.x,0) as interestCount 
+  	select
+  		a.id, a.name, a.introduction, b.name as fieidA, ai.uid, a.maturity as textA,ifnull(c.x,0) as interestCount
   	from achievement a
   	left join achievement_interest ai on ai.achievement_id=a.id
   	left join industry_category b on a.field_a= b.id
@@ -1474,7 +1452,7 @@ where
 	</if>
   	</select>
   	<select id="myCollectionAchievementCount" resultType="java.lang.Integer">
-	select 
+	select
   		count(0)
   	from achievement a
   	left join achievement_interest ai on ai.achievement_id=a.id

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

@@ -46,22 +46,22 @@
     <result column="picture_url_min" property="pictureUrlMin" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, serial_number, data_category, name, keyword, info_sources, industry_category_a, 
-    industry_category_b, industry_category_c, demand_type, problem_des, technical_requirements, 
-    picture_url, text_file_url, video_url, fixed_budget, fixed_cycle, people_number, 
-    fixed_scheme, cost_escrow, budget_cost, validity_period, employer_id, employer_name, 
-    employer_address, employer_contacts, employer_contacts_mobile, employer_contacts_mailbox, 
+    id, serial_number, data_category, name, keyword, info_sources, industry_category_a,
+    industry_category_b, industry_category_c, demand_type, problem_des, technical_requirements,
+    picture_url, text_file_url, video_url, fixed_budget, fixed_cycle, people_number,
+    fixed_scheme, cost_escrow, budget_cost, validity_period, employer_id, employer_name,
+    employer_address, employer_contacts, employer_contacts_mobile, employer_contacts_mailbox,
     contacts, status, release_status, release_date, create_time, principal_id, deleted_sign,
     audit_status, tech_broker_id,boutique,urgent_money,urgent_days,picture_url_min
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from demand
     where id = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAppByPrimaryKey" resultType="com.goafanti.demand.bo.AppDemandBo" parameterType="java.lang.String" >
-       select 
+       select
     d.id, d.serial_number AS serialNumber, d.data_category AS dataCategory, d.name, d.keyword,d.budget_cost as budgetCost,
     d.info_sources AS infoSources, d.industry_category_a AS fieldA,d.industry_category_b AS fieldB,f.name as field1,
     f2.name as field2,d.is_hot as isHot,d.release_date as releaseDate,d.demand_type as demandType,d.name,
@@ -77,7 +77,7 @@
 	left join (select demand_id from demand_interest where uid=#{uid,jdbcType=VARCHAR}  group by demand_id) a on d.id=a.demand_id
 	left join industry_category f on d.industry_category_a=f.id
   	left join industry_category f2 on d.industry_category_b=f2.id
-	where d.deleted_sign=0 and d.info_sources=1			
+	where d.deleted_sign=0 and d.info_sources=1
     and  d.id = #{id,jdbcType=VARCHAR}
 	</select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
@@ -85,30 +85,30 @@
     where id = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.Demand" >
-    insert into demand (id, serial_number, data_category, 
-      name, keyword, info_sources, 
-      industry_category_a, industry_category_b, industry_category_c, 
-      demand_type, problem_des, technical_requirements, 
-      picture_url, text_file_url, video_url, 
-      fixed_budget, fixed_cycle, people_number, 
-      fixed_scheme, cost_escrow, budget_cost, 
-      validity_period, employer_id, employer_name, 
-      employer_address, employer_contacts, employer_contacts_mobile, 
-      employer_contacts_mailbox, contacts, status, 
-      release_status, release_date, create_time, 
+    insert into demand (id, serial_number, data_category,
+      name, keyword, info_sources,
+      industry_category_a, industry_category_b, industry_category_c,
+      demand_type, problem_des, technical_requirements,
+      picture_url, text_file_url, video_url,
+      fixed_budget, fixed_cycle, people_number,
+      fixed_scheme, cost_escrow, budget_cost,
+      validity_period, employer_id, employer_name,
+      employer_address, employer_contacts, employer_contacts_mobile,
+      employer_contacts_mailbox, contacts, status,
+      release_status, release_date, create_time,
       principal_id, deleted_sign, audit_status, tech_broker_id,boutique,remark,urgent_days,urgent_money,contact_mobile,crowd_cost,
       is_hot,is_urgent,research_type,picture_url_min)
-    values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER}, 
-      #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{infoSources,jdbcType=INTEGER}, 
-      #{industryCategoryA,jdbcType=INTEGER}, #{industryCategoryB,jdbcType=INTEGER}, #{industryCategoryC,jdbcType=INTEGER}, 
-      #{demandType,jdbcType=INTEGER}, #{problemDes,jdbcType=VARCHAR}, #{technicalRequirements,jdbcType=VARCHAR}, 
-      #{pictureUrl,jdbcType=LONGVARCHAR}, #{textFileUrl,jdbcType=VARCHAR}, #{videoUrl,jdbcType=VARCHAR}, 
-      #{fixedBudget,jdbcType=DECIMAL}, #{fixedCycle,jdbcType=VARCHAR}, #{peopleNumber,jdbcType=INTEGER}, 
-      #{fixedScheme,jdbcType=VARCHAR}, #{costEscrow,jdbcType=DECIMAL}, #{budgetCost,jdbcType=DECIMAL}, 
-      #{validityPeriod,jdbcType=TIMESTAMP}, #{employerId,jdbcType=VARCHAR}, #{employerName,jdbcType=VARCHAR}, 
-      #{employerAddress,jdbcType=VARCHAR}, #{employerContacts,jdbcType=VARCHAR}, #{employerContactsMobile,jdbcType=VARCHAR}, 
-      #{employerContactsMailbox,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, 
+    values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{dataCategory,jdbcType=INTEGER},
+      #{name,jdbcType=VARCHAR}, #{keyword,jdbcType=VARCHAR}, #{infoSources,jdbcType=INTEGER},
+      #{industryCategoryA,jdbcType=INTEGER}, #{industryCategoryB,jdbcType=INTEGER}, #{industryCategoryC,jdbcType=INTEGER},
+      #{demandType,jdbcType=INTEGER}, #{problemDes,jdbcType=VARCHAR}, #{technicalRequirements,jdbcType=VARCHAR},
+      #{pictureUrl,jdbcType=LONGVARCHAR}, #{textFileUrl,jdbcType=VARCHAR}, #{videoUrl,jdbcType=VARCHAR},
+      #{fixedBudget,jdbcType=DECIMAL}, #{fixedCycle,jdbcType=VARCHAR}, #{peopleNumber,jdbcType=INTEGER},
+      #{fixedScheme,jdbcType=VARCHAR}, #{costEscrow,jdbcType=DECIMAL}, #{budgetCost,jdbcType=DECIMAL},
+      #{validityPeriod,jdbcType=TIMESTAMP}, #{employerId,jdbcType=VARCHAR}, #{employerName,jdbcType=VARCHAR},
+      #{employerAddress,jdbcType=VARCHAR}, #{employerContacts,jdbcType=VARCHAR}, #{employerContactsMobile,jdbcType=VARCHAR},
+      #{employerContactsMailbox,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
+      #{releaseStatus,jdbcType=INTEGER}, #{releaseDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
       #{principalId,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{auditStatus,jdbcType=INTEGER},
       #{techBrokerId,jdbcType=VARCHAR},#{boutique,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR},#{urgentDays,jdbcType=VARCHAR},#{urgentMoney,jdbcType=VARCHAR},#{contactMobile,jdbcType=VARCHAR},#{crowdCost,jdbcType=DECIMAL},
       #{isHot,jdbcType=INTEGER},#{isUrgent,jdbcType=INTEGER},#{researchType,jdbcType=INTEGER},#{pictureUrlMin,jdbcType=VARCHAR})
@@ -358,7 +358,7 @@
             <if test="pictureUrlMin != null" >
       #{pictureUrlMin,jdbcType=VARCHAR},
       </if>
-      
+
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Demand" >
@@ -450,7 +450,7 @@
       </if>
       <if test="contacts != null" >
         contacts = #{contacts,jdbcType=VARCHAR},
-      </if>   
+      </if>
       <if test="contactMobile  != null" >
         contact_mobile  = #{contactMobile ,jdbcType=VARCHAR},
       </if>
@@ -491,7 +491,7 @@
         urgent_days = #{urgentDays,jdbcType=INTEGER},
       </if>
       <if test="urgentMoney != null" >
-        urgent_money = #{urgentMoney,jdbcType=VARCHAR}, 
+        urgent_money = #{urgentMoney,jdbcType=VARCHAR},
       </if>
       <if test="researchType != null">
       	research_type = #{researchType,jdbcType=VARCHAR},
@@ -555,20 +555,20 @@
   </update>
 
   <select id="findAppDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.DemandListBo">
-  	select 
-	  d.id,d.name, d.keyword, d.is_urgent as isUrgent, d.demand_type as demandType, d.industry_category_a as industryCategoryA, d.industry_category_b as industryCategoryB, 
+  	select
+	  d.id,d.name, d.keyword, d.is_urgent as isUrgent, d.demand_type as demandType, d.industry_category_a as industryCategoryA, d.industry_category_b as industryCategoryB,
 	  d.validity_period as validityPeriod, d.status, d.release_status as releaseStatus,d.release_date as releaseDate, d.employer_id as employerId,
 	  d.audit_status as auditStatus,d.urgent_money as urgentMoney,d.urgent_days as  urgentDays,d.problem_des as problemDes,
 	  ifnull(t.countInterest,0) as interestCount,if(isnull(y.demand_id),0,1) as interested,
 	  g.name as industryCategory1,g2.name as industryCategory2
-	from  demand d 
+	from  demand d
 	left join  user_identity t on d.employer_id=t.uid
 	left join	industry_category g on d.industry_category_a=g.id
 	left join	industry_category g2 on d.industry_category_b=g2.id
-	left join (select count(0)  as countInterest ,demand_id from demand_interest 
+	left join (select count(0)  as countInterest ,demand_id from demand_interest
 				group by demand_id) t on d.id=t.demand_id
-	left join (select demand_id from demand_interest where uid= #{uid,jdbcType=VARCHAR} group by demand_id) y on d.id=y.demand_id		
-	where d.deleted_sign = 0 and d.audit_status=2 and d.info_sources=1  
+	left join (select demand_id from demand_interest where uid= #{uid,jdbcType=VARCHAR} group by demand_id) y on d.id=y.demand_id
+	where d.deleted_sign = 0 and d.audit_status=2 and d.info_sources=1
 	<if test="employerId != null">
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	</if>
@@ -613,11 +613,11 @@
 		${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppDemandCount" parameterType="String" resultType="java.lang.Integer">
   		select count(1)
-	from  demand d 
-	where d.deleted_sign = 0 and d.audit_status=2 and d.info_sources=1  
+	from  demand d
+	where d.deleted_sign = 0 and d.audit_status=2 and d.info_sources=1
 	<if test="employerId != null">
 	and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	</if>
@@ -658,19 +658,19 @@
 	   and  d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
   </select>
-  
+
   <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
   	update demand set deleted_sign = 1
-  	where  id in 
+  	where  id in
 	<foreach item="item"  collection="list" open="(" separator="," close=")">
 		#{item}
 	</foreach>
   </update>
-  
+
   <insert id="insertBatch" parameterType="com.goafanti.common.model.Demand">
-    insert into demand 
-    	(id, deleted_sign, audit_status, 
-    	status, release_status, create_time, 
+    insert into demand
+    	(id, deleted_sign, audit_status,
+    	status, release_status, create_time,
     	keyword, data_category, name,
     	employer_id,demand_type, problem_des,
     	employer_name,employer_contacts, employer_contacts_mobile,
@@ -678,7 +678,7 @@
     	remark,urgent_days ,urgent_money,
     	is_hot,industry_category_a,industry_category_b
     	 )
-    values 
+    values
     <foreach item="item" index="index" collection="list" separator=",">
       (
       	#{item.id,jdbcType=VARCHAR}, #{item.deletedSign,jdbcType=INTEGER}, #{item.auditStatus,jdbcType=INTEGER},
@@ -692,7 +692,7 @@
       )
     </foreach>
   </insert>
-  
+
   <select id="findUserPortalDemandDetail" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.DemandPortalDetailBo">
   	SELECT
 		d.id,
@@ -725,7 +725,7 @@
 	WHERE
 		d.id = #{id,jdbcType=VARCHAR}
   </select>
-  
+
   <select id="findOrgPortalDemandDetail" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.DemandPortalDetailBo">
   	SELECT
 		d.id,
@@ -771,7 +771,7 @@
 			b.identify_name as employerName,
 			a.is_hot as isHot,
 			a.is_urgent as isUrgent
-		from demand a left join user b on a.employer_id = b.id 
+		from demand a left join user b on a.employer_id = b.id
 		where  a.info_sources=1
 		and a.deleted_sign=0
 		<if test="employerId != null">
@@ -812,7 +812,7 @@
 	<select id="selectDemandListCount" resultType="java.lang.Integer">
 		select
 			count(0)
-		from demand a left join user b on a.employer_id = b.id 
+		from demand a left join user b on a.employer_id = b.id
 		where  a.info_sources=1
 		and a.deleted_sign=0
 		<if test="employerId != null">
@@ -846,19 +846,19 @@
 			and b.identify_name like concat('%',#{identifyName,jdbcType=VARCHAR},'%')
 		</if>
 	</select>
-  
+
 	<select id="countInterest" resultType="Integer">
 	select count(0)
 	from demand_interest
 	where demand_id = #{demandId,jdbcType=VARCHAR}
-	</select> 
-	
+	</select>
+
   <select id="findAppMyDemandListByPage" parameterType="String" resultType="com.goafanti.demand.bo.AppDemandBo">
-  	select 
+  	select
 	  d.id, d.boutique,d.name, d.audit_status as auditStatus,d.release_date as releaseDate,
 	  d.create_time as createTime,ifnull(i.y,0) as interestCount,
 	  if(isnull(a.demand_id),0,1) as interest
-	from  demand d 
+	from  demand d
 	left join (select count(0) as y,demand_id from demand_interest
 				group by demand_id ) i on d.id=i.demand_id
 	left join (select demand_id from demand_interest where uid=#{employerId, jdbcType=VARCHAR}) a on d.id=a.demand_id
@@ -871,16 +871,16 @@
 		${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppMyDemandCount" parameterType="String" resultType="java.lang.Integer">
   	select count(*)
-	from  demand d 
-	where d.deleted_sign = 0 
+	from  demand d
+	where d.deleted_sign = 0
 	<if test="employerId != null">
 		and d.employer_id = #{employerId, jdbcType=VARCHAR}
 	</if>
   </select>
-  
+
   <select id="selectDemandDetail" resultType="com.goafanti.demand.bo.DemandDetailBo" parameterType="java.lang.String" >
 	select
 		id,
@@ -907,7 +907,7 @@
 		demand
 	where id = #{id,jdbcType=VARCHAR}
   </select>
- 
+
 	<select id="findAppNewsInterestByPage" parameterType="String" resultType="com.goafanti.demand.bo.ObjectInterestListBo">
   	select	n.id,n.title as name,n.create_time as createTime
 	from news_interest ni
@@ -918,52 +918,52 @@
 		${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppNewsInterestCount" parameterType="String" resultType="java.lang.Integer">
   		select count(1)
 	from news_interest ni
 	LEFT  join news n on ni.new_id=n.id
 	where ni.uid=#{uid,jdbcType=VARCHAR}
 	</select>
-	
+
 	<select id="findAppUserInterestByPage" parameterType="String" resultType="com.goafanti.demand.bo.ObjectInterestListBo">
   	select y.uid as id,y.username as name ,t.create_time as createTime
 	from user_interest t
 	left join  user_identity y on t.to_uid=y.uid
-	where expert=1  
+	where expert=1
 	and from_uid=#{uid,jdbcType=VARCHAR}
   	<if test="page_sql!=null">
 		${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppUserInterestCount" parameterType="String" resultType="java.lang.Integer">
   	select count(1)
 	from user_interest t
 	left join  user_identity y on t.to_uid=y.uid
-	where expert=1  
+	where expert=1
 	and  from_uid=#{uid,jdbcType=VARCHAR}
 	</select>
-	
+
 	<select id="findAppCounselorInterestByPage" parameterType="String" resultType="com.goafanti.demand.bo.ObjectInterestListBo">
   	select y.uid as id,y.username as name ,t.create_time as createTime
 	from user_interest t
 	left join  user_identity y on t.to_uid=y.uid
-	where expert=2  
+	where expert=2
 	and from_uid=#{uid,jdbcType=VARCHAR}
   	<if test="page_sql!=null">
 		${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppCounselorInterestCount" parameterType="String" resultType="java.lang.Integer">
   	select count(1)
 	from user_interest t
 	left join  user_identity y on t.to_uid=y.uid
-	where  expert=2  
+	where  expert=2
 	and from_uid=#{uid,jdbcType=VARCHAR}
 	</select>
-	
+
 	<select id="findAppDemandInterestByPage"  resultType="com.goafanti.demand.bo.ObjectInterestListBo">
   	select d.id ,d.name,t.create_time as createTime
 	from demand_interest t
@@ -973,14 +973,14 @@
 		${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppDemandInterestCount" parameterType="String" resultType="java.lang.Integer">
   	select count(1)
 	from demand_interest t
 	left join  demand d on t.demand_id=d.id
 	where  uid=#{uid,jdbcType=VARCHAR}
 	</select>
-	
+
 	<select id="findAppAchievementInterestByPage" parameterType="String" resultType="com.goafanti.demand.bo.ObjectInterestListBo">
   	select a.id ,a.name,t.create_time as createTime
 	from achievement_interest t
@@ -990,14 +990,14 @@
 		${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppAchievementInterestCount" parameterType="String" resultType="java.lang.Integer">
   	select count(1)
 	from achievement_interest t
 	left join  achievement a on t.achievement_id=a.id
 	where  t.uid=#{uid,jdbcType=VARCHAR}
 	</select>
-	
+
 	<select id="findAppProjectInterestByPage" parameterType="String" resultType="com.goafanti.demand.bo.ObjectInterestListBo">
   	 select b.id ,b.bname as name,t.uid,t.create_time as createTime
 	from project_interest t
@@ -1007,7 +1007,7 @@
 		${page_sql}
 	</if>
   </select>
-  
+
   <select id="findAppProjectInterestCount" parameterType="String" resultType="java.lang.Integer">
   	select count(1)
 	from project_interest t
@@ -1019,7 +1019,7 @@
 	  		select dp.demand_id as id,d.name,d.demand_type as demandType,d.problem_des as introduction,d.picture_url as pictureUrl,
 		d.urgent_days as urgentDays,d.urgent_money as urgentMoney,d.industry_category_a as industryCategoryA,
 		d.industry_category_b as industryCategoryB,f1.name as fieldA,f2.name as fieldB,d.boutique
-		from demand_publish dp 
+		from demand_publish dp
 		left join demand d on dp.demand_id = d.id
 		left join field_glossory f1 on d.industry_category_a=f1.id
 		left join field_glossory f2 on d.industry_category_b=f2.id
@@ -1033,9 +1033,9 @@
 		6
   </select>
   <select id="selectRecentDemand" resultType="com.goafanti.demand.bo.DemandListBo">
- select d.name,employer_name as employerName,d.id ,data_category as dataCategory,release_date as releaseDate,demand_type as demandType,budget_cost as budgetCost 
+ select d.name,employer_name as employerName,d.id ,data_category as dataCategory,release_date as releaseDate,demand_type as demandType,budget_cost as budgetCost
  ,fg.name as industryCategory1,fgg.name as industryCategory2,problem_des as problemDes,d.picture_url as pictureUrl
- from demand d 
+ from demand d
      left join industry_category  fg  on fg.id=d.industry_category_a
     left join industry_category fgg  on fgg.id=d.industry_category_b
   left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
@@ -1043,79 +1043,77 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  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>
-  
+
 
    <select id="selectCompanyDemand" resultType="com.goafanti.demand.bo.DemandListBo">
  select d.name,picture_url as pictureUrl,d.id ,data_category as dataCategory
- from demand d  
+ from demand d
    left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
 left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
  where d.demand_type=0 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>
-  
-  
+
+
    <select id="getUrgentDemand" resultType="com.goafanti.demand.bo.DemandListBo">
  select 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,
  data_category as dataCategory,validity_period as validityPeriod
-  from demand d  
+  from demand d
     left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>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})>0
    order by  release_date  desc limit #{0}
   </select>
-  
+
   <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,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
-    left join industry_category fgg  on fgg.id=d.industry_category_b
-      left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
-left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
-   where  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
+    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,
+    d.picture_url as pictureUrl,d.picture_url_min as pictureUrlMin,
+    data_category as dataCategory,validity_period as validityPeriod
+    from demand d
+    left join demand_publish dp on dp.demand_id=d.id
+    where  d.audit_status=2 and info_sources=1 and dp.demand_id=d.id
+    and dp.publish_page =#{2}
     <if test="#{3} != null">
-    and d.deleted_sign = #{3}
+      and d.deleted_sign = #{3}
     </if>
     order by  release_date  desc limit #{0}
   </select>
-  
+
    <select id="getAreaDemand" resultType="com.goafanti.demand.bo.DemandListBo">
-select name,picture_url as pictureUrl ,problem_des as problemDes , data_category as dataCategory,d.id from demand d 
+select name,picture_url as pictureUrl ,problem_des as problemDes , data_category as dataCategory,d.id from demand d
        left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>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})>0
   order by  release_date  desc limit #{0}
   </select>
-  
+
    <select id="getProLearnStudyDemand" resultType="com.goafanti.demand.bo.DemandListBo">
-    select d.name as name,picture_url as pictureUrl ,problem_des as problemDes,employer_name as employerName,d.id,fg.name as industryCategory1,data_category as dataCategory,fgg.name as industryCategory2 from demand d  
+    select d.name as name,picture_url as pictureUrl ,problem_des as problemDes,employer_name as employerName,d.id,fg.name as industryCategory1,data_category as dataCategory,fgg.name as industryCategory2 from demand d
     left join industry_category  fg  on fg.id=d.industry_category_a
     left join industry_category fgg  on fgg.id=d.industry_category_b
            left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
-left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
+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})>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,data_category as dataCategory,research_type as researchType from demand d  
+  select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,crowd_cost as fundForCrowd,data_category as dataCategory,research_type as researchType from demand d
              left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
-left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
+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})>0
-  order by  release_date 
+  order by  release_date
    desc limit #{0}
   </select>
-  
+
    <select id="getPersonnelDemand" resultType="com.goafanti.demand.bo.DemandListBo">
-  select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,data_category as dataCategory,budget_cost as fundForPersonnel from demand d  
+  select d.name,picture_url as pictureUrl ,problem_des as problemDes ,d.id,data_category as dataCategory,budget_cost as fundForPersonnel from demand d
  left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
-left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
+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})>0
   order by  release_date  desc limit #{0}
   </select>
-  
+
  <select id="getDemandDetail" resultType="com.goafanti.demand.bo.DemandListBo">
   select d.name,d.budget_cost as budgetCost,d.validity_period as validityPeriod,data_category as dataCategory,d.picture_url as pictureUrl,problem_des as problemDes,
   fg.name as industryCategory1,fgg.name as industryCategory2,u.identify_name as employerName
@@ -1129,11 +1127,11 @@ left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchI
  select d.id,d.name,picture_url as picture_url,data_category as dataCategory,problem_des as problemDes
  from demand d
  left join branch_information branchInfo on INSTR(#{1},branchInfo.domain_name)>0
-left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id 
+left join demand_publish dp on dp.demand_id=d.id and dp.publish_platform=branchInfo.id
 where info_sources=1 and 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>
+
   <select id="listMyDemand" resultType="com.goafanti.portal.bo.DemandSearchListBo">
 	select
 		id,
@@ -1160,7 +1158,7 @@ order by release_date desc limit #{0}
 		and create_time <![CDATA[ < ]]>  #{endDate,jdbcType=VARCHAR}
 	</if>
   </select>
-  
+
     <select id="searchDemandList" resultType="com.goafanti.demand.bo.DemandListBo">
   select a.name,a.id,create_time as createTime ,picture_url as pictureUrl,data_category as dataCategory,is_hot as isHot,demand_type as demandType,
   industry_category_a as industryCategoryA,industry_category_b as industryCategoryB,ic.name as industryCategory1,icc.name as industryCategory2,a.release_date as releaseDate
@@ -1201,8 +1199,8 @@ order by release_date desc limit #{0}
    and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
   </if>
   </select>
-  
-  
+
+
   <select id="findInterestedDemand" resultType="com.goafanti.demand.bo.DemandListBo">
    select a.name,a.id,a.create_time as createTime ,picture_url as pictureUrl,data_category as dataCategory,is_hot as isHot,demand_type as demandType,
   industry_category_a as industryCategoryA,industry_category_b as industryCategoryB,a.release_date as releaseDate,problem_des as problemDes
@@ -1238,7 +1236,7 @@ order by release_date desc limit #{0}
    select count(0)
    from demand a
    left join demand_interest di on di.demand_id=a.id
-     where a.deleted_sign=0 
+     where a.deleted_sign=0
    and di.uid= #{uid,jdbcType=VARCHAR}
    </select>
   </mapper>

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

@@ -38,9 +38,9 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-static.host=//statics.jishutao.com/client/1.2.7
-portal.host=//statics.jishutao.com/portal/1.2.11
-skjt.host=//statics.jishutao.com/skjt/1.3
+static.host=//ss.jishutao.com/client/1.2.7
+portal.host=//ss.jishutao.com/portal/1.2.11
+skjt.host=//ss.jishutao.com/skjt/1.3
 
 #本地
 #static.host=//sclient.jishutao.com:8088/client/1.0.2