修复外部联系人查询

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

@@ -25,23 +25,4 @@ public interface TabHaobanRepairExternalUserMapper {
 	 */
 	public int batchInsert(@Param("list") List<TabHaobanRepairExternalUser>  list) ;
 	
-	/**
-	 * 更新
-	* @Title: update 
-	* @Description: TODO
-	* @Param @param TabHaobanRepairExternalUser
-	* @Throws
-	 */
-	public int update() ;
-	
-	/**
-	 * 通过条件查询
-	* @Title: listAll 
-	* @Description: TODO
-	* @Param @param TabHaobanRepairExternalUser
-	* @Param @return
-	* @Return List
-	* @Throws
-	 */
-	public List<TabHaobanRepairExternalUser> listAll() ;
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 
@@ -26,6 +27,15 @@ public class TabHaobanRepairExternalUser implements Serializable {
     /**需要替换的,需要删除的*/
     private String remark;
     private String selfUserId ;
+    private Date updateTime ;
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 
     public String getSelfUserId() {
         return selfUserId;

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

@@ -355,6 +355,7 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                 }
                 pageNum++;
                 Set<String> externalUserIdSet = list.stream().map(dto -> dto.getExternalUserId()).collect(Collectors.toSet());
+                Map<String,Date> dateMap = list.stream().collect(Collectors.toMap(TabHaobanExternalClerkRelated::getExternalUserId, TabHaobanExternalClerkRelated::getCreateTime,(k1,k2)->k1)) ;
                 List<String> externalUserIdList = new ArrayList<>();
                 externalUserIdList.addAll(externalUserIdSet);
                 List<MemberUnionidRelated> unionidlist = this.memberUnionidRelatedMapper.listByWxEnterpriseIdAndExternalUserId(wxEnterpriseId, externalUserIdList);
@@ -397,6 +398,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                                 user.setWxEnterpriseId(wxEnterpriseId);
                                 user.setStatusFlag(111);
                                 user.setRemark(new_external_userid);
+                                if(null != dateMap.get(external_userid)) {
+                                    user.setUpdateTime(dateMap.get(external_userid));
+                                }
                                 errorList.add(user);
                             }
                         }
@@ -430,6 +434,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                                 user.setStatusFlag(12);
                                 user.setRemark("unionid表记录存在,但代开联系人id NULL");
                             }
+                            if(null != dateMap.get(item)) {
+                                user.setUpdateTime(dateMap.get(item));
+                            }
                             addList.add(user);
                         }
 
@@ -460,6 +467,9 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
                             user.setWxEnterpriseId(wxEnterpriseId);
                             user.setStatusFlag(1);
                             user.setRemark("无unionid表记录");
+                            if(null != dateMap.get(item)) {
+                                user.setUpdateTime(dateMap.get(item));
+                            }
                             addList.add(user);
                         }
                         this.tabHaobanRepairExternalUserMapper.batchInsert(addList);

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

@@ -8,13 +8,14 @@
       <result column="new_user_id"  property="newUserId"/>
       <result column="status_flag"  property="statusFlag"/>
       <result column="remark"  property="remark"/>
+      <result column="update_time"  property="updateTime"/>
   </resultMap>
   <sql id="Base_Column_List">
 	  wx_enterprise_id,
 	  user_id,
 	  new_user_id,
 	  status_flag,
-	  remark , self_user_id
+	  remark , self_user_id 
   </sql>
   
   <insert id="batchInsert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanRepairExternalUser">
@@ -24,31 +25,16 @@
 		  user_id,
 		  new_user_id,
 		  status_flag,
-		  remark , self_user_id 
+		  remark , self_user_id  , update_time 
 	  )VALUES
         <foreach collection= "list" item="item" separator=",">
             ( #{item.id} ,  #{item.wxEnterpriseId,jdbcType=CHAR},
 			   #{item.userId,jdbcType=VARCHAR},
 			   #{item.newUserId,jdbcType=VARCHAR},
 			   #{item.statusFlag,jdbcType=INTEGER},
-			   #{item.remark,jdbcType=VARCHAR} , #{item.selfUserId}
+			   #{item.remark,jdbcType=VARCHAR} , #{item.selfUserId} , #{item.updateTime}
 			)
         </foreach>
     </insert>
   
-  
-   <!-- ==================更新 ========== -->
-  <update id="updateByPrimaryKey" parameterType="tabHaobanRepairExternalUser">
-	  <![CDATA[
-	  UPDATE tab_haoban_repair_external_user SET
-		  status_flag=#{statusFlag,jdbcType=INTEGER},
-		  remark=#{remark,jdbcType=VARCHAR}
-	  id = #{id}
-	  ]]>
-  </update>
-  
-  
-  <select id="listAll"  parameterType="tabHaobanRepairExternalUser" resultMap="result-map-tabHaobanRepairExternalUser">
-  	 select * from tab_haoban_repair_external_user 
-  </select>
 </mapper> 
\ No newline at end of file