record

src/main/java/com/huiju/estateagents/entity/TaPersonVisitRecord.java

@@ -107,5 +107,11 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String buildingName;
+    
+    /**
+     * 活动名称
+     */
+    @TableField(exist = false)
+    private String activityName;
 
 }

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

@@ -2,12 +2,18 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.mapper.HelpActivityMapper;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +37,15 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	@Autowired
 	private TaPersonVisitRecordMapper personVisitRecordMapper;
 	
+	@Autowired
+	private TaBuildingDynamicMapper taBuildingDynamicMapper;
+	
+	@Autowired
+	private TaShareActivityMapper taShareActivityMapper;
+	
+	@Autowired
+	private HelpActivityMapper helpActivityMapper;
+	
 	/**
 	 * 分页获取客户访问记录
 	 *
@@ -42,6 +57,33 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	public IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg, String customerId) {
 		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(customerId);
 		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getPersonVisitRecordList(pg,taRecommendCustomer.getPersonId());
+		List<TaPersonVisitRecord> records = result.getRecords();
+		records.forEach(e -> {
+			//获取活动标题
+			if (e.getEventType().equals("activity") && null != e.getTargetId()){
+				TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
+				if (null != taBuildingDynamic){
+					e.setActivityName(taBuildingDynamic.getTitle());
+				}
+				
+			}
+			//获取拼团标题
+			if (e.getEventType().equals("group") && null != e.getTargetId()){
+				TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
+				if (null != taShareActivity){
+					e.setActivityName(taShareActivity.getActivityName());
+				}
+			}
+			//获取助力标题
+			if (e.getEventType().equals("help") && null != e.getTargetId()){
+				HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
+				if (null != helpActivity){
+					e.setActivityName(helpActivity.getTitle());
+				}
+				
+			}
+		});
+		result.setRecords(records);
 		return result;
 	}
 //    @Autowired

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerFollowUpRecordController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -171,6 +172,8 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             taCustomerFollowUpRecord.setFollowerId(person.getPersonId());
+            taCustomerFollowUpRecord.setCreateDate(LocalDateTime.now());
+            taCustomerFollowUpRecord.setOrgId(orgId);
             if (iTaCustomerFollowUpRecordService.save(taCustomerFollowUpRecord)){
                 responseBean.addSuccess(taCustomerFollowUpRecord);
             }else {

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -631,7 +631,7 @@ FROM
         <if test="type == 'follow'">
           AND STATUS != 4
             <if test="name != null and name !=''">
-                and `name` like CONCAT('%',#{name}, '%')
+                and (`name` like CONCAT('%',#{name}, '%') or phone like CONCAT('%',#{name}, '%'))
             </if>
             <if test="phone != null and phone !=''">
                 and phone like CONCAT('%',#{phone}, '%')