Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

     @RequestMapping(value="/wx/visitRecord",method= RequestMethod.GET)
     public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value = "userId") Integer userId,@RequestParam(value = "targetId")String targetId,HttpServletRequest request){
+                                                @RequestParam(value = "userId") Integer userId,
+                                                @RequestParam(value = "targetId")String targetId,
+                                                @RequestParam(value = "eventType")String eventType,
+                                                HttpServletRequest request){
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request),targetId);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request),targetId, eventType);
             return ResponseBean.success(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java

      */
 	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("eventType") String eventType, @Param("shareName") String shareName, @Param("shareTel") String shareTel, @Param("buildingId") String buildingId, @Param("personType") String personType, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("targetId") String targetId,@Param("personId") String personId);
+	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("targetId") String targetId,@Param("personId") String personId, @Param("eventType")String eventType);
 
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);
 

src/main/java/com/huiju/estateagents/service/ITaPersonVisitRecordService.java

 	 * @param orgId
 	 * @return
 	 */
-	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId);
+	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType);
 
 	/**
 	 * 获取这个人的活动数据列表

src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java

 	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, String eventType, String shareName, String shareTel, String buildingId, String personType, List<TaPersonBuilding> taPersonBuildingList) {
 		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, eventType, shareName, shareTel, buildingId, personType, taPersonBuildingList);
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
-		taPersonVisitRecords.forEach(e -> {
+		for (TaPersonVisitRecord e : taPersonVisitRecords) {
+
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
-			if (personInfo != null){
+			if (personInfo != null) {
 				e.setUserName(personInfo.getNickname());
 				e.setUserTel(personInfo.getPhone());
 			}
 
 			TaPerson userShareInfo = taPersonMapper.selectById(e.getSharePersonId());
-			if (userShareInfo != null){
+			if (userShareInfo != null) {
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());
 			}
 
-			if (!StringUtils.isEmpty(e.getDrainageName()) && CommConstant.EVENT_H5.equals(e.getEventType())){
+			if (CommConstant.EVENT_H5.equals(e.getEventType())) {
 				e.setActivityName(e.getDrainageName());
+				continue;
 			}
-			if (!StringUtils.isEmpty(e.getBuildingName()) && CommConstant.POSTER_CONTENT_TYPE_BUILDING.equals(e.getEventType())){
+			if (CommConstant.POSTER_CONTENT_TYPE_BUILDING.equals(e.getEventType())) {
 				e.setActivityName(e.getBuildingName());
+				continue;
 			}
-			if (!StringUtils.isEmpty(e.getNewsName()) && CommConstant.POSTER_CONTENT_TYPE_NEWS.equals(e.getEventType())){
+			if (CommConstant.POSTER_CONTENT_TYPE_NEWS.equals(e.getEventType())) {
 				e.setActivityName(e.getNewsName());
+				continue;
 			}
-			if (!StringUtils.isEmpty(e.getHelpActivityName()) && CommConstant.POINTS_CHANGE_HELP.equals(e.getEventType())){
+			if (CommConstant.POINTS_CHANGE_HELP.equals(e.getEventType())) {
 				e.setActivityName(e.getHelpActivityName());
+				continue;
 			}
-			if (!StringUtils.isEmpty(e.getGroupActivityName()) && CommConstant.POINTS_CHANGE_GROUP.equals(e.getEventType())){
+			if (CommConstant.POINTS_CHANGE_GROUP.equals(e.getEventType())) {
 				e.setActivityName(e.getGroupActivityName());
+				continue;
 			}
-		});
+		}
 		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
 		return taPersonVisitRecordIPage;
 	}
 	 * @return
 	 */
 	@Override
-	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId) {
+	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType) {
 		//根据userId获取用户信息
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
 		taPersonQueryWrapper.eq("user_id",userId);
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId());
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), eventType);
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {

src/main/resources/mapper/HelpInitiateRecordMapper.xml

       SELECT
         t.*,
         a.title,
-        a.img,
+        a.list_img as img,
         a.activity_status,
         a.end_date
     FROM

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

             t.* ,
 	        p.`name` as user_name,
 	        p.`nickname` as nickname,
-	        p.avatarurl,
-	        d.name as activity_name,
-	        d.create_date
+	        p.avatarurl
         FROM
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and target_id = #{targetId} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and target_id = #{targetId} AND consultant_id = #{userId} and person_id != #{personId} and event_type = #{eventType} ORDER BY visit_time DESC LIMIT 999) t
             left JOIN ta_person p on t.person_id = p.person_id
-            LEFT join ta_drainage d on t.target_id = d.drainage_id
         GROUP BY
             t.person_id
         ORDER BY
             </if>
             <if test="activityName !=null and activityName != ''">
                 and (
-                b.name like concat('%',#{activityName},'%') or d.name like concat('%',#{activityName},'%') or tn.news_name like concat('%',#{activityName},'%')
-                or tha.title like concat( '%', #{activityName}, '%' )  or tsa.activity_name like concat('%',#{activityName},'%') or tbd.title like concat('%',#{activityName},'%')
+                (b.name like concat('%',#{activityName},'%') and t.event_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.event_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.event_type = 'news')
+                or (tha.title like concat( '%', #{activityName}, '%' ) and t.event_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.event_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.event_type = 'activity')
                 )
             </if>
             <if test="shareName !=null and shareName != ''">

src/main/resources/mapper/TaShareRecordMapper.xml

             t.verification_status,
             t.verification_code,
             a.activity_name,
-            a.main_img,
+            a.list_img as main_img,
             a.activity_status,
             a.end_time AS end_date,
             1 as groupStatus