111

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

@@ -7,5 +7,12 @@ import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 public interface StaffDepartmentRelatedApiService {
 
 	List<StaffDepartmentRelatedDTO> listByDepartmentId(String departmentId);
+	
+	void updateById(StaffDepartmentRelatedDTO dto);
+	
+	StaffDepartmentRelatedDTO getOneByClerkCode(String clerkCode);
+	
+	void deleteCode(StaffDepartmentRelatedDTO dto);
 
+	
 }

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import java.util.List;
 
+import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 
 public interface StaffDepartmentRelatedMapper {
@@ -18,4 +19,8 @@ public interface StaffDepartmentRelatedMapper {
     int updateByPrimaryKey(TabHaobanStaffDepartmentRelated record);
 
 	List<TabHaobanStaffDepartmentRelated> listByDepartmentId(String departmentId);
+	
+	TabHaobanStaffDepartmentRelated getOneByClerkCode(String clerkCode);
+	
+	void deleteCode(StaffDepartmentRelatedDTO dto);
 }
\ No newline at end of file

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

@@ -9,6 +9,7 @@ import com.gic.haoban.manage.api.dto.ApplicationDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.service.ApplicationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanApplication;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.service.ApplicationService;
@@ -21,7 +22,8 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	
 	@Autowired
 	private StaffDepartmentRelatedService staffDepartmentRelatedService;
-
+	@Autowired
+	private StaffDepartmentRelatedMapper staffDepartmentRelatedMapper;
 	@Override
 	public List<StaffDepartmentRelatedDTO> listByDepartmentId(
 			String departmentId) {
@@ -30,5 +32,26 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		return resultList;
 	}
 
+	@Override
+	public void updateById(StaffDepartmentRelatedDTO dto) {
+		TabHaobanStaffDepartmentRelated tab = EntityUtil.changeEntityByJSON(TabHaobanStaffDepartmentRelated.class, dto);
+		staffDepartmentRelatedMapper.updateByPrimaryKeySelective(tab);
+	}
+
+	@Override
+	public void deleteCode(StaffDepartmentRelatedDTO dto) {
+		staffDepartmentRelatedMapper.deleteCode(dto);		
+	}
+	@Override
+	public StaffDepartmentRelatedDTO getOneByClerkCode(String clerkCode) {
+		TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedMapper.getOneByClerkCode(clerkCode);
+		if(tab== null){
+			return null;
+		}
+		StaffDepartmentRelatedDTO dto = EntityUtil.changeEntity(StaffDepartmentRelatedDTO.class, tab);
+		return dto;
+	}
+
+
 
 }

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

@@ -169,4 +169,22 @@
     from tab_haoban_staff_department_related
     where department_id = #{departmentId,jdbcType=VARCHAR}
   </select>
+    <select id="getOneByClerkCode" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_department_related
+    where       clerk_code = #{clerkCode,jdbcType=VARCHAR}
+    	and status_flag = 1
+
+  </select>
+  <update id="deleteCode" parameterType="com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO" >
+    update tab_haoban_staff_department_related
+    set 
+      clerk_code = #{clerkCode,jdbcType=VARCHAR}
+      and update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where staff_department_related_id = #{staffDepartmentRelatedId,jdbcType=VARCHAR}
+  </update>
+  
+  
+  
 </mapper>
\ No newline at end of file

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

 package com.gic.haoban.manage.web.controller;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -30,6 +31,21 @@ public class ClerkController extends WebBaseController{
 	public HaobanResponse clerkList(String storeId,String bindFlag,String departmentId) {
 		List<StaffDepartmentRelatedDTO> list = staffDepartmentRelatedApiService.listByDepartmentId(departmentId);
 		List<ClerkVo> result  = new ArrayList<ClerkVo>();
+//		if(CollectionUtil.isNotEmpty(list)){
+//			if("1".equals(bindFlag)){
+//				List<StaffDepartmentRelatedDTO> bindList = list.stream().filter(s->s.getClerkCode() != null).collect(Collectors.toList());
+//				if(CollectionUtil.isNotEmpty(bindList)){
+//					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, bindList);
+//				}
+//			}else{
+//
+//				List<StaffDepartmentRelatedDTO> unBindList = list.stream().filter(s->s.getClerkCode() == null).collect(Collectors.toList());
+//				if(CollectionUtil.isNotEmpty(unBindList)){
+//					result = EntityUtil.changeEntityListByJSON(ClerkVo.class, unBindList);
+//				}
+//			}
+//		}
+//		return resultResponse(HaoBanErrCode.ERR_1,result);
 		//绑定的clerk
 		if("1".equals(bindFlag)){
 			// 调陶接口获取详情数据
@@ -50,5 +66,33 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,result);
 		
 	}
+	//成员绑定
+	@RequestMapping("/staff-bind")
+	public HaobanResponse staffBind(String clerkCode,String staffDepartmentRelatedId) {
+		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
+		dto.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		dto.setClerkCode(clerkCode);
+		dto.setUpdateTime(new Date());
+		staffDepartmentRelatedApiService.updateById(dto);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	//成员换绑定
+	@RequestMapping("/clerk-unbind")
+	public HaobanResponse clerkUnbind(String clerkCode,String staffDepartmentRelatedId) {
+		StaffDepartmentRelatedDTO one = staffDepartmentRelatedApiService.getOneByClerkCode(clerkCode);
+		if(one != null){
+			//存在，则先置空
+			one.setClerkCode(null);
+			one.setUpdateTime(new Date());
+			staffDepartmentRelatedApiService.deleteCode(one);
+		}
+		//不存在，则更新
+		StaffDepartmentRelatedDTO dto = new StaffDepartmentRelatedDTO();
+		dto.setStaffDepartmentRelatedId(staffDepartmentRelatedId);
+		dto.setClerkCode(clerkCode);
+		dto.setUpdateTime(new Date());
+		staffDepartmentRelatedApiService.updateById(dto);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
 
 }