离职继承fix

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

@@ -44,6 +44,16 @@ public interface HandoverOperationApiService {
     public Page<HandoverExternalDTO> pageHandoverFriend(String wxEnterpriseId, String search, List<String> staffIds, List<String> transferIds, BasePageInfo pageInfo);
 
     /**
+     * 分配的客户列表
+     *
+     * @param wxEnterpriseId
+     * @param staffIds
+     * @param transferIds    分配客户列表查询
+     * @return
+     */
+    public Page<HandoverExternalDTO> pageHandoverFriend(String wxEnterpriseId, String search, List<String> staffIds, List<String> transferIds, BasePageInfo pageInfo, int status);
+
+    /**
      * 分配客户接口
      *
      * @param wxEnterpriseId

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

@@ -43,7 +43,7 @@ public interface HandoverExternalMapper {
      * @param staffIds
      * @return
      */
-    List<TabHandoverExternal> listByStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("transferIds") List<String> transferIds, @Param("staffIds") List<String> staffIds, @Param("search") String search);
+    List<TabHandoverExternal> listByStaffIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("transferIds") List<String> transferIds, @Param("staffIds") List<String> staffIds, @Param("search") String search, @Param("status") Integer status);
 
     /**
      * 查询待分配客户列表

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

@@ -40,7 +40,7 @@ public interface HandoverService {
      * @param staffIds
      * @return
      */
-    public Page<HandoverExternalDTO> pageByStaffIds(String wxEnterpriseId, String search, List<String> staffIds, List<String> transferIds, BasePageInfo pageInfo);
+    public Page<HandoverExternalDTO> pageByStaffIds(String wxEnterpriseId, String search, List<String> staffIds, List<String> transferIds, BasePageInfo pageInfo, Integer status);
 
     /**
      * 查询待分配列表

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

@@ -174,9 +174,9 @@ public class HandoverServiceImpl implements HandoverService {
     }
 
     @Override
-    public Page<HandoverExternalDTO> pageByStaffIds(String wxEnterpriseId, String search, List<String> staffIds, List<String> transferIds, BasePageInfo pageInfo) {
+    public Page<HandoverExternalDTO> pageByStaffIds(String wxEnterpriseId, String search, List<String> staffIds, List<String> transferIds, BasePageInfo pageInfo, Integer status) {
         PageHelper.startPage(pageInfo);
-        List<TabHandoverExternal> externalList = handoverExternalMapper.listByStaffIds(wxEnterpriseId, transferIds, staffIds, search);
+        List<TabHandoverExternal> externalList = handoverExternalMapper.listByStaffIds(wxEnterpriseId, transferIds, staffIds, search, status);
         Page<HandoverExternalDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(externalList), HandoverExternalDTO.class);
         return retPage;
     }

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

@@ -124,7 +124,12 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
 
     @Override
     public Page<HandoverExternalDTO> pageHandoverFriend(String wxEnterpriseId, String search, List<String> staffIds, List<String> transferIds, BasePageInfo pageInfo) {
-        Page<HandoverExternalDTO> retPage = handoverService.pageByStaffIds(wxEnterpriseId, search, staffIds, transferIds, pageInfo);
+        return pageHandoverFriend(wxEnterpriseId, search, staffIds, transferIds, pageInfo, 1);
+    }
+
+    @Override
+    public Page<HandoverExternalDTO> pageHandoverFriend(String wxEnterpriseId, String search, List<String> staffIds, List<String> transferIds, BasePageInfo pageInfo, int status) {
+        Page<HandoverExternalDTO> retPage = handoverService.pageByStaffIds(wxEnterpriseId, search, staffIds, transferIds, pageInfo, status);
         if (CollectionUtils.isEmpty(retPage.getResult())) {
             return retPage;
         }

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

@@ -251,7 +251,7 @@
                 #{item}
             </foreach>
         </if>
-        and status_flag=1
+        and status_flag = #{status}
         <if test="search!=null and search!=''">
             and external_user_name like CONCAT('%',#{search},'%')
         </if>