Merge branch 'feature/xgh/2406企微托管' into 'developer'

企微托管

See merge request !1884

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

@@ -341,4 +341,7 @@ public interface ExternalClerkRelatedApiService {
 
     Page<ExternalClerkRelatedDTO> halfFriendPage(String wxEnterpriseId , String storeId , String clerkId , String staffId,int type,  BasePageInfo basePageInfo) ;
 
+    ExternalClerkRelatedDTO getDelFriend(String wxEnterpriseId , String enterpriseId , String staffId) ;
+
+
 }

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

@@ -443,7 +443,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
     List<TabHaobanExternalClerkRelated> halfFriendPage(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId")String storeId, @Param("clerkId")String clerkId, @Param("staffId")String staffId,  @Param("type")int type);
 
     List<TabHaobanExternalClerkRelated> halfDelFriendPage(@Param("wxEnterpriseId") String wxEnterpriseId , @Param("startItem")int startItem);
-
+    TabHaobanExternalClerkRelated getDelFriend(@Param("wxEnterpriseId") String wxEnterpriseId , @Param("enterpriseId") String enterpriseId , @Param("staffId")String staffId) ;
     void updateHalfTime(@Param("id") String id , @Param("delTime") Date delTime) ;
 
 }
\ No newline at end of file

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

@@ -836,6 +836,16 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
 
     @Override
+    public ExternalClerkRelatedDTO getDelFriend(String wxEnterpriseId, String enterpriseId, String staffId) {
+        TabHaobanExternalClerkRelated tab = this.tabHaobanExternalClerkRelatedMapper.getDelFriend(wxEnterpriseId,enterpriseId,staffId) ;
+        if(null != tab) {
+            ExternalClerkRelatedDTO dto = EntityUtil.changeEntityByJSON(ExternalClerkRelatedDTO.class,tab) ;
+            return dto ;
+        }
+        return null;
+    }
+
+    @Override
     public Page<ExternalClerkRelatedDTO> halfFriendPage(String wxEnterpriseId, String storeId, String clerkId, String staffId, int type, BasePageInfo basePageInfo) {
         Page<ExternalClerkRelatedDTO> retPage = null ;
         try {
@@ -855,4 +865,6 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         }
         return retPage;
     }
+
+
 }

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

@@ -933,6 +933,12 @@
             and half_del_time is null  limit  1000
     </select>
 
+    <select id="getDelFriend" resultMap="BaseResultMap">
+        select  <include refid="Base_Column_List"/>  from tab_haoban_external_clerk_related
+        where wx_enterprise_id = #{wxEnterpriseId} and status_flag in (1,3,4)  and external_status = 3
+        and staff_id =#{staffId} and enterprise_id=#{enterpriseId} limit  1
+    </select>
+
     <update id="updateHalfTime">
         update tab_haoban_external_clerk_related set
              half_del_time = #{delTime}