111

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

@@ -37,6 +37,6 @@ public interface StaffDepartmentRelatedApiService {
 
 	List<StaffDepartmentRelatedDTO> listByStaffIds(List<String> staffIds);
 
-	
-//	delDepartmentByClerkId
+	//解绑删部门，删人，删部门
+	boolean delDepartmentByClerkId(String clerkId);
 }

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

@@ -23,7 +23,8 @@ public interface TabHaobanStaffClerkRelationMapper {
 	List<TabHaobanStaffClerkRelation> listBindCode(@Param("enterpriseId")String enterpriseId, @Param("clerkCodeList")Set<String> clerkCodeList);
 
 	List<TabHaobanStaffClerkRelation> listBindCodeByStaffId(@Param("enterpriseIdList")List<String> enterpriseIdList, @Param("staffId")String staffId);
-
+	
+	TabHaobanStaffClerkRelation getOneByClerkId(@Param("clerkId")String clerkId);
     /**
      * 改变状态 格局clerkId
      * @param clerkId

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

@@ -27,6 +27,7 @@ import com.gic.haoban.manage.api.service.ApplicationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanApplication;
@@ -63,6 +64,8 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	private DepartmentService departmentService;
 	@Autowired
 	private Config config;
+	@Autowired
+	private TabHaobanStaffClerkRelationMapper tabHaobanStaffClerkRelationMapper;
 	
 	@Override
 	public List<StaffDepartmentRelatedDTO> listByDepartmentId(
@@ -227,6 +230,15 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		url = url+encodeData;
 		return url;
 	}
+
+	@Override
+	public boolean delDepartmentByClerkId(String clerkId) {
+		
+		
+		tabHaobanStaffClerkRelationMapper.getOneByClerkId(clerkId);
+		
+		return false;
+	}
 	
 
 }

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

@@ -187,6 +187,15 @@
     </if>
   </select>
 
+  <select id="getOneByClerkId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where 
+     status_flag = 1
+    and clerk_id = #{clerkId}
+  </select>
+
   <update id="changeStatusByClerkId" >
     update tab_haoban_staff_clerk_relation
     set

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

@@ -491,6 +491,8 @@ public class ClerkController extends WebBaseController{
 		for (ClerkDTO clerk : clerkList) {
 			String enterpriseId = clerk.getEnterpriseId();
 			EnterpriseDTO enterpriseDTO = map.get(enterpriseId);
+			StaffClerkRelationDTO staffClerkRelationDTO = clerkBindMap.get(clerk.getClerkId());
+			
 			ClerkStoreVO vo = new ClerkStoreVO();
 			vo.setClerkId(clerk.getClerkId());
 			vo.setClerkCode(clerk.getClerkCode());
@@ -503,7 +505,8 @@ public class ClerkController extends WebBaseController{
 			StoreDTO store = storeService.getStore(clerk.getStoreId());
 			vo.setStoreName(store == null?"":store.getStoreName());
 			vo.setStoreAddress(store == null?"":store.getStoreAddress());
-			vo.setBindFlag(clerkBindMap.get(clerk.getClerkId())==null ? 0:1);
+			vo.setBindFlag(staffClerkRelationDTO==null ? 0:1);
+			vo.setStaffId(staffClerkRelationDTO==null ? "":staffClerkRelationDTO.getStaffId());
 			clerkStoreList.add(vo);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,clerkStoreList);

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

@@ -22,12 +22,23 @@ public class ClerkStoreVO implements Serializable{
 	
 	private Integer clerkType;
 	
+	private String staffId;
+
+	
 	private String headImg;
 
 	private String storeAddress;
 
 	private Integer bindFlag;
 
+	public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
 	public String getClerkId() {
 		return clerkId;
 	}