Browse Source

技术成果页面增加是否国际搜索选项

enderx 8 years ago
parent
commit
b1b156e2d7

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

@@ -53,7 +53,7 @@ public interface AchievementService {
 
 	Pagination<AchievementSearchListBo> listAchievementSearchList(
 			String keyword,Integer dataCategory ,Integer category, Integer fieldA,String transferMode, Integer pageNo, Integer pageSize,
-			Integer timeSort,String upperPrice,String lowerPrice);
+			Integer timeSort,String upperPrice,String lowerPrice,Integer internationalFlag);
 
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
 	

+ 5 - 2
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -395,7 +395,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		List<AchievementKeyword> AchievementKeywordList = new ArrayList<>();
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
-		String techBrokerId = TokenManager.getAdminId();
+		String techBrokerId = TokenManager.hasRole(AFTConstants.TECHBROKER) ? TokenManager.getAdminId() : null;
 		for (AchievementImportBo bo : data) {
 			a = new Achievement();
 			BeanUtils.copyProperties(bo, a);
@@ -428,7 +428,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	public Pagination<AchievementSearchListBo> listAchievementSearchList(String keyword, Integer dataCategory,
 			Integer category, Integer fieldA, String transferMode, Integer pNo, Integer pSize, Integer dateSort,
-			String upperPrice, String lowerPrice) {
+			String upperPrice, String lowerPrice,Integer internationalFlag) {
 		Map<String, Object> params = new HashMap<>();
 		if (!StringUtils.isBlank(keyword)) {
 			params.put("keyword", keyword);
@@ -457,6 +457,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (lowerPrice != null) {
 			params.put("lowerPrice", lowerPrice);
 		}
+		if (null !=internationalFlag ) {
+			params.put("internationalFlag", internationalFlag);
+		}
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}

+ 6 - 0
src/main/java/com/goafanti/admin/service/AdminVarietiesService.java

@@ -0,0 +1,6 @@
+package com.goafanti.admin.service;
+
+public interface AdminVarietiesService {
+	
+	int insert(String cname, String superId);
+}

+ 0 - 11
src/main/java/com/goafanti/admin/service/BusinessService.java

@@ -1,11 +0,0 @@
-package com.goafanti.admin.service;
-
-
-
-import com.goafanti.admin.bo.BusinessBo;
-import com.goafanti.core.mybatis.page.Pagination;
-
-public interface BusinessService {
-	Pagination<BusinessBo> listBusiness(String cname,Integer super_id,Integer layer,
-			Integer status,Integer pNo,Integer pSize,Integer hot);
-}

+ 7 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1195,7 +1195,9 @@
   	<if test="lowerPrice != null and lowerPrice != ''">
   		and a.transfer_price &gt; #{lowerPrice,jdbcType=VARCHAR}
   	</if> 	
-  	
+  	<if test="internationalFlag != null ">
+  		and a.international_flag = #{internationalFlag,jdbcType=INTEGER}
+  	</if>
   	and a.release_status = 1
   	and a.audit_status = 3 
   	<if test="dateSort == 0">
@@ -1234,7 +1236,10 @@
   	</if>
   	<if test="lowerPrice != null and lowerPrice != ''">
   		and a.transfer_price &gt; #{lowerPrice,jdbcType=VARCHAR}
-  	</if> 	
+  	</if> 
+  	<if test="internationalFlag != null ">
+  		and a.international_flag = #{internationalFlag,jdbcType=INTEGER}
+  	</if>	
   	
   	and a.release_status = 1
   	and a.audit_status = 3 

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

@@ -73,7 +73,7 @@
       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)
+      principal_id, deleted_sign, audit_status, tech_broker_id,boutique,remark)
     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}, 
@@ -86,7 +86,7 @@
       #{employerContactsMailbox,jdbcType=VARCHAR}, #{contacts,jdbcType=INTEGER}, #{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})
+      #{techBrokerId,jdbcType=VARCHAR},#{boutique,jdbcType=INTEGER},#{remark,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Demand" >
     insert into demand
@@ -205,6 +205,9 @@
       <if test="boutique != null" >
         boutique,
       </if>
+      <if test="remark != null" >
+        remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -321,6 +324,9 @@
       <if test="boutique != null" >
         #{boutique,jdbcType=INTEGER},
       </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.Demand" >
@@ -437,6 +443,9 @@
       <if test="boutique != null">
       	boutique = #{boutique,jdbcType=INTEGER},
       </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -880,7 +889,7 @@
   		d.budget_cost as budgetCost, d.fixed_cycle as fixedCycle, d.people_number as peopleNumber,
   		d.fixed_scheme as fixedScheme, d.cost_escrow as costEscrow, d.employer_id as employerId,
   		oi.postal_address as address, u.email as mailbox,  d.contacts, d.audit_status as auditStatus,
-  		d.tech_broker_id as techBrokerId,
+  		d.tech_broker_id as techBrokerId,d.remark
   		d.employer_address as employerAddress, d.employer_contacts_mobile as employerContactsMobile,
   		d.employer_contacts_mailbox as employerContactsMailbox, d.employer_name as employerName,
   		d.boutique,ifnull(mm.effective,0) as hot,mm.cover_img as coverImg

+ 14 - 1
src/main/java/com/goafanti/common/model/Demand.java

@@ -199,8 +199,21 @@ public class Demand {
      * 技术经纪人ID
      */
     private String techBrokerId;
+    
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 
-    public String getId() {
+	public String getId() {
         return id;
     }
 

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

@@ -105,6 +105,9 @@ public class AchievementSearchListBo {
 	/** 行业分类 **/
 	private String 		fieldAs;
 	
+	/** 是否国际*/
+	private Integer internationalFlag;
+	
 	public Integer getLevel() {
 		return level;
 	}
@@ -285,5 +288,13 @@ public class AchievementSearchListBo {
 	public void setFieldAs(String fieldAs) {
 		this.fieldAs = fieldAs;
 	}
+
+	public Integer getInternationalFlag() {
+		return internationalFlag;
+	}
+
+	public void setInternationalFlag(Integer internationalFlag) {
+		this.internationalFlag = internationalFlag;
+	}
 	
 }

+ 3 - 2
src/main/java/com/goafanti/portal/controller/PortalSearchController.java

@@ -43,7 +43,8 @@ public class PortalSearchController extends BaseController {
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/achievementList", method = RequestMethod.GET)
 	public Result achievementSearchList(  String keyword,Integer dataCategory,Integer category,
-			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice) {
+			Integer fieldA, String pageNo, String pageSize,String transferMode, Integer dateSort,String upperPrice,String lowerPrice,
+			Integer internationalFlag) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 20;
@@ -65,7 +66,7 @@ public class PortalSearchController extends BaseController {
 		}
 		
 		Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList( 
-				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice);
+				  keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice,internationalFlag);
 		
 		
 		List<AchievementSearchListBo> list = (List<AchievementSearchListBo>) achievementSearchList.getList();

+ 20 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -92,6 +92,26 @@
 					</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">

+ 16 - 10
src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html

@@ -35,25 +35,32 @@
   			<ul>
   				<li>
   					<div>
-  						<img th:src="${portalHost + '/img/assessMent_01.png'}" alt="" class="people"/><span>项目服务</span>
+  						<img th:src="${portalHost + '/img/assessMent_01.png'}" alt="" class="people"/><span>评估流程</span>
   						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line"/>
   					</div>
   				</li>
   				<li>
   					<div>
-  						<img th:src="${portalHost + '/img/assessMent_02.png'}" alt=""  class="people"/><span>政策法规</span>
+  						<a href="#services">
+  							<img th:src="${portalHost + '/img/assessMent_02.png'}" alt=""  class="people"/><span>服务项目</span>
+  						</a>
   						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line"/>
   					</div>
   				</li>
   				<li>
   					<div>
-  						<img th:src="${portalHost + '/img/assessMent_03.png'}" alt="" class="people"/><span>为何选我</span>
+  						<a href="#policies">
+  							<img th:src="${portalHost + '/img/assessMent_03.png'}" alt="" class="people"/><span>政策法规</span>
+  						</a>
   						<img th:src="${portalHost + '/img/assessMent_00.png'}" alt="" class="line" />
   					</div>
   				</li>
   				<li>
   					<div>
-  						<img th:src="${portalHost + '/img/assessMent_04.png'}" alt=""  class="people"/><span>服务案例</span>
+  						<a href="#advantages">
+  							<img th:src="${portalHost + '/img/assessMent_04.png'}" alt=""  class="people"/><span>我们的优势</span>
+  						</a>
+  						
   					</div>
   				</li>
   			</ul>
@@ -134,7 +141,7 @@
   			<a href="javascript:;" onclick="_MEIQIA('showPanel')">在线咨询</a>
   		</div>
   	</div>
-  	<div class="services">
+  	<div class="services" id="services">
   		<div>
   			<div class="services_left">
 	  			<div>
@@ -210,7 +217,7 @@
   		</div>
   		
   	</div>
-  	<div class="policies">
+  	<div class="policies" id="policies">
   		<div class="policies_title">
   			
   		</div>
@@ -233,7 +240,6 @@
   			</div>
   		</div>
   		<div class="policies_bot">
-  		
   			<a th:if="${#lists.size(zcfg) ge 2}" th:href="@{/portal/news/newsDetail(id=${zcfg[1].id})}" >
   			<div  class="bot" >
   				<h5 th:text=${zcfg[1].createTimeFormattedDate}></h5>
@@ -251,16 +257,16 @@
   			</div>
   			</a>
   			<a th:if="${#lists.size(zcfg) ge 4}" th:href="@{/portal/news/newsDetail(id=${zcfg[3].id})}" >
-  			<div  class="bot">
+  				<div  class="bot">
   				<h5 th:text=${zcfg[3].createTimeFormattedDate}></h5>
   				<div class="line"></div>
   				<h4 th:text=${zcfg[3].title}></h4>
   				<p th:text=${zcfg[3].summary}></p>
   				</div>
-  				</a>
+  			</a>
   		</div>
   	</div>
-  	<div class="advantages">
+  	<div class="advantages" id="advantages">
   		<div>
   			<div class="advantages_title">