111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java

@@ -17,6 +17,12 @@ public interface DepartmentApiService {
 	 */
 	List<DepartmentDTO> listByDepartmentIds(List<String> departmentIds,int storeFlag);
 	/**
+	 * 查门店列表
+	 * @param relatedIds
+	 * @return
+	 */
+	List<DepartmentDTO> listByRelatedIds(List<String> relatedIds);
+	/**
 	 * 查wxEnterprise下所有门店
 	 * @param wxEnterpriseId
 	 * @return

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,16 +13,24 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.GlobalVar;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.EnterpriseDetailVo;
 
 @RestController
 public class EnterpriseController extends WebBaseController{
@@ -30,6 +39,12 @@ public class EnterpriseController extends WebBaseController{
 
 	@Autowired
 	private WxEnterpriseApiService wxEnterpriseApiService;
+	@Autowired
+	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+	@Autowired
+	private DepartmentApiService departmentApiService;
+	@Autowired
+	private StoreService storeService;
 	//企业列表
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,Integer gicContactHelper,String version) {
@@ -49,6 +64,25 @@ public class EnterpriseController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,pageVo);
  
 	}
+	//企业列表
+	@RequestMapping("authorize-detail")
+	public HaobanResponse authorizeDetail(String wxEnterpriseId) {
+		List<EnterpriseDetailDTO>  list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
+		List<EnterpriseDetailVo> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailVo.class, list);
+		for(EnterpriseDetailVo vo:result){
+			List<StoreDTO>  stores = storeService.getStoreByEnterId(vo.getEnterpriseId(), null, null);
+			if(CollectionUtil.isEmpty(stores)){
+				continue;
+			}else{
+				List<String> storeIds = stores.stream().map(s->s.getStoreId()).collect(Collectors.toList());
+				List<DepartmentDTO> countList = departmentApiService.listByRelatedIds(storeIds);
+				vo.setStoreCount(countList.size());
+			}
+			
+		}
+		return resultResponse(HaoBanErrCode.ERR_1,result);
+	}
+	
 	//登录
 	@RequestMapping("yw-login")
 	public void ywLogin(String wxEnterpriseId,HttpServletResponse httpServletResponse) throws IOException {

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/EnterpriseDetailVo.java

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class EnterpriseDetailVo implements Serializable {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String enterpriseId;
+    private String enterpriseName;
+    private Integer storeCount = 0;
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+	public String getEnterpriseName() {
+		return enterpriseName;
+	}
+	public void setEnterpriseName(String enterpriseName) {
+		this.enterpriseName = enterpriseName;
+	}
+	public Integer getStoreCount() {
+		return storeCount;
+	}
+	public void setStoreCount(Integer storeCount) {
+		this.storeCount = storeCount;
+	}
+
+}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -32,6 +32,8 @@ public interface DepartmentMapper {
 	
 	List<TabHaobanDepartment> listByDepartmentIds(@Param("departmentIds")List<String> departmentIds,@Param("storeFlag")int storeFlag);
 
+	List<TabHaobanDepartment> listByRelatedIds(@Param("relatedIds")List<String> relatedIds);
+	
 	Page<TabHaobanDepartment> pageDepartmentByParams(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("keyword")String keyword, 
 			@Param("storeFlag")Integer storeFlag, @Param("recycleFlag")Integer recycleFlag);
 	

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java

@@ -8,8 +8,8 @@ import java.util.Map;
 import cn.hutool.core.collection.CollectionUtil;
 
 import com.gic.haoban.base.api.common.Constant;
-
 import com.gic.haoban.manage.api.service.StaffApiService;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -379,6 +379,14 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 	}
 
 	@Override
+	public List<DepartmentDTO> listByRelatedIds(List<String> relatedIds) {
+		List<TabHaobanDepartment> list= departmentMapper.listByRelatedIds(relatedIds);
+		if(list==null){
+			return new ArrayList<DepartmentDTO>();
+		}
+		return EntityUtil.changeEntityListByJSON(DepartmentDTO.class, list);
+	}
+	@Override
 	public DepartmentDTO getRootByEnterpriseId(String wxEnterpriseId) {
 		
 		return departmentService.getRootByEnterpriseId(wxEnterpriseId);
@@ -585,4 +593,5 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		return hr;
 		
 	}
+
 }

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -303,6 +303,20 @@
     </if>
     order by sort desc
   </select>
+    <select id="listByRelatedIds" resultMap="BaseResultMap"  >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_department
+    where status_flag = 1
+    and   is_store = #{storeFlag,jdbcType=INTEGER}
+    <if test="relatedIds != null and relatedIds.size() > 0">
+    	and related_id IN 
+	    <foreach collection="relatedIds" item="id" index="index" open="(" close=")" separator=",">
+	      #{id,jdbcType=VARCHAR}
+	    </foreach>
+    </if>
+    order by sort desc
+  </select>
   
   <select id="listStoreByWxEnterpriseId" resultMap="BaseResultMap"  >
     select