Переглянути джерело

Accept Merge Request #261 update to pro : (test -> prod)

Merge Request: update to pro
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/261
浅川 8 роки тому
батько
коміт
6d193bca16
40 змінених файлів з 825 додано та 68 видалено
  1. 2 2
      src/main/java/com/goafanti/achievement/bo/InputAchievement.java
  2. 1 1
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  3. 5 2
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  4. 89 0
      src/main/java/com/goafanti/admin/bo/BusinessVarietiesBo.java
  5. 62 0
      src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java
  6. 10 0
      src/main/java/com/goafanti/admin/service/AdminVarietiesService.java
  7. 0 11
      src/main/java/com/goafanti/admin/service/BusinessService.java
  8. 46 0
      src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java
  9. 8 1
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  10. 13 0
      src/main/java/com/goafanti/common/dao/AdminVarietiesMapper.java
  11. 5 0
      src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java
  12. 7 2
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  13. 30 0
      src/main/java/com/goafanti/common/mapper/AdminVarietiesMapper.xml
  14. 12 3
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  15. 24 0
      src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml
  16. 13 6
      src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml
  17. 24 0
      src/main/java/com/goafanti/common/model/AdminLocationBo.java
  18. 88 0
      src/main/java/com/goafanti/common/model/BusinessVarieties.java
  19. 14 1
      src/main/java/com/goafanti/common/model/Demand.java
  20. 1 1
      src/main/java/com/goafanti/common/model/User.java
  21. 2 1
      src/main/java/com/goafanti/common/utils/ExcelUtils.java
  22. 1 1
      src/main/java/com/goafanti/common/utils/MobileMessageUtils.java
  23. 9 0
      src/main/java/com/goafanti/common/utils/PasswordUtil.java
  24. 23 6
      src/main/java/com/goafanti/customer/bo/CustomerExcelBo.java
  25. 8 2
      src/main/java/com/goafanti/customer/controller/CustomerApiController.java
  26. 1 1
      src/main/java/com/goafanti/customer/service/CustomerService.java
  27. 43 11
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  28. 101 0
      src/main/java/com/goafanti/organization/bo/OrganizationListOut.java
  29. 26 0
      src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java
  30. 16 0
      src/main/java/com/goafanti/organization/service/OrganizationService.java
  31. 45 0
      src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java
  32. 11 0
      src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java
  33. 10 0
      src/main/java/com/goafanti/portal/bo/UserSubscriberListBo.java
  34. 5 4
      src/main/java/com/goafanti/portal/controller/PortalSearchController.java
  35. 1 1
      src/main/java/com/goafanti/user/service/UserIdentityService.java
  36. 4 1
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  37. 20 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  38. 16 10
      src/main/webapp/WEB-INF/views/portal/technologyTrading/assessMent.html
  39. 21 0
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html
  40. 8 0
      src/test/java/com/goafanti/test/TestValueEvaluation.java

+ 2 - 2
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -16,7 +16,7 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		dataCategory;
 
-	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		name;
 
 	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
@@ -64,7 +64,7 @@ public class InputAchievement {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		innovation;
 
-	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		ownerName;
 
 	@Max(value = 1, message = "{" + ErrorConstants.PARAM_ERROR + "}")

+ 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;
 		}

+ 89 - 0
src/main/java/com/goafanti/admin/bo/BusinessVarietiesBo.java

@@ -0,0 +1,89 @@
+package com.goafanti.admin.bo;
+
+
+import java.util.Date;
+
+public class BusinessVarietiesBo {
+	/*分类ID*/
+	private String id;
+	/*创建人*/
+	private String create_id;
+	/*创建时间*/
+	private Date create_time;
+	/*更新时间*/
+	private Date update_time;
+	/*删除标识*/
+	private Integer delete_sign;
+	/*分类编号*/
+	private String cid;
+	/*分类名称*/
+	private String cname;
+	/*父分类*/
+	private String super_id;
+	/*分类层级*/
+	private Integer layer;
+	/*分类状态*/
+	private String status;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getCreate_id() {
+		return create_id;
+	}
+	public void setCreate_id(String create_id) {
+		this.create_id = create_id;
+	}
+	public Date getCreate_time() {
+		return create_time;
+	}
+	public void setCreate_time(Date create_time) {
+		this.create_time = create_time;
+	}
+	public Date getUpdate_time() {
+		return update_time;
+	}
+	public void setUpdate_time(Date update_time) {
+		this.update_time = update_time;
+	}
+	public Integer getDelete_sign() {
+		return delete_sign;
+	}
+	public void setDelete_sign(Integer delete_sign) {
+		this.delete_sign = delete_sign;
+	}
+	public String getCid() {
+		return cid;
+	}
+	public void setCid(String cid) {
+		this.cid = cid;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public String getSuper_id() {
+		return super_id;
+	}
+	public void setSuper_id(String super_id) {
+		this.super_id = super_id;
+	}
+	public Integer getLayer() {
+		return layer;
+	}
+	public void setLayer(Integer layer) {
+		this.layer = layer;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+}
+

+ 62 - 0
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -0,0 +1,62 @@
+package com.goafanti.admin.controller;
+
+import javax.annotation.Resource;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+
+import com.goafanti.admin.service.AdminVarietiesService;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseController;
+import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.BusinessVarieties;
+import com.goafanti.common.utils.StringUtils;
+@RestController
+@RequestMapping("api/admin/Varieties")
+public class AdminVarietiesApiController extends BaseController{
+	@Resource
+	private AdminVarietiesService adminVarietiesService;
+	
+	/**
+	 * 新增品类
+	 */
+	@RequestMapping(value = "/addVarieties" , method = RequestMethod.GET)
+	public Result addVarieties(String cname,String superId) {
+		Result res=new Result();
+		if (StringUtils.isBlank(cname)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "登录帐号为空", "登录帐号"));
+			return res;
+		}
+		if (StringUtils.isBlank(superId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "上级用户为空", "上级用户"));
+			return res;
+		}
+		res.setData(adminVarietiesService.insert(cname,superId));
+		
+		return res;
+		
+	}
+	/**
+	 * 搜索品类
+	 */
+	@RequestMapping(value="/vtList" ,method=RequestMethod.GET)
+	public Result vtList(String cname,String super_name,Integer layer,
+			String status,String pageNo, String pageSize) {
+		Result res = new Result();
+        Integer pNo = 1;
+        Integer pSize = 10;
+        if (StringUtils.isNumeric(pageSize)) {
+            pSize = Integer.parseInt(pageSize);
+        }
+        if (StringUtils.isNumeric(pageNo)) {
+            pNo = Integer.parseInt(pageNo);
+        }
+        res.setData(adminVarietiesService);
+		return res;
+	}
+
+}

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

@@ -0,0 +1,10 @@
+package com.goafanti.admin.service;
+
+import com.goafanti.core.mybatis.page.Pagination;
+
+public interface AdminVarietiesService {
+	
+	int insert(String cname, String superId);
+	
+	/*Pagination<BusinessVaruetiesBo> bvList();*/
+}

+ 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);
-}

+ 46 - 0
src/main/java/com/goafanti/admin/service/impl/AdminVarietiesServiceImpl.java

@@ -0,0 +1,46 @@
+package com.goafanti.admin.service.impl;
+
+import java.util.UUID;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.admin.bo.BusinessVarietiesBo;
+import com.goafanti.admin.service.AdminVarietiesService;
+import com.goafanti.common.dao.AdminVarietiesMapper;
+import com.goafanti.common.model.BusinessVarieties;
+import com.goafanti.core.shiro.token.TokenManager;
+
+@Service
+public class AdminVarietiesServiceImpl implements AdminVarietiesService {
+	
+	@Autowired
+	private AdminVarietiesMapper adminVarietiesMapper;
+	
+	public int insert(String cname, String superId) {
+		BusinessVarietiesBo buv=new BusinessVarietiesBo();
+		buv.setId(UUID.randomUUID().toString());
+		buv.setCname(cname);
+		buv.setSuper_id(superId);
+		buv.setDelete_sign(0);
+		if (Integer.valueOf(superId)<=0) {
+			if (null!=adminVarietiesMapper.MaxId(superId)||adminVarietiesMapper.MaxId(superId)>0) {
+				buv.setCid("00"+adminVarietiesMapper.MaxId(superId));
+			}
+		}else {
+			if (null!=adminVarietiesMapper.MaxId(superId)||adminVarietiesMapper.MaxId(superId)>0) {
+				buv.setCid(superId+adminVarietiesMapper.MaxId(superId));
+			}
+			
+		}
+		buv.setCreate_id(TokenManager.getAdminId());
+		buv.setLayer(buv.getCid().length()/2);
+		buv.setStatus("正常");
+		BusinessVarieties bv=new BusinessVarieties();
+		BeanUtils.copyProperties(buv,bv);
+		return adminVarietiesMapper.insert(bv);
+		
+	}
+
+}

+ 8 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -96,4 +96,11 @@ public class AFTConstants {
 	public static final String USER_DELETE							= "删除客户";
 	
 	public static final String USER_RECEIVE							= "领取";
-}
+	
+	/**组织类型-公司*/
+	public static final String ORGANIZATION_TYPE_COMPANY			= "0";
+	/**组织类型-部门*/
+	public static final String ORGANIZATION_TYPE_DEPARTMENT			= "1";
+	/**组织类型-团队*/
+	public static final String ORGANIZATION_TYPE_TEAM				= "2";
+}

+ 13 - 0
src/main/java/com/goafanti/common/dao/AdminVarietiesMapper.java

@@ -0,0 +1,13 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.BusinessVarieties;
+
+public interface AdminVarietiesMapper {
+   
+	Integer insert(BusinessVarieties bv);
+
+	Integer MaxId(String superId);
+
+   
+
+}

+ 5 - 0
src/main/java/com/goafanti/common/dao/OrganizationManagementMapper.java

@@ -0,0 +1,5 @@
+package com.goafanti.common.dao;
+
+public interface OrganizationManagementMapper {
+	
+}

+ 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 

+ 30 - 0
src/main/java/com/goafanti/common/mapper/AdminVarietiesMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.AdminVarietiesMapper">
+  <sql id="varietiesList" >
+    id,create_id,create_time,update_time,
+    ,delete_sign,cid,cname,super_id,layer,status
+  </sql>
+  
+  
+   <insert id="insert" parameterType="com.goafanti.admin.bo.BusinessVarietiesBo">
+    insert into business_varieties (
+    <include refid="varietiesList"/>
+    )values
+    (#{id,jdbcType=VARCHAR},#{create_id,jdbcType=VARCHAR},now(),#{update_time,jdbcType=TIMESTAMP},
+    #{delete_sign,jdbcType=INTEGER},#{cid,jdbcType=VARCHAR},
+    #{cname,jdbcType=VARCHAR},#{super_id,jdbcType=VARCHAR},#{layer,jdbcType=INTEGER},#{status,jdbcType=VARCHAR})
+    </insert>
+    
+    <select id="selectvarieties" resultType="com.goafanti.admin.bo.BusinessVarietiesBo" >
+    select 
+    <include refid="varietiesList" />
+    from business_varieties
+    
+  	</select>
+  	
+  	<select id="MaxId" resultType="string">
+  	select max(cid) from business_varieties
+  	where super_id=#{superId,jdbcType=VARCHAR} 
+  	</select>
+</mapper>

+ 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

+ 24 - 0
src/main/java/com/goafanti/common/mapper/OrganizationManagementMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.OrganizationManagementMapper">
+	<select id="selectOrganizationList" resultType="com.goafanti.organization.bo.OrganizationListOut">
+		select
+		u.id as uid,om.id,om.create_id as createId,om.create_time as createTime,
+		om.update_time as updateTime,om.deleted_sign as deletedSign,
+		om.name,om.type,om.manager_id as managerId,
+		om.dep_no as depNo,
+		om.super_id as superId,
+		om.desc
+		from user u
+		left join organization_management om on om.id = u.id
+	</select>
+	<select id="selectOrganizationCount" resultType="java.lang.Integer">
+		select
+		count(0)
+		from 
+		(select
+		id
+		from idorganization_management
+		)	
+	</select>
+</mapper>

+ 13 - 6
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -803,17 +803,18 @@
 		SELECT
 			u.id as uid, ui.username, u.number,
 			ui.id as identityId, ui.province,
-			info.person_portrait_url as personPortraitUrl,
+			u.head_portrait_url as personPortraitUrl,
 			adc.achievement_count as achievementNum,
 			adc.demand_count as demandNum,
 			uc.engaged_field as engagedField,
 			uc.work_unit as workUnit,
-			uc.position
+			uc.position,
+			ui.international
 		FROM
 			<![CDATA[ user ]]> u
 		LEFT JOIN user_identity ui ON ui.uid = u.id
 		LEFT JOIN user_career uc ON uc.uid = u.id
-		LEFT JOIN user_info info ON info.uid = u.id
+		<!-- LEFT JOIN user_info info ON info.uid = u.id -->
 		LEFT JOIN achievement_demand_count adc ON adc.uid = u.id
 		WHERE
 			u.type = 0 and ui.expert = 1
@@ -823,6 +824,9 @@
 		<if test="null !=level and level==0">
 			AND u.lvl = 0
 		</if>
+		<if test="international !=null">
+			AND ui.international= #{international,jdbcType=INTEGER}
+		</if>
 		<if test="province != null">
 			AND ui.province = #{province,jdbcType=INTEGER}
 		</if>
@@ -860,6 +864,9 @@
 			<if test="null != level and level==0">
 				AND u.lvl = 0
 			</if>
+			<if test="international !=null">
+				AND ui.international= #{international,jdbcType=INTEGER}
+			</if>
 			<if test="province != null">
 				AND ui.province = #{province,jdbcType=INTEGER}
 			</if>
@@ -881,15 +888,15 @@
 			a.id,
 			b.username as ownerName,
 			c.ability_label as abilityLabel,
-			d.person_portrait_url personPortraitUrl,
+			a.head_portrait_url personPortraitUrl,
 			e.education
 		from user a 
 		left join user_identity b 
 			on a.id = b.uid
 		left join user_ability c 
 			on a.id = c.uid
-		left join user_info d 
-			on a.id = d.uid
+		<!-- left join user_info d 
+			on a.id = d.uid -->
 		left join user_edu e 
 			on a.id = e.uid
 		where 1=1

+ 24 - 0
src/main/java/com/goafanti/common/model/AdminLocationBo.java

@@ -0,0 +1,24 @@
+package com.goafanti.common.model;
+
+public class AdminLocationBo {
+	private Integer	province;
+
+	private String	city;
+
+	public Integer getProvince() {
+		return province;
+	}
+
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+}

+ 88 - 0
src/main/java/com/goafanti/common/model/BusinessVarieties.java

@@ -0,0 +1,88 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class BusinessVarieties {
+	/*分类ID*/
+	private String id;
+	/*创建人*/
+	private String create_id;
+	/*创建时间*/
+	private Date create_time;
+	/*更新时间*/
+	private Date update_time;
+	/*删除标识*/
+	private Integer delete_sign;
+	/*分类编号*/
+	private String cid;
+	/*分类名称*/
+	private String cname;
+	/*父分类*/
+	private String super_id;
+	/*分类层级*/
+	private Integer layer;
+	/*分类状态*/
+	private String status;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getCreate_id() {
+		return create_id;
+	}
+	public void setCreate_id(String create_id) {
+		this.create_id = create_id;
+	}
+	public Date getCreate_time() {
+		return create_time;
+	}
+	public void setCreate_time(Date create_time) {
+		this.create_time = create_time;
+	}
+	public Date getUpdate_time() {
+		return update_time;
+	}
+	public void setUpdate_time(Date update_time) {
+		this.update_time = update_time;
+	}
+	public Integer getDelete_sign() {
+		return delete_sign;
+	}
+	public void setDelete_sign(Integer delete_sign) {
+		this.delete_sign = delete_sign;
+	}
+	public String getCid() {
+		return cid;
+	}
+	public void setCid(String cid) {
+		this.cid = cid;
+	}
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public String getSuper_id() {
+		return super_id;
+	}
+	public void setSuper_id(String super_id) {
+		this.super_id = super_id;
+	}
+	public Integer getLayer() {
+		return layer;
+	}
+	public void setLayer(Integer layer) {
+		this.layer = layer;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+}
+

+ 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;
     }
 

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

@@ -2,7 +2,7 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
-public class User implements AftUser{
+public class User extends BaseModel implements AftUser{
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column user.id
 	 * @mbg.generated  Tue Nov 14 19:38:26 CST 2017

+ 2 - 1
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -137,11 +137,12 @@ public class ExcelUtils {
 			vacantRows.add(rowNumber);
 			return "";
 		}else{
-			return String.valueOf(cellValue);
+			return String.valueOf(cellValue).trim();
 		} 
 	}
 
 	public String checkMobile(String mobile, int rowNumber){
+		mobile = mobile.trim();
 		String mobileRegex = "^1[3|4|5|7|8][0-9]{9}$"; 
 		String telRegex = "^\\d{3,4}-\\d{7,8}$";
 		if(StringUtils.isBlank(mobile)) return "";

+ 1 - 1
src/main/java/com/goafanti/common/utils/MobileMessageUtils.java

@@ -13,7 +13,7 @@ import com.goafanti.common.constant.ErrorConstants;
 
 public class MobileMessageUtils {
 	
-	private final static String SIGN_NAME = "技淘网";
+	private final static String SIGN_NAME = "阿凡提信息科技";
 	
 	private final static String SERVER_EXCEPTION = "服务器端手机验证码异常:%s";
 	

+ 9 - 0
src/main/java/com/goafanti/common/utils/PasswordUtil.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.utils;
 
+import java.util.Calendar;
 import java.util.Date;
 
 import org.apache.shiro.crypto.hash.SimpleHash;
@@ -56,4 +57,12 @@ public class PasswordUtil {
 	public ByteSource getSalt(Date date) {
 		return ByteSource.Util.bytes(String.valueOf(date.getTime()));
 	}
+	
+	
+	public static void main(String[] args) {
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		String s = String.valueOf(now.getTime());
+		System.out.println(new SimpleHash("md5","123456",s,2));
+	}
 }

+ 23 - 6
src/main/java/com/goafanti/customer/bo/CustomerExcelBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.customer.bo;
 
+import com.goafanti.common.constant.AFTConstants;
+
 public class CustomerExcelBo {
 	/** 营销员ID **/
 	private String aid;
@@ -25,6 +27,8 @@ public class CustomerExcelBo {
 	private String mobile;
 	/** 行号 **/
 	private int rowNumber;
+	/** 是否新建 **/
+	private boolean newData;
 	
 	public String getAid() {
 		return aid;
@@ -98,19 +102,32 @@ public class CustomerExcelBo {
 	public void setRowNumber(int rowNumber) {
 		this.rowNumber = rowNumber;
 	}
-	
+	public boolean isNewData() {
+		return newData;
+	}
+	public void setNewData(boolean newData) {
+		this.newData = newData;
+	}
 	@Override
 	public boolean equals(Object obj) {
 		if(!(obj instanceof CustomerExcelBo)) return false;
 		CustomerExcelBo bo = (CustomerExcelBo)obj;
-		if(this.identifyName.equals(bo.getIdentifyName()) && this.businessGlossoryId.equals(bo.getBusinessGlossoryId()))
-			return true;
-		else 
-			return false;
+		if(!this.customerType.equals(bo.getCustomerType())) return false;
+		if(AFTConstants.USER_TYPE_PERSONAL.equals(this.customerType)){
+			if(this.mobile.equals(bo.getMobile()) && this.businessGlossoryId.equals(bo.getBusinessGlossoryId()))
+				return true;
+		}else if(AFTConstants.USER_TYPE_ORGANIZATION.equals(this.customerType)){
+			if(this.identifyName.equals(bo.getIdentifyName()) && this.businessGlossoryId.equals(bo.getBusinessGlossoryId()))
+				return true;
+		}
+		return false;
 	}
 	@Override
 	public int hashCode() {
-		return (this.identifyName+";"+this.businessGlossoryId).hashCode();
+		if(AFTConstants.USER_TYPE_PERSONAL.equals(this.customerType))
+			return (this.mobile+";"+this.mobile).hashCode();
+		else
+			return (this.identifyName+";"+this.businessGlossoryId).hashCode();
 	}
 	
 }

+ 8 - 2
src/main/java/com/goafanti/customer/controller/CustomerApiController.java

@@ -402,13 +402,19 @@ public class CustomerApiController extends BaseApiController{
 					res.getError().add(new Error(errorMessage));
 					return res;
 				}
-				Set<Integer> existRows = new TreeSet<Integer>();
-				customerService.checkCustomer(boSet,existRows);
+				Set<Integer> existRows = new TreeSet<Integer>(); //数据库已存在
+				Set<Integer> filterRows = new TreeSet<Integer>(); //过滤提示
+				customerService.checkCustomer(boSet,existRows,filterRows);
 				if(existRows.size()>0){
 					errorMessage = StringUtils.join(existRows.toArray(),",")+ " 行客户业务已存在;";
 					res.getError().add(new Error(errorMessage));
 					return res;
 				}
+				if(filterRows.size()>0){
+					errorMessage = StringUtils.join(filterRows.toArray(),",")+ " 行已经被系统过滤;";
+					res.getError().add(new Error(errorMessage));
+					return res;
+				}
 				customerService.saveUploadData(boSet);
 			} catch (IOException e) {
 				e.printStackTrace();

+ 1 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -209,7 +209,7 @@ public interface CustomerService {
 	 * @param boSet
 	 * @param existRows
 	 */
-	void checkCustomer(Set<CustomerExcelBo> boSet,Set<Integer> existRows);
+	void checkCustomer(Set<CustomerExcelBo> boSet,Set<Integer> existRows, Set<Integer> filterRows);
 	
 	/**
 	 * 保存上传数据

+ 43 - 11
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -515,18 +515,51 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 	}
 
 	@Override
-	public void checkCustomer(Set<CustomerExcelBo> boSet, Set<Integer> existRows) {
+	public void checkCustomer(Set<CustomerExcelBo> boSet, Set<Integer> existRows, Set<Integer> filterRows) {
 		List<User> list = null;
-		User user = null;
-		for (CustomerExcelBo bo : boSet) {
-			list = userMapper.checkUser("", bo.getIdentifyName(), "", Integer.parseInt(bo.getCustomerType()));
-			if (list.size() > 0) {
-				user = list.get(0);
-				bo.setUid(user.getId());
+		CustomerExcelBo[] bos = (CustomerExcelBo[])boSet.toArray(new CustomerExcelBo[] {});
+		for (int i=0;i<bos.length;i++) {
+			CustomerExcelBo bo = bos[i];
+			CustomerExcelBo ceb = null;
+			for(int j=0;j<i;j++){
+				ceb = bos[j];
+				if(bo.getCustomerType().equals(AFTConstants.USER_TYPE_PERSONAL)){ //个人
+					if(ceb.getMobile().equals(bo.getMobile()) && ceb.getCustomerType().equals(bo.getCustomerType())){
+						bo.setUid(ceb.getUid());
+						bo.setNewData(false);
+						filterRows.add(bo.getRowNumber());
+						break;
+					}
+				}else if(bo.getCustomerType().equals(AFTConstants.USER_TYPE_ORGANIZATION)){ //单位
+					if(ceb.getIdentifyName().equals(bo.getIdentifyName()) && ceb.getCustomerType().equals(bo.getCustomerType())){
+						bo.setUid(ceb.getUid());
+						bo.setNewData(false);
+						filterRows.add(bo.getRowNumber());
+						break;
+					}
+				}
+			}
+			if(StringUtils.isBlank(bo.getUid())){ //是否已经存在
+				if(bo.getCustomerType().equals(AFTConstants.USER_TYPE_PERSONAL)){
+					list = userMapper.checkUser("", "", bo.getMobile(), Integer.parseInt(bo.getCustomerType()));
+				}else if(bo.getCustomerType().equals(AFTConstants.USER_TYPE_ORGANIZATION)){
+					list = userMapper.checkUser("", bo.getIdentifyName(), "", Integer.parseInt(bo.getCustomerType()));
+				}			
+				if (list.size() > 0) {
+					bo.setUid(list.get(0).getId());
+					bo.setNewData(false);
+					if (userBusinessMapper.judgeBusiness(bo.getUid(), Integer.parseInt(bo.getBusinessGlossoryId()),"") > 0) {
+						existRows.add(bo.getRowNumber());
+					}
+				}else{
+					bo.setUid(UUID.randomUUID().toString());
+					bo.setNewData(true);
+				}
+			}else{
 				if (userBusinessMapper.judgeBusiness(bo.getUid(), Integer.parseInt(bo.getBusinessGlossoryId()),"") > 0) {
 					existRows.add(bo.getRowNumber());
 				}
-			}
+			}	
 		}
 	}
 
@@ -536,14 +569,13 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 		Date now = new Date();
 		String uid = "";
 		for(CustomerExcelBo bo : boSet){
-			if(StringUtils.isBlank(bo.getUid())){ //新建客户
-				uid = UUID.randomUUID().toString();
+			uid = bo.getUid();
+			if(bo.isNewData()){ //新建客户
 				createUser(bo, uid, now);
 				createIdentity(bo, bo.getCustomerType(), uid);
 				createBusiness(bo, uid, now);
 				createContacts(bo, uid);	
 			}else{ //新建业务
-				uid = bo.getUid();
 				createBusiness(bo, uid, now);
 				if(organizationContactBookMapper.checkContacts(uid, bo.getMobile(), TokenManager.getAdminId())<=0){
 					createContacts(bo, uid);

+ 101 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -0,0 +1,101 @@
+package com.goafanti.organization.bo;
+
+public class OrganizationListOut {
+	/**登录用户ID**/
+	private String uid;
+	/**组织ID**/
+	private String id;
+	/**创建人**/
+	private String createId;
+	/**创建时间**/
+	private String updateTime;
+	/**更新时间**/
+	private String datetime;
+	/**删除标识**/
+	private String deletedSign;
+	/**组织名称**/
+	private String name;
+	/**组织类型**/
+	private String type;
+	/**组织负责人ID**/
+	private String managerId;
+	/**组织编号**/
+	private String depNo;
+	/**上级组织**/
+	private String superId;
+	/**组织职能说明**/
+	private String desc;
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getCreateId() {
+		return createId;
+	}
+	public void setCreateId(String createId) {
+		this.createId = createId;
+	}
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+	public String getDatetime() {
+		return datetime;
+	}
+	public void setDatetime(String datetime) {
+		this.datetime = datetime;
+	}
+	public String getDeletedSign() {
+		return deletedSign;
+	}
+	public void setDeletedSign(String deletedSign) {
+		this.deletedSign = deletedSign;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getManagerId() {
+		return managerId;
+	}
+	public void setManagerId(String managerId) {
+		this.managerId = managerId;
+	}
+	public String getDepNo() {
+		return depNo;
+	}
+	public void setDepNo(String depNo) {
+		this.depNo = depNo;
+	}
+	public String getSuperId() {
+		return superId;
+	}
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+}

+ 26 - 0
src/main/java/com/goafanti/organization/controller/OrganizationManagementController.java

@@ -0,0 +1,26 @@
+package com.goafanti.organization.controller;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.organization.bo.OrganizationListOut;
+import com.goafanti.organization.service.OrganizationService;
+
+@RestController
+@RequestMapping("api/admin/organization")
+public class OrganizationManagementController {
+	@Resource
+	private OrganizationService organizationService;
+	/**部门组织管理列表 **/
+	@RequestMapping(value = "/listOrganizationManagement" , method = RequestMethod.POST)
+	public Result listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
+			Integer pageSize){
+		Result res = new Result();
+		res.setData(organizationService.listOrganizationManagement(olo, pageNo, pageSize));
+		return res;		
+	}
+}

+ 16 - 0
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -0,0 +1,16 @@
+package com.goafanti.organization.service;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.organization.bo.OrganizationListOut;
+
+public interface OrganizationService {
+	/**
+	 * 部门组织管理查询
+	 * @param olo
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	Pagination<OrganizationListOut> 
+	listOrganizationManagement(OrganizationListOut olo,Integer pageNo, Integer pageSize);
+}

+ 45 - 0
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -0,0 +1,45 @@
+package com.goafanti.organization.service.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.organization.bo.OrganizationListOut;
+import com.goafanti.organization.service.OrganizationService;
+import com.goafanti.common.dao.UserMapper;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+@Service
+public class OrganizationServiceImpl extends BaseMybatisDao<UserMapper> implements OrganizationService {
+	
+	@Override
+	public Pagination<OrganizationListOut> listOrganizationManagement(OrganizationListOut olo, Integer pageNo,
+			Integer pageSize) {
+		olo.setId(TokenManager.getAdminId());
+		Map<String,Object> params =disposeParams(olo);
+		@SuppressWarnings("unchecked")
+		Pagination<OrganizationListOut> list=(Pagination<OrganizationListOut>)findPage("selectOrganizationList","selectOrganizationCount",params,pageNo,pageSize);
+		return list;
+	}
+	private Map<String,Object> disposeParams(OrganizationListOut olo){
+		Map<String,Object> params = new HashMap<String, Object>();		
+		if(StringUtils.isNotBlank(olo.getId())) params.put("id", olo.getId());
+		if(StringUtils.isNotBlank(olo.getCreateId())) params.put("id", olo.getCreateId());
+		if(StringUtils.isNotBlank(olo.getUpdateTime())) params.put("id", olo.getUpdateTime());
+		if(StringUtils.isNotBlank(olo.getDatetime())) params.put("id", olo.getDatetime());
+		if(StringUtils.isNotBlank(olo.getDeletedSign())) params.put("id", olo.getDeletedSign());
+		if(StringUtils.isNotBlank(olo.getName())) params.put("id", olo.getName());
+		if(StringUtils.isNotBlank(olo.getType())) params.put("type", olo.getType());
+		if(StringUtils.isNotBlank(olo.getManagerId())) params.put("id", olo.getManagerId());
+		if(StringUtils.isNotBlank(olo.getDepNo())) params.put("id", olo.getDepNo());
+		if(StringUtils.isNotBlank(olo.getSuperId())) params.put("id", olo.getSuperId());
+		if(StringUtils.isNotBlank(olo.getDesc())) params.put("id", olo.getDesc());
+		return params;
+	}
+
+	
+	
+}

+ 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;
+	}
 	
 }

+ 10 - 0
src/main/java/com/goafanti/portal/bo/UserSubscriberListBo.java

@@ -20,6 +20,16 @@ public class UserSubscriberListBo {
 	private String	workUnit;
 
 	private String	position;
+	/**国际化*/
+	private String	international;
+
+	public String getInternational() {
+		return international;
+	}
+
+	public void setInternational(String international) {
+		this.international = international;
+	}
 
 	public String getEngagedField() {
 		return engagedField;

+ 5 - 4
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();
@@ -135,7 +136,7 @@ public class PortalSearchController extends BaseController {
 	 */
 	@RequestMapping(value = "/subscriberList", method = RequestMethod.GET)
 	public Result subscriberSearchList(String name, Integer level, Integer type, String field, Integer province,
-			Integer city, Integer area, String pageNo, String pageSize) {
+			Integer city, Integer area,Integer international, String pageNo, String pageSize) {
 		Result res = new Result();
 		if (null == type) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "用户类型"));
@@ -161,7 +162,7 @@ public class PortalSearchController extends BaseController {
 			pNo = Integer.parseInt(pageNo);
 		}
 		if (UserType.PERSONAL.getCode().equals(type)) {
-			res.setData(userIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
+			res.setData(userIdentityService.listSubscriber(name, level, field, province, city, area, international, pNo, pSize));
 		} else {
 			res.setData(organizationIdentityService.listSubscriber(name, level, field, province, city, area, pNo, pSize));
 		}

+ 1 - 1
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -34,7 +34,7 @@ public interface UserIdentityService {
 	int updateUserDetailByAuditAdmin(UserIdentity ui, String aid, String mid, Integer level);
 
 	Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province, Integer city,
-			Integer area, Integer pNo, Integer pSize);
+			Integer area,Integer international, Integer pNo, Integer pSize);
 
 	UserIdentityDetailAdminBo selectUserIdentityByUserIdAdmin(String uid);
 }

+ 4 - 1
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -156,7 +156,7 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<UserSubscriberListBo> listSubscriber(String name, Integer level, String field, Integer province,
-			Integer city, Integer area, Integer pNo, Integer pSize) {
+			Integer city, Integer area, Integer international, Integer pNo, Integer pSize) {
 		Map<String, Object> params = new HashMap<>();
 
 		if (StringUtils.isNotBlank(name)) {
@@ -182,6 +182,9 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		if (null != area) {
 			params.put("area", area);
 		}
+		if (null != international) {
+			params.put("international", international);
+		}
 
 		if (pNo == null || pNo < 0) {
 			pNo = 1;

+ 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">
   				

+ 21 - 0
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -88,6 +88,27 @@
 							<div class="search-select col-md-11">
 								<ul id="industryList" class="clearfix"></ul>
 							</div>
+							
+						<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>
+									<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>
 						<ul class='detail_interest_sub clearfix' id="subscriberList">
 						</ul>

+ 8 - 0
src/test/java/com/goafanti/test/TestValueEvaluation.java

@@ -13,6 +13,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.goafanti.admin.service.AdminVarietiesService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.ValueEvaluation;
 import com.goafanti.evaluation.service.ValueEvaluationService;
@@ -23,6 +24,9 @@ import com.goafanti.evaluation.service.ValueEvaluationService;
 public class TestValueEvaluation extends AbstractJUnit4SpringContextTests {
 	@Autowired
 	ValueEvaluationService valueEvaluationService;
+	
+	@Autowired
+	AdminVarietiesService adminVarietiesService;
 
 	@Test
 	public void testValueInsert() {
@@ -33,5 +37,9 @@ public class TestValueEvaluation extends AbstractJUnit4SpringContextTests {
 		ve.setLog("{\"transferType\":1}");
 		Assert.assertTrue("插入用户失败", valueEvaluationService.insert(ve) != 0);
 	}
+	@Test
+	public void testInset() {
+		adminVarietiesService.insert("测试","00");
+	}
 	
 }