|
|
@@ -346,8 +346,13 @@ public class IotOperationMeetingServiceImpl implements IotOperationMeetingServic
|
|
|
if (CollUtil.isEmpty(companyNames)) {
|
|
|
return resultMeetings;
|
|
|
}
|
|
|
+ Set<Long> nonCumulativeDeptIds = new HashSet<>();
|
|
|
companyNames.forEach(name -> {
|
|
|
companyPair.put(name.getId(), name.getName());
|
|
|
+ // 查询部门对应的字段 phone 设置是否需要累加财务数据
|
|
|
+ if ("18000000000".equals(name.getPhone())) {
|
|
|
+ nonCumulativeDeptIds.add(name.getId());
|
|
|
+ }
|
|
|
});
|
|
|
summarizedDetails.forEach(detail -> {
|
|
|
meetingIds.add(detail.getMeetingId());
|
|
|
@@ -407,6 +412,12 @@ public class IotOperationMeetingServiceImpl implements IotOperationMeetingServic
|
|
|
if (companyPair.containsKey(existMeeting.getDeptId())) {
|
|
|
tempMeeting.setCompanyName(companyPair.get(existMeeting.getDeptId()));
|
|
|
}
|
|
|
+ // 判断公司的财务数据是否需要累计 新业务开发 非洲地区 中东地区 3个公司不累计
|
|
|
+ if (nonCumulativeDeptIds.contains(existMeeting.getDeptId())) {
|
|
|
+ tempMeeting.setCumulative(false);
|
|
|
+ } else {
|
|
|
+ tempMeeting.setCumulative(true);
|
|
|
+ }
|
|
|
List<IotOperationMeetingDetailRespVO> meetingDetails = BeanUtils.toBean(details, IotOperationMeetingDetailRespVO.class);
|
|
|
tempMeeting.setDetails(meetingDetails);
|
|
|
resultMeetings.add(tempMeeting);
|