Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

anderx 8 years ago
parent
commit
068abc0e14

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

@@ -382,7 +382,8 @@ public class AchievementListBo {
 
 
 	public String getCountInterest() {
-		return String.valueOf(Integer.valueOf(countInterest)+20);
+		if (StringUtils.isBlank(countInterest)) countInterest = "0";
+			return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 
 	public void setCountInterest(String countInterest) {

+ 4 - 4
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -61,7 +61,7 @@ public class AdminAchievementApiController extends CertifyApiController {
      * 个人成果列表
      */
     @RequestMapping(value = "/userList", method = RequestMethod.GET)
-    private Result userList(String username, String ownerName, String ownerId, Integer auditStatus,
+    private Result userList(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus,
             Integer serialNumber, String name, String keyword, Integer category, Integer status,
             String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String pageNo,
             String pageSize,Integer boutique,Integer hot) {
@@ -75,7 +75,7 @@ public class AdminAchievementApiController extends CertifyApiController {
             pNo = Integer.parseInt(pageNo);
         }
        
-        res.setData(achievementService.listUserOwnerAchievement(username, ownerName, ownerId, auditStatus, serialNumber, name,
+        res.setData(achievementService.listUserOwnerAchievement(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name,
                 keyword, category, status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
         return res;
     }
@@ -83,7 +83,7 @@ public class AdminAchievementApiController extends CertifyApiController {
      * 组织用户成果列表
      */
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
-    private Result orgList(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
+    private Result orgList(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
             String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
             Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
         Result res = new Result();
@@ -96,7 +96,7 @@ public class AdminAchievementApiController extends CertifyApiController {
             pNo = Integer.parseInt(pageNo);
         }
         
-        Object o = achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
+        Object o = achievementService.listOrgOwnerAchievement(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name,
                 keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
         
         res.setData(o);

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

@@ -19,7 +19,7 @@ import com.goafanti.portal.bo.InternationalListBo;
 
 public interface AchievementService {
 
-	Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
+	Pagination<AchievementListBo> listUserOwnerAchievement(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer effective);
 
@@ -39,7 +39,7 @@ public interface AchievementService {
 
 	int updateReleaseStatus(Achievement a);
 
-	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
+	Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 

+ 10 - 8
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -94,11 +94,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
+	public Pagination<AchievementListBo> listUserOwnerAchievement(Integer ownerType,String username, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
-		Map<String, Object> params = disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+		Map<String, Object> params = disposeParams(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				boutique,null, hot);
 		if (pNo == null || pNo < 0) {
@@ -119,11 +119,11 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
+	public Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
-		Map<String, Object> params = disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				boutique,internationalFlag, hot);
 		if (pNo == null || pNo < 0) {
@@ -215,12 +215,12 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
-				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
+				disposeParams(ownerType,null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
 						status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
 				pNo, pSize);
 	}
 
-	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
+	private Map<String, Object> disposeParams(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer type,
 			Integer boutique,String internationalFlag, Integer hot) {
@@ -230,7 +230,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		Date rEnd = null;
 		Date cStart = null;
 		Date cEnd = null;
-
+		if (null != ownerType) {
+			params.put("ownerType", ownerType);
+		}
 		if (!StringUtils.isBlank(releaseDateStartDate)) {
 			try {
 				rStart = DateUtils.parseDate(releaseDateStartDate, AFTConstants.YYYYMMDD);
@@ -725,7 +727,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
-		Map<String, Object> params=disposeParams(null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
+		Map<String, Object> params=disposeParams(ownerType,null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
 				status, releaseDateStartDate, releaseDateEndDate,null, null,  releaseStatus, null, null,null, null);
 		if (null!=fieldA) {
 			params.put("fieldA", fieldA);

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

@@ -855,7 +855,7 @@
   	select 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
-  		oi.unit_name as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,a.create_time as createTime,
+  		<!-- oi.unit_name as username,  -->a.owner_id as ownerId, a.org_id as orgId, a.contacts,a.create_time as createTime,
   		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
@@ -868,7 +868,7 @@
 	</if>
   	from achievement a
   	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-	LEFT JOIN organization_identity oi on a.owner_id = oi.uid
+	<!-- LEFT JOIN organization_identity oi on a.owner_id = oi.uid -->
 	<if test="adminId != null">
 		LEFT JOIN user u on a.owner_id = u.id
 	</if>
@@ -878,16 +878,19 @@
 	<if test="hot == null"> <!-- 无首页参数 -->
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
-  	where a.deleted_sign = 0 and a.owner_type = 1
+  	where a.deleted_sign = 0 
+  	<if test="ownerType != null">
+		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
+	</if>
   	<if test="techBrokerId != null">
 		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 	</if>
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%') 	
   	</if>
-  	<if test="unitName != null">
+  	<!-- <if test="unitName != null">
   		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-  	</if>
+  	</if> -->
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
@@ -945,7 +948,7 @@
   		count(1)
   	from achievement a
   	LEFT JOIN admin ad on ad.id = a.tech_broker_id
-	LEFT JOIN organization_identity oi on a.owner_id = oi.uid
+	<!-- LEFT JOIN organization_identity oi on a.owner_id = oi.uid -->
 	<if test="adminId != null">
 		LEFT JOIN user u on a.owner_id = u.id
 	</if>
@@ -955,16 +958,19 @@
 	<if test="hot == null"> <!-- 无首页参数 -->
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
-  	where a.deleted_sign = 0 and a.owner_type = 1
+  	where a.deleted_sign = 0 
+  	<if test="ownerType != null">
+		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
+	</if>
   	<if test="techBrokerId != null">
 		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
 	</if>
   	<if test="ownerName != null">
   		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
   	</if>
-  	<if test="unitName != null">
+  	<!-- <if test="unitName != null">
   		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-  	</if>
+  	</if> -->
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>

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

@@ -713,8 +713,8 @@
   	select 
 	  d.id, d.serial_number as serialNumber, d.data_category as dataCategory, 
 	  d.name, d.keyword, d.info_sources as infoSources, 
-	  oi.unit_name as username, d.demand_type as demandType, d.validity_period as validityPeriod, 
-	  d.employer_name as employerName, oi.licence_province as province, d.status, d.urgent_days as urgentDays,d.urgent_money as urgentMoney,
+	  <!-- oi.unit_name as username, --> d.demand_type as demandType, d.validity_period as validityPeriod, 
+	  d.employer_name as employerName, <!-- oi.licence_province as province, --> d.status, d.urgent_days as urgentDays,d.urgent_money as urgentMoney,
 	  d.release_status as releaseStatus, d.release_date as releaseDate, a.name as techBrokerId,d.create_time as createTime,
 	  d.employer_id as employerId, d.audit_status as auditStatus,
 	  d.tech_broker_id as techBrokerId,d.boutique
@@ -728,7 +728,7 @@
 		,ifnull(mm.effective,0) as hot
 	 </if>
 	from  demand d 
-	LEFT JOIN organization_identity oi on d.employer_id = oi.uid
+	<!-- LEFT JOIN organization_identity oi on d.employer_id = oi.uid -->
 	LEFT JOIN admin a on a.id = d.tech_broker_id
 	<if test="adminId != null">
 		LEFT JOIN user u on d.employer_id = u.id
@@ -739,7 +739,10 @@
 	<if test="hot == null"> <!-- 无首页参数 -->
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
-	where d.deleted_sign = 0 and d.data_category = 1 
+	where d.deleted_sign = 0 
+	<if test="dataCategory != null">
+		and d.data_category = #{dataCategory,jdbcType=VARCHAR}
+	</if>
 	<if test="adminId != null">
 		and (u.mid = #{adminId,jdbcType=VARCHAR}
 	</if>
@@ -750,9 +753,9 @@
 		or  d.tech_broker_id = #{adminId,jdbcType=VARCHAR}
 		)
 	</if>
-	<if test="province != null">
+	<!-- <if test="province != null">
 		and  oi.licence_province = #{province,jdbcType=INTEGER}
-	</if>
+	</if> -->
 	<if test="serialNumber != null">
 		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
@@ -765,9 +768,9 @@
 	<if test="keyword != null">
 		and  d.keyword like CONCAT('%',#{keyword,jdbcType=VARCHAR},'%')
 	</if>
-	<if test="unitName != null">
+	<!-- <if test="unitName != null">
 		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-	</if>
+	</if> -->
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 		and  (d.employer_id is null or d.employer_id='')
@@ -821,7 +824,7 @@
   	select 
 	count(1)
 	from  demand d 
-	LEFT JOIN organization_identity oi on d.employer_id = oi.uid
+	<!-- LEFT JOIN organization_identity oi on d.employer_id = oi.uid -->
 	LEFT JOIN admin a on a.id = d.tech_broker_id
 	<if test="adminId != null">
 		LEFT JOIN user u on d.employer_id = u.id
@@ -832,7 +835,10 @@
 	<if test="hot == null"> <!-- 无首页参数 -->
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
-	where d.deleted_sign = 0 and d.data_category = 1
+	where d.deleted_sign = 0 
+	<if test="dataCategory != null">
+		and d.data_category = #{dataCategory,jdbcType=VARCHAR}
+	</if>
 	<if test="adminId != null">
 		and (u.mid = #{adminId,jdbcType=VARCHAR}
 	</if>
@@ -849,18 +855,18 @@
 	<if test="auditStatus != null">
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
-	<if test="province != null">
+	<!-- <if test="province != null">
 		and  oi.licence_province = #{province,jdbcType=INTEGER}
-	</if>
+	</if> -->
 	<if test="name != null">
 		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
-	<if test="unitName != null">
+	<!-- <if test="unitName != null">
 		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
-	</if>
+	</if> -->
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 		and  (d.employer_id is null or d.employer_id='')
@@ -950,7 +956,7 @@
   	left join organization_identity oi on oi.uid = d.employer_id
   	left join user u on u.id = d.employer_id
   	left join marketing_management mm on d.id = mm.product_id
-  	where d.data_category = 1 and d.id = #{id,jdbcType=VARCHAR}
+  	where <!-- d.data_category = 1 and --> d.id = #{id,jdbcType=VARCHAR}
   </select>
   
   <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">

+ 1 - 0
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -318,6 +318,7 @@ public class DemandListBo {
 
 
 	public String getCountInterest() {
+		if (StringUtils.isBlank(countInterest)) countInterest = "0";
 		return String.valueOf(Integer.valueOf(countInterest)+20);
 	}
 

+ 2 - 2
src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java

@@ -217,7 +217,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 组织用户--需求列表
 	 */
 	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
-	public Result orgList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
+	public Result orgList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
@@ -231,7 +231,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(demandService.selectOrgDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
+		res.setData(demandService.selectOrgDemandManageList(dataCategory,employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
 				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
 		return res;

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -26,7 +26,7 @@ public interface DemandService {
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
-	Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province, Integer serialNumber,
+	Pagination<DemandManageListBo> selectOrgDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);

+ 4 - 1
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -165,7 +165,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus,
+	public Pagination<DemandManageListBo> selectOrgDemandManageList(Integer dataCategory,String employerName, Integer auditStatus,
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
 			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
@@ -193,6 +193,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 			params.put("techBroker", TokenManager.getAdminId());
 		}*/
+		if (null != dataCategory) {
+			params.put("dataCategory", dataCategory);
+		}
 
 		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("adminId", TokenManager.getAdminId());

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

@@ -407,21 +407,21 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	public List<AdvertisingBo> advertising() {
 		List<AdvertisingBo> advertising=new ArrayList<>();
 		AdvertisingBo one=new AdvertisingBo();
-		one.setId("000461d0-2120-4809-b709-3cb5f5acfbb3");
-		one.setPicture("/customer_sys_file/1/GG1.jpg");
+		one.setId("065de736-9b40-4678-93bc-e95f5e8c529b");
+		one.setPicture("/customer_sys_file/1/GGN1.jpg");
 		one.setType("成果");
 		one.setSlogan("快速响应您的需求 只为助您成就一流企业");	
 		advertising.add(one);
 		
 		AdvertisingBo two=new AdvertisingBo();
-		two.setId("0037f99f-00aa-4bd4-95bd-c1d492743ad2");
+		two.setId("739aed36-6ee6-406f-b03e-97d719b484b9");
 		two.setPicture("/customer_sys_file/1/GG2.jpg");
 		two.setType("需求");
 		two.setSlogan("快速响应您的需求 只为助您成就一流企业");	
 		advertising.add(two);
 		
 		AdvertisingBo three=new AdvertisingBo();
-		three.setId("ac08e6f6-6567-4a15-8573-3f08350b684d");
+		three.setId("af430be8-7752-43ac-ad82-27f02be317e6");
 		three.setPicture("/customer_sys_file/1/GG3.jpg");
 		three.setType("专家");
 		three.setSlogan("快速响应您的需求 只为助您成就一流企业");