解绑记录接口

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

@@ -75,6 +75,8 @@ public interface TabHaobanStaffClerkRelationMapper {
 
 	TabHaobanStaffClerkRelation getByClerkId(@Param("clerkId")String clerkId);
 
+	TabHaobanStaffClerkRelation getByClerkIdNoStatus(@Param("clerkId")String clerkId);
+
 	int delByPrimaryKey(@Param("staffClerkRelationId")String staffClerkRelationId);
 	
 	void delByClerkId(@Param("clerkId")String clerkId);

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

@@ -78,6 +78,8 @@ public interface StaffClerkRelationService {
 
 	StaffClerkRelationDTO getByClerkId(String clerkId);
 
+	StaffClerkRelationDTO getByClerkIdNoStatus(String clerkId);
+
 	List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList);
 
 	List<StaffClerkRelationDTO> lisByStaffId(String wxEnterpriseId, String staffId);

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

@@ -228,6 +228,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkId(clerkId));
     }
 
+    public StaffClerkRelationDTO getByClerkIdNoStatus(String clerkId){
+        return EntityUtil.changeEntityByJSON(StaffClerkRelationDTO.class, mapper.getByClerkIdNoStatus(clerkId));
+    }
+
     @Override
     public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkList) {
         if (clerkList == null || clerkList.isEmpty()) {

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

@@ -372,18 +372,45 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             logger.info("没有关联企业");
             return null;
         }
-        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-        if (clerkDTO == null) {
-            logger.info("没有这个导购");
-            return null;
+//        StaffClerkRelationDTO staffClerkRelationDTO=staffClerkRelatinService.getByClerkIdNoStatus(clerkId);
+//        if (staffClerkRelationDTO == null) {
+//            logger.info("导购未绑定");
+//            return null;
+//        }
+//        String clerkCode = staffClerkRelationDTO.getClerkCode();
+//        StaffClerkRelationDTO relationDTO = staffClerkRelatinService.getOneBindCodeNoStatus(enterpriseId, clerkCode);
+//        if (null == relationDTO) {
+//            logger.info("没有解绑信息");
+//            return null;
+//        }
+        Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageUnBindLog(wxEnterpriseId, clerkId, enterpriseId, optType, pageInfo);
+        if (CollectionUtils.isNotEmpty(retList.getResult())) {
+            retList.getResult().forEach(staffClerkBindLogDetailDTO -> {
+                TabHaobanStaff haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getStaffId());
+                if (null != haobanStaff) {
+                    staffClerkBindLogDetailDTO.setStaffName(haobanStaff.getStaffName());
+                    staffClerkBindLogDetailDTO.setWxUserId(haobanStaff.getWxUserId());
+                } else {
+                    staffClerkBindLogDetailDTO.setStaffName("未知成员");
                 }
-        String clerkCode = clerkDTO.getClerkCode();
-        StaffClerkRelationDTO relationDTO = staffClerkRelatinService.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
-        if (null == relationDTO) {
-            logger.info("没有解绑信息");
-            return null;
+                if ("-1".equals(staffClerkBindLogDetailDTO.getOptStaffId())) {
+                    staffClerkBindLogDetailDTO.setOptStaffName("系统");
+                } else {
+                    haobanStaff = staffService.selectById(staffClerkBindLogDetailDTO.getOptStaffId());
+                    if (null != haobanStaff) {
+                        staffClerkBindLogDetailDTO.setOptStaffName(haobanStaff.getStaffName());
+                    } else {
+                        staffClerkBindLogDetailDTO.setOptStaffName("未知成员");
+                    }
+                }
+
+                ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(staffClerkBindLogDetailDTO.getClerkId());
+                if (null != clerkDTO) {
+                    staffClerkBindLogDetailDTO.setClerkName(clerkDTO.getClerkName());
+                }
+                staffClerkBindLogDetailDTO.setClerkPhoneNumber(staffClerkBindLogDetailDTO.getClerkPhone());
+            });
         }
-        Page<StaffClerkBindLogDetailDTO> retList = staffClerkBindLogService.pageUnBindLog(wxEnterpriseId, clerkId, enterpriseId, optType, pageInfo);
         return retList;
     }
 

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

@@ -219,15 +219,15 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_staff_clerk_bind_log
-        where wx_enterprise_id=#{wxEnterpriseId}
-        <if test="clerkIds=null ">
-            and clerk_id = #{item}
+        where wx_enterprise_id = #{wxEnterpriseId}
+        <if test="clerkId!=null ">
+            and clerk_id = #{clerkId}
         </if>
-        <if test="enterpriseIds!=null">
-            and enterprise_id = #{item}
+        <if test="enterpriseId!=null">
+            and enterprise_id = #{enterpriseId}
         </if>
         <if test="optType!=-1">
-            and opt_type=#{optType}
+            and opt_type= #{optType}
         </if>
         order by create_time desc
     </select>

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

@@ -310,6 +310,13 @@
     and status_flag=1
   </select>
 
+  <select id="getByClerkIdNoStatus" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where clerk_id = #{clerkId,jdbcType=VARCHAR}
+  </select>
+
   <update id="delByPrimaryKey" >
     update tab_haoban_staff_clerk_relation
     set