Browse Source

Merge remote-tracking branch 'origin/master' into test

Conflicts:
	src/main/java/com/goafanti/common/constant/AFTConstants.java
Michael 8 years ago
parent
commit
fc01fffad9

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

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

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

+ 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

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

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