增加访问记录类型

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

@@ -233,15 +233,17 @@ public class TaPersonVisitRecordController extends BaseController {
     public ResponseBean drainageVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                 @RequestParam(value ="activityName",required = false) String activityName,
-                                                @RequestParam(value ="drainageId",required = false) Integer drainageId,
+                                                @RequestParam(value ="buildingId",required = false) String buildingId,
                                                 @RequestParam(value ="shareName",required = false) String shareName,
                                                 @RequestParam(value ="shareTel",required = false) String shareTel,
+                                                @RequestParam(value ="eventType",required = false) String eventType,
+                                                @RequestParam(value ="personType",required = false) String personType,
                                                 HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, drainageId, shareName, shareTel,getTaPersonBuildingListByUserId(request));
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, eventType, shareName, shareTel, buildingId, personType, getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
             return responseBean;
         } catch (Exception e) {
@@ -302,7 +304,7 @@ public class TaPersonVisitRecordController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value = "/wx/shareRecords")
+    @RequestMapping(value = "/wx/shareRecords",method= RequestMethod.GET)
     public ResponseBean wxShareRecordsByUserId(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                               @RequestParam(value = "userId") Integer userId,
@@ -343,7 +345,7 @@ public class TaPersonVisitRecordController extends BaseController {
         return ResponseBean.success(result);
     }
 
-    @RequestMapping(value = "/wx/sharePersonInfoList")
+    @RequestMapping(value = "/wx/sharePersonInfoList",method= RequestMethod.GET)
     public ResponseBean getSharePersonList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            @RequestParam(value = "userId") Integer userId,

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

@@ -72,8 +72,9 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @param orgId
      * @return
      */
-	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("drainageId") Integer drainageId, @Param("shareName") String shareName, @Param("shareTel") String shareTel,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType,@Param("personId") String personId);
+	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("eventType") String eventType,@Param("personId") String personId);
 
     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

@@ -49,7 +49,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 //    TaPerson customerInfo(String personId);
 
-	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel, List<TaPersonBuilding> taPersonBuildingList);
+	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, String eventType, String shareName, String shareTel, String buildingId, String personType, List<TaPersonBuilding> taPersonBuildingList);
 
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
 

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

@@ -119,8 +119,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	}
 
 	@Override
-	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel, List<TaPersonBuilding> taPersonBuildingList) {
-		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, drainageId, shareName, shareTel,taPersonBuildingList);
+	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 -> {
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -6,7 +6,7 @@
         <trim suffixOverrides=",">
             t.record_id,
             t.person_id,
-            t.person_type,
+            c.person_type,
             t.visit_time,
             t.leave_time,
             t.visit_duration,
@@ -130,14 +130,14 @@
             from ta_person_visit_record t
             left join ta_drainage b on t.target_id = b.drainage_id
             left join ta_person c on t.share_person_id = c.person_id
+            left join ta_building d on t.target_id = d.building_id
             where
-            t.event_type = 'h5'
-            and t.share_person_id is not null
+            t.share_person_id is not null
             <if test="orgId != null and orgId != ''">
                 and t.org_id = #{orgId}
             </if>
-            <if test="drainageId !=null and drainageId != ''">
-                and b.drainage_Id = #{drainageId}
+            <if test="eventType !=null and eventType != ''">
+                and t.event_type = #{eventType}
             </if>
             <if test="activityName !=null and activityName != ''">
                 and b.name like concat('%',#{activityName},'%')
@@ -148,6 +148,15 @@
             <if test="shareTel !=null and shareTel != ''">
                 and c.phone = #{shareTel}
             </if>
+            <if test="personType == 'Realty Consultant'">
+                and t.consultant_id is not null  and t.consultant_id != ''
+            </if>
+            <if test="personType == 'customer'">
+                and t.consultant_id is null
+            </if>
+            <if test="buildingId !=null and buildingId != ''">
+                and d.building_id = #{buildingId}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND t.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">