魏超 5 år sedan
förälder
incheckning
5291ae827e

+ 16
- 15
src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java Visa fil

124
 		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, eventType, shareName, shareTel, buildingId, personType, taPersonBuildingList);
124
 		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, eventType, shareName, shareTel, buildingId, personType, taPersonBuildingList);
125
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
125
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
126
 		taPersonVisitRecords.forEach(e -> {
126
 		taPersonVisitRecords.forEach(e -> {
127
-			if (!StringUtils.isEmpty(e.getDrainageName())){
128
-				e.setActivityName(e.getDrainageName());
129
-			}
130
-			if (!StringUtils.isEmpty(e.getBuildingName())){
131
-				e.setActivityName(e.getBuildingName());
132
-			}
133
-			if (!StringUtils.isEmpty(e.getNewsName())){
134
-				e.setActivityName(e.getNewsName());
135
-			}
136
-			if (!StringUtils.isEmpty(e.getHelpActivityName())){
137
-				e.setActivityName(e.getHelpActivityName());
138
-			}
139
-			if (!StringUtils.isEmpty(e.getGroupActivityName())){
140
-				e.setActivityName(e.getGroupActivityName());
141
-			}
142
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
127
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
143
 			if (personInfo != null){
128
 			if (personInfo != null){
144
 				e.setUserName(personInfo.getNickname());
129
 				e.setUserName(personInfo.getNickname());
150
 				e.setShareName(userShareInfo.getNickname());
135
 				e.setShareName(userShareInfo.getNickname());
151
 				e.setShareTel(userShareInfo.getPhone());
136
 				e.setShareTel(userShareInfo.getPhone());
152
 			}
137
 			}
138
+
139
+			if (!StringUtils.isEmpty(e.getDrainageName()) && CommConstant.EVENT_H5.equals(e.getEventType())){
140
+				e.setActivityName(e.getDrainageName());
141
+			}
142
+			if (!StringUtils.isEmpty(e.getBuildingName()) && CommConstant.POSTER_CONTENT_TYPE_BUILDING.equals(e.getEventType())){
143
+				e.setActivityName(e.getBuildingName());
144
+			}
145
+			if (!StringUtils.isEmpty(e.getNewsName()) && CommConstant.POSTER_CONTENT_TYPE_NEWS.equals(e.getEventType())){
146
+				e.setActivityName(e.getNewsName());
147
+			}
148
+			if (!StringUtils.isEmpty(e.getHelpActivityName()) && CommConstant.POINTS_CHANGE_HELP.equals(e.getEventType())){
149
+				e.setActivityName(e.getHelpActivityName());
150
+			}
151
+			if (!StringUtils.isEmpty(e.getGroupActivityName()) && CommConstant.POINTS_CHANGE_GROUP.equals(e.getEventType())){
152
+				e.setActivityName(e.getGroupActivityName());
153
+			}
153
 		});
154
 		});
154
 		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
155
 		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
155
 		return taPersonVisitRecordIPage;
156
 		return taPersonVisitRecordIPage;