Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -27,4 +27,6 @@ public interface StaffApiService {
 
 	public void wxGetAdd(String userId,String wxEnterpriseId);
 
+	public void staffEdit(StaffDTO staffDTO, String departmentIds);
+
 }

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

@@ -8,4 +8,6 @@ public interface WxEnterpriseRelatedApiService {
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId);
 	
 	void wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version);
+	
+	String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
 }

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

 package com.gic.haoban.manage.service.service;
 
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
+
 public interface WxEnterpriseRelatedService {
 
+	TabHaobanWxEnterpriseRelated getByGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
+
 }

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

 package com.gic.haoban.manage.service.service.impl;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 
 @Service
 public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedService {
+	@Autowired
+	private WxEnterpriseRelatedMapper mapper;
+
+	@Override
+	public TabHaobanWxEnterpriseRelated getByGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId) {
+		
+		return mapper.selectByPrimaryKey(wxEnterpriseRelatedId);
+	}
 
 }

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

@@ -142,4 +142,10 @@ public class StaffApiServiceImpl implements StaffApiService {
 		
 	}
 
+	@Override
+	public void staffEdit(StaffDTO staffDTO, String departmentIds) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.commons.util.EntityUtil;
@@ -13,12 +14,15 @@ import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
+import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
 
 @Service
 public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApiService {
     private static final Logger logger = LogManager.getLogger(WxEnterpriseRelatedApiServiceImpl.class);
-
+    @Autowired
 	private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
+	@Autowired
+	private WxEnterpriseRelatedService wxEnterpriseRelatedService;
 	@Override
 	public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(
 			String wxEnterpriseId) {
@@ -46,5 +50,14 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 			 wxEnterpriseRelatedMapper.insertSelective(tab);
 		}
 	}
+	@Override
+	public String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId) {
+		TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedService.getByGicEnterpriseIdByEnterpriseRelatedId(wxEnterpriseRelatedId);
+		if(tab != null) {
+			return tab.getEnterpriseId();
+		}
+		
+		return null;
+	}
 
 }

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

@@ -86,7 +86,7 @@ public class StaffController extends WebBaseController{
 	public HaobanResponse staffEdit(StaffDTO staffDTO,String departmentIds){
 		String staffId = staffDTO.getStaffId();
 		
-		//staffApiService.staffEdit(staffDTO,departmentIds);
+		staffApiService.staffEdit(staffDTO,departmentIds);
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}