111

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

@@ -2,21 +2,30 @@ package com.gic.haoban.manage.web.controller;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
 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.alibaba.fastjson.JSONArray;
 import com.gic.api.base.commons.Page;
 import com.gic.enterprise.api.dto.GicTreeDTO;
+import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreGroupService;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -24,6 +33,7 @@ import com.gic.haoban.manage.web.qo.DepartmentAddQO;
 import com.gic.haoban.manage.web.qo.DepartmentEditQO;
 import com.gic.haoban.manage.web.utils.ListUtils;
 import com.gic.haoban.manage.web.vo.LoginVO;
+import com.gic.haoban.manage.web.vo.StoreVo;
 
 @RestController
 public class DepartmentContoller extends WebBaseController{
@@ -32,7 +42,8 @@ public class DepartmentContoller extends WebBaseController{
 	
 	@Autowired
 	private StoreGroupService storeGroupService;
-	
+	@Autowired
+	private StoreService storeService;
 	@RequestMapping("department-list")
 	public HaobanResponse departmentList(String parentId) {
 		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
@@ -327,7 +338,29 @@ public class DepartmentContoller extends WebBaseController{
 		String wxEnterpriseId = "1";
 		int maxVersionCount = 0;
 		Page<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, search,maxVersionCount, basePageInfo);
-		return resultResponse(HaoBanErrCode.ERR_1,page);
+		List<DepartmentDTO> list = page.getResult();
+		List<StoreVo> resultList = EntityUtil.changeEntityListByJSON(StoreVo.class,list);
+		
+		
+		
+		List<String> storeIds = list.stream().map(s->s.getRelatedId()).collect(Collectors.toList());
+		String [] storeIdArr =  storeIds.toArray(new String[storeIds.size()]);
+		List<StoreDTO> storeList = storeService.getStores(storeIdArr);
+		Map<String,StoreDTO> map = com.gic.commons.util.CollectionUtil.toMap(storeList, "storeId");
+		
+		for(StoreVo vo:resultList){
+			if(map.get(vo.getDepartmentId())!=null){
+				vo.setStoreCode(map.get(vo.getDepartmentId()).getStoreCode());
+			}
+		}
+		
+		
+		Page resultPage = new Page<>(); 
+		resultPage.setCurrentPage(page.getCurrentPage());
+		resultPage.setPageSize(page.getPageSize());
+		resultPage.setTotalCount(page.getTotalCount());
+		resultPage.setResult(resultList);
+		return resultResponse(HaoBanErrCode.ERR_1,resultPage);
 		
 		
 		

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class StoreVo implements Serializable {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String departmentId;
+    private String departmentName;
+    private String storeId;
+    private String storeCode;
+	public String getDepartmentId() {
+		return departmentId;
+	}
+	public void setDepartmentId(String departmentId) {
+		this.departmentId = departmentId;
+	}
+	public String getDepartmentName() {
+		return departmentName;
+	}
+	public void setDepartmentName(String departmentName) {
+		this.departmentName = departmentName;
+	}
+	public String getStoreId() {
+		return storeId;
+	}
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+	public String getStoreCode() {
+		return storeCode;
+	}
+	public void setStoreCode(String storeCode) {
+		this.storeCode = storeCode;
+	}
+
+}