|
@@ -3,7 +3,6 @@ package com.slibra.business.service.impl;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.alibaba.fastjson2.JSON;
|
|
import com.slibra.business.domain.TCutOffWater;
|
|
import com.slibra.business.domain.TCutOffWater;
|
|
@@ -16,7 +15,6 @@ import com.slibra.common.DecimalUtils;
|
|
import com.slibra.common.core.domain.entity.SysUser;
|
|
import com.slibra.common.core.domain.entity.SysUser;
|
|
import com.slibra.common.exception.ServiceException;
|
|
import com.slibra.common.exception.ServiceException;
|
|
import com.slibra.common.utils.DateUtils;
|
|
import com.slibra.common.utils.DateUtils;
|
|
-import com.slibra.common.utils.SecurityUtils;
|
|
|
|
import com.slibra.common.utils.StringUtils;
|
|
import com.slibra.common.utils.StringUtils;
|
|
import com.slibra.system.mapper.SysUserMapper;
|
|
import com.slibra.system.mapper.SysUserMapper;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -86,7 +84,10 @@ public class TCallRecordServiceImpl implements ITCallRecordService
|
|
@Override
|
|
@Override
|
|
public TCallRecord selectTCallRecordById(Long id)
|
|
public TCallRecord selectTCallRecordById(Long id)
|
|
{
|
|
{
|
|
- return tCallRecordMapper.selectTCallRecordById(id);
|
|
|
|
|
|
+ TCallRecord tCallRecord = tCallRecordMapper.selectTCallRecordById(id);
|
|
|
|
+ if(!Objects.isNull(tCallRecord))
|
|
|
|
+ this.handleUserName(tCallRecord);
|
|
|
|
+ return tCallRecord;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -98,7 +99,23 @@ public class TCallRecordServiceImpl implements ITCallRecordService
|
|
@Override
|
|
@Override
|
|
public List<TCallRecord> selectTCallRecordList(TCallRecord tCallRecord)
|
|
public List<TCallRecord> selectTCallRecordList(TCallRecord tCallRecord)
|
|
{
|
|
{
|
|
- return tCallRecordMapper.selectTCallRecordList(tCallRecord);
|
|
|
|
|
|
+ List<TCallRecord> tCallRecords = tCallRecordMapper.selectTCallRecordList(tCallRecord);
|
|
|
|
+ if(!CollectionUtils.isEmpty(tCallRecords)){
|
|
|
|
+ for (TCallRecord callRecord : tCallRecords) {
|
|
|
|
+ this.handleUserName(callRecord);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return tCallRecords;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private void handleUserName(TCallRecord callRecord) {
|
|
|
|
+ Long serviceCategory = callRecord.getServiceCategory();
|
|
|
|
+ if(!Objects.isNull(serviceCategory) && 2L == serviceCategory){
|
|
|
|
+ String transferUserName = callRecord.getTransferUserName();//有可能不存在 如果存在,再替换
|
|
|
|
+ if(!StringUtils.isEmpty(transferUserName)){
|
|
|
|
+ callRecord.setUserName(transferUserName);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|