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/StaffDepartmentRelatedApiService.java

@@ -6,15 +6,24 @@ import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 
 public interface StaffDepartmentRelatedApiService {
 
-	List<StaffDepartmentRelatedDTO> listByDepartmentId(String departmentId);
-	
-	List<StaffDepartmentRelatedDTO> listByStaffId(String staffId);
-	
-	void updateById(StaffDepartmentRelatedDTO dto);
-	
-	StaffDepartmentRelatedDTO getOneByClerkCode(String clerkCode);
-	
-	void deleteCode(StaffDepartmentRelatedDTO dto);
-
-	
+    List<StaffDepartmentRelatedDTO> listByDepartmentId(String departmentId);
+
+    List<StaffDepartmentRelatedDTO> listByStaffId(String staffId);
+
+    void updateById(StaffDepartmentRelatedDTO dto);
+
+    StaffDepartmentRelatedDTO getOneByClerkCode(String clerkCode);
+
+
+    /**
+     * 根据员工与部门的关联关系查询
+     *
+     * @param staffDepartmentRelatedId
+     * @return
+     */
+    StaffDepartmentRelatedDTO getByStaffDepartmentRelatedId(String staffDepartmentRelatedId);
+
+    void deleteCode(StaffDepartmentRelatedDTO dto);
+
+
 }

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

@@ -28,4 +28,7 @@ public interface StaffDepartmentRelatedMapper {
 	List<TabHaobanStaffDepartmentRelated> listStaffDepartmentByStaffId(String staffId);
 	
 	Page<TabHaobanStaffDepartmentRelated> pageStaff(String departmentId, Integer activeFlag, String keyword);
+
+    TabHaobanStaffDepartmentRelated getById(String staffDepartmentRelatedId);
+
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.service.out.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -56,6 +57,16 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 	}
 
 	@Override
+	public StaffDepartmentRelatedDTO getByStaffDepartmentRelatedId(String staffDepartmentRelatedId) {
+		TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedMapper.getById(staffDepartmentRelatedId);
+		if(Objects.isNull(tab)){
+			return null;
+		}
+		StaffDepartmentRelatedDTO dto = EntityUtil.changeEntity(StaffDepartmentRelatedDTO.class, tab);
+		return dto;
+	}
+
+	@Override
 	public List<StaffDepartmentRelatedDTO> listByStaffId(String staffId) {
 		List<TabHaobanStaffDepartmentRelated> list = staffDepartmentRelatedMapper.listStaffDepartmentByStaffId(staffId);
 		if(CollectionUtil.isEmpty(list)){

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

@@ -160,13 +160,23 @@
     where department_id = #{departmentId,jdbcType=VARCHAR}
   </select>
     <select id="getOneByClerkCode" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from tab_haoban_staff_department_related
     where       clerk_code = #{clerkCode,jdbcType=VARCHAR}
     	and status_flag = 1
 
   </select>
+
+  <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_department_related
+    where       staff_department_related_id = #{staffDepartmentRelatedId,jdbcType=VARCHAR}
+    and status_flag = 1
+
+  </select>
+
   <update id="deleteCode" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated" >
     update tab_haoban_staff_department_related
     set