bug fix

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.*;
@@ -123,6 +124,21 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, eventType, shareName, shareTel, buildingId, personType, taPersonBuildingList);
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
 		taPersonVisitRecords.forEach(e -> {
+			if (!StringUtils.isEmpty(e.getDrainageName())){
+				e.setActivityName(e.getDrainageName());
+			}
+			if (!StringUtils.isEmpty(e.getBuildingName())){
+				e.setActivityName(e.getBuildingName());
+			}
+			if (!StringUtils.isEmpty(e.getNewsName())){
+				e.setActivityName(e.getNewsName());
+			}
+			if (!StringUtils.isEmpty(e.getHelpActivityName())){
+				e.setActivityName(e.getHelpActivityName());
+			}
+			if (!StringUtils.isEmpty(e.getGroupActivityName())){
+				e.setActivityName(e.getGroupActivityName());
+			}
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
 			if (personInfo != null){
 				e.setUserName(personInfo.getNickname());

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -141,7 +141,8 @@
             left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
             left join ta_person c on t.share_person_id = c.person_id
             where
-            t.share_person_id is not null
+            1=1
+--             t.share_person_id is not null
             <if test="orgId != null and orgId != ''">
                 and t.org_id = #{orgId}
             </if>
@@ -149,7 +150,10 @@
                 and t.event_type = #{eventType}
             </if>
             <if test="activityName !=null and activityName != ''">
-                and b.name like concat('%',#{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},'%')
+                )
             </if>
             <if test="shareName !=null and shareName != ''">
                 and c.nickname like concat('%',#{shareName},'%')
@@ -164,7 +168,7 @@
                 and t.consultant_id is null
             </if>
             <if test="buildingId !=null and buildingId != ''">
-                and d.building_id = #{buildingId}
+                and t.building_id = #{buildingId}
             </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND t.building_id in