Browse Source

智者模块添加是否国际化功能

Michael 8 years ago
parent
commit
1bc48990ba

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

@@ -788,17 +788,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
@@ -808,6 +809,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>
@@ -845,6 +849,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>
@@ -866,15 +873,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

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

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

@@ -135,7 +135,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 +161,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;

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